Merge db0eb4f into 49de86f

tf2pickup-org · Mar 8, 2021 · a24e010 · a24e010
2 parents 49de86f + db0eb4f
commit a24e010
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/e2e/players.e2e-spec.ts b/e2e/players.e2e-spec.ts
@@ -66,7 +66,6 @@ describe('PlayersController (e2e)', () => {
           etf2lProfileId: 112758,
           name: 'maly',
           joinedAt: maly.joinedAt.toISOString(),
-          hasAcceptedRules: false,
           avatar: {
             small: 'small_avatar_url',
             medium: 'medium_avatar_url',
@@ -87,7 +86,6 @@ describe('PlayersController (e2e)', () => {
         etf2lProfileId: 112758,
         name: 'maly',
         joinedAt: maly.joinedAt.toISOString(),
-        hasAcceptedRules: false,
         avatar: {
           small: 'small_avatar_url',
           medium: 'medium_avatar_url',

diff --git a/src/players/models/player.ts b/src/players/models/player.ts
@@ -1,6 +1,6 @@
 import { MongooseDocument } from '@/utils/mongoose-document';
 import { prop, index } from '@typegoose/typegoose';
-import { Expose, Transform, Type } from 'class-transformer';
+import { Exclude, Expose, Transform, Type } from 'class-transformer';
 import { IsString, Matches } from 'class-validator';
 import { PlayerAvatar } from './player-avatar';
 import { PlayerRole } from './player-role';
@@ -31,6 +31,7 @@ export class Player extends MongooseDocument {
   @prop()
   role?: PlayerRole;
 
+  @Exclude({ toPlainOnly: true })
   @prop({ default: false })
   hasAcceptedRules?: boolean;
 

diff --git a/src/profile/controllers/profile.controller.spec.ts b/src/profile/controllers/profile.controller.spec.ts
@@ -64,7 +64,6 @@ describe('Profile Controller', () => {
           id: 'FAKE_ID',
           name: 'FAKE_USER_NAME',
           steamId: 'FAKE_STEAM_ID',
-          hasAcceptedRules: false,
         },
         activeGameId: null,
         bans: [],

diff --git a/src/profile/dto/profile.ts b/src/profile/dto/profile.ts
@@ -19,6 +19,7 @@ export class Profile {
     this.bans = params.bans;
     this.mapVote = params.mapVote;
     this.preferences = params.preferences;
+    this.hasAcceptedRules = params.player.hasAcceptedRules;
   }
 
   @Type(() => Player)
@@ -34,4 +35,6 @@ export class Profile {
   @Type(() => String)
   preferences: PreferencesType;
 
+  hasAcceptedRules: boolean;
+
 }