merge development to access

src/user/user.decorator.ts

 import { createParamDecorator } from "@nestjs/common";
 
+// used to pass user information to controllers
 export const User = createParamDecorator((data, req) => {
     return data ? req.user[data] : req.user;
 })
\ No newline at end of file

src/user/user.entity.ts

 import { Entity, Column, PrimaryGeneratedColumn, BeforeInsert, OneToMany } from 'typeorm';
 import * as bcrypt from 'bcryptjs';
 import * as jwt from 'jsonwebtoken';
+
 import { MapMarkerEntity } from '../mapmarkers/mapmarker.entity';
+import { Game_PersonEntity } from '../game/game.entity';
 
 @Entity('Person')
 export class PersonEntity {
@@ -10,12 +12,17 @@ export class PersonEntity {
     @Column('text') password: string;
     @OneToMany(type => MapMarkerEntity, marker => marker.player)
     markers: MapMarkerEntity[];
+    @OneToMany(type => Game_PersonEntity, game_persons => game_persons.person)
+    game_persons: Game_PersonEntity[];
+
 
+    // hashes the password before inserting it to database
     @BeforeInsert()
     async hashPassword() {
         this.password = await bcrypt.hash(this.password, 10);
     }
 
+    // returns username and associated token
     tokenObject() {
         const {name, token} = this;
         return {name, token};