Platform init (#1043)

* step 1a. Add gameId unrequired to schemas. Add gameId to reqUser. * Step 1b. Add gameId to LevelModel.creates * Step 1b. Add gameId to ReviewModel.creates * update some tests * fix test * move GameId to constants/ * Step 1b. Add gameId to CollectionModel.creates * Step 1b. Add gameId to PlayAttemptModel.creates * Step 1b. Add gameId to StatModel.creates * Step 1b. Add gameId to RecordModel.creates * play-attempt upsert gameid * unpublish.test promise.all
sspenst · Nov 13, 2023 · 448d6c4 · 448d6c4
1 parent eff9f50
commit 448d6c4
Show file tree

Hide file tree

Showing 49 changed files with 218 additions and 70 deletions.
diff --git a/constants/GameId.ts b/constants/GameId.ts
@@ -0,0 +1,3 @@
+export enum GameId {
+  PATHOLOGY = 'pathology'
+}
diff --git a/lib/initializeLocalDb.ts b/lib/initializeLocalDb.ts
@@ -4,6 +4,7 @@ import { PASSWORD_SALTROUNDS } from '@root/models/schemas/userSchema';
 import { getNewUserConfig } from '@root/pages/api/user-config';
 import bcrypt from 'bcryptjs';
 import { Types } from 'mongoose';
+import { GameId } from '../constants/GameId';
 import Role from '../constants/role';
 import TestId from '../constants/testId';
 import { generateCollectionSlug, generateLevelSlug } from '../helpers/generateSlug';
@@ -356,6 +357,7 @@ export async function initLevel(userId: string, name: string, obj: Partial<Level
   // based on name length create that many reviews
   const lvl = await LevelModel.create({
     _id: id,
+    gameId: GameId.PATHOLOGY,
     authorNote: 'test level ' + name + ' author note',
     data: '40000\n12000\n05000\n67890\nABCD3',
     height: 5,
@@ -375,6 +377,7 @@ export async function initLevel(userId: string, name: string, obj: Partial<Level
     for (let i = 0; i < name.length; i++) {
       revs.push({
         _id: new Types.ObjectId(),
+        gameId: GameId.PATHOLOGY,
         levelId: id,
         score: (3903 * i * i + 33 * i) % 5 + 1,
         text: 'Game is OK',
@@ -393,6 +396,7 @@ export async function initCollection(userId: string, name: string, obj: Partial<
   const id = new Types.ObjectId();
   const collection = await CollectionModel.create({
     _id: id,
+    gameId: GameId.PATHOLOGY,
     authorNote: 'test collection ' + name + ' author note',
     name: name,
     userId: userId,

diff --git a/lib/withAuth.ts b/lib/withAuth.ts
@@ -2,6 +2,7 @@ import jwt, { JwtPayload } from 'jsonwebtoken';
 // https://github.com/newrelic/node-newrelic/issues/956#issuecomment-962729137
 import type { NextApiRequest, NextApiResponse } from 'next';
 import requestIp from 'request-ip';
+import { GameId } from '../constants/GameId';
 import { parseReq, ReqValidator } from '../helpers/apiWrapper';
 import { TimerUtil } from '../helpers/getTs';
 import { logger } from '../helpers/logger';
@@ -11,9 +12,28 @@ import dbConnect from './dbConnect';
 import getTokenCookie from './getTokenCookie';
 import isLocal from './isLocal';
 
+export enum GameType {
+  SHORTEST_PATH = 'SHORTEST_PATH',
+
+}
+interface Game {
+  id: GameId;
+  displayName: string;
+  type: GameType;
+}
+
+export const Games: Record<GameId, Game> = {
+  [GameId.PATHOLOGY]: {
+    id: GameId.PATHOLOGY,
+    displayName: 'Pathology',
+    type: GameType.SHORTEST_PATH,
+  }
+};
+
 export type NextApiRequestWithAuth = NextApiRequest & {
   user: User;
   userId: string;
+  gameId: GameId;
 };
 
 export async function getUserFromToken(
@@ -111,6 +131,16 @@ export default function withAuth(
       );
 
       res.setHeader('Set-Cookie', refreshCookie);
+
+      const subdomain = req.headers?.referer?.split('://')[1].split('.')[0];
+
+      /*if (!subdomain || !Games[subdomain]) {
+        return res.status(401).json({
+          error: 'Unauthorized: Game not selected',
+        });
+      }*/
+
+      req.gameId = Games[subdomain as GameId]?.id || GameId.PATHOLOGY;
       req.user = reqUser;
       req.userId = reqUser._id.toString();
 

diff --git a/models/db/achievement.d.ts b/models/db/achievement.d.ts
@@ -5,6 +5,7 @@ import User from './user';
 interface Achievement {
   _id: Types.ObjectId;
   createdAt: Date;
+  gameId?: string;
   type: AchievementType;
   updatedAt: Date;
   userId: Types.ObjectId & User;

diff --git a/models/db/campaign.d.ts b/models/db/campaign.d.ts
@@ -1,13 +1,16 @@
 import { Types } from 'mongoose';
 import Collection, { EnrichedCollection } from './collection';
+import Game from './game';
 
 interface Campaign {
   _id: Types.ObjectId;
   authorNote?: string;
   collections: Types.Array<Types.ObjectId & Collection> | EnrichedCollection[];
   collectionsPopulated?: Types.Array<Types.ObjectId & Collection> | EnrichedCollection[]; // virtual
+  gameId?: string;
   name: string;
   slug: string;
+
 }
 
 export interface EnrichedCampaign extends Campaign {

diff --git a/models/db/collection.d.ts b/models/db/collection.d.ts
@@ -8,6 +8,7 @@ interface Collection {
   authorNote?: string;
   createdAt: Date;
   isPrivate?: boolean;
+  gameId?: string;
   levels: Types.Array<Types.ObjectId & Level> | EnrichedLevel[];
   levelsPopulated?: Types.Array<Types.ObjectId & Level> | EnrichedLevel[]; // virtual
   name: string;

diff --git a/models/db/emailLog.d.ts b/models/db/emailLog.d.ts
@@ -7,6 +7,7 @@ interface EmailLog {
   _id: Types.ObjectId;
   batchId: Types.ObjectId;
   createdAt: Date;
+  gameId?: string;
   error: string,
   state: EmailState;
   subject: string;

diff --git a/models/db/keyValue.d.ts b/models/db/keyValue.d.ts
@@ -3,6 +3,7 @@ import { Schema } from 'mongoose';
 interface KeyValue {
   key: string;
   value: Schema.Types.Mixed;
+  gameId?: string;
 }
 
 export default KeyValue;
diff --git a/models/db/level.d.ts b/models/db/level.d.ts
@@ -15,6 +15,7 @@ interface Level {
   calc_reviews_score_laplace: number;
   calc_stats_players_beaten: number;
   data: string;
+  gameId?: string;
   height: number;
   isDeleted: boolean;
   isDraft: boolean;

diff --git a/models/db/multiplayerMatch.d.ts b/models/db/multiplayerMatch.d.ts
@@ -8,6 +8,7 @@ interface MultiplayerMatch {
   createdAt: Date;
   createdBy: User;
   endTime: Date;
+  gameId?: string;
   gameTable?: {
     [key: string]: Level[];
   };

diff --git a/models/db/multiplayerProfile.d.ts b/models/db/multiplayerProfile.d.ts
@@ -5,6 +5,7 @@ interface MultiplayerProfile {
   calcRushRapidCount: number;
   calcRushClassicalCount: number;
 
+  gameId?: string;
   // elo
   ratingRushBullet: number;
   ratingRushBlitz: number;

diff --git a/models/db/notification.d.ts b/models/db/notification.d.ts
@@ -8,6 +8,7 @@ interface Notification {
   _id: Types.ObjectId;
   createdAt: Date;
   message?: string;
+  gameId?: string;
   read: boolean;
   // the object that initiates the notification
   source: User | Achievement | null;

diff --git a/models/db/playAttempt.d.ts b/models/db/playAttempt.d.ts
@@ -7,6 +7,7 @@ interface PlayAttempt {
   _id: Types.ObjectId;
   attemptContext: AttemptContext;
   endTime: number;
+  gameId?: string;
   isDeleted: boolean;
   levelId: Types.ObjectId | Level;
   startTime: number;

diff --git a/models/db/record.d.ts b/models/db/record.d.ts
@@ -5,6 +5,7 @@ import User from './user';
 interface Record {
   _id: Types.ObjectId;
   isDeleted: boolean;
+  gameId?: string;
   levelId: Types.ObjectId & Level;
   moves: number;
   ts: number;

diff --git a/models/db/review.d.ts b/models/db/review.d.ts
@@ -4,6 +4,7 @@ import User from './user';
 
 interface Review {
   _id: Types.ObjectId;
+  gameId?: string;
   isDeleted: boolean;
   levelId: (Types.ObjectId & Level) | EnrichedLevel;
   score: number;

diff --git a/models/db/stat.d.ts b/models/db/stat.d.ts
@@ -6,6 +6,7 @@ interface Stat {
   _id: Types.ObjectId;
   attempts: number;
   complete: boolean;
+  gameId?: string;
   isDeleted: boolean;
   levelId: Types.ObjectId & Level;
   moves: number;

diff --git a/models/db/userConfig.d.ts b/models/db/userConfig.d.ts
@@ -8,6 +8,7 @@ interface UserConfig {
   _id: Types.ObjectId;
   disallowedEmailNotifications: NotificationType[];
   disallowedPushNotifications: NotificationType[];
+  gameId?: string;
   emailConfirmationToken: string;
   emailConfirmed: boolean;
   emailDigest: EmailDigestSettingTypes;

diff --git a/models/schemas/achievementSchema.ts b/models/schemas/achievementSchema.ts
@@ -12,6 +12,10 @@ const AchievementSchema = new mongoose.Schema<Achievement>({
     enum: AchievementType,
     required: true,
   },
+  gameId: {
+    type: String,
+    required: false,
+  },
   userId: {
     type: mongoose.Schema.Types.ObjectId,
     ref: 'User',

diff --git a/models/schemas/campaignSchema.ts b/models/schemas/campaignSchema.ts
@@ -14,6 +14,10 @@ const CampaignSchema = new mongoose.Schema<Campaign>({
     type: mongoose.Schema.Types.ObjectId,
     ref: 'Collection',
   }],
+  gameId: {
+    type: String,
+    required: false,
+  },
   name: {
     type: String,
     minlength: 1,
@@ -24,6 +28,7 @@ const CampaignSchema = new mongoose.Schema<Campaign>({
     type: String,
     required: true,
   },
+
 }, {
   timestamps: true,
   collation: {

diff --git a/models/schemas/collectionSchema.ts b/models/schemas/collectionSchema.ts
@@ -15,6 +15,10 @@ const CollectionSchema = new mongoose.Schema<Collection>({
     type: Boolean,
     default: false,
   },
+  gameId: {
+    type: String,
+    required: false,
+  },
   isThemed: {
     type: Boolean,
     default: false,

diff --git a/models/schemas/emailLogSchema.ts b/models/schemas/emailLogSchema.ts
@@ -15,6 +15,10 @@ const EmailLogSchema = new mongoose.Schema<EmailLog>(
       type: mongoose.Schema.Types.ObjectId,
       required: true,
     },
+    gameId: {
+      type: String,
+      required: false,
+    },
     error: {
       type: String,
       required: false,

diff --git a/models/schemas/keyValueSchema.ts b/models/schemas/keyValueSchema.ts
@@ -15,6 +15,10 @@ const KeyValueSchema = new mongoose.Schema<KeyValue>(
       minlength: 1,
       maxlength: 50,
     },
+    gameId: {
+      type: String,
+      required: false,
+    },
   },
   {
     timestamps: true,

diff --git a/models/schemas/levelSchema.ts b/models/schemas/levelSchema.ts
@@ -58,6 +58,10 @@ const LevelSchema = new mongoose.Schema<Level>(
       required: false,
       default: 0
     },
+    gameId: {
+      type: String,
+      required: false,
+    },
     // https://github.com/sspenst/pathology/wiki/Level-data-format
     data: {
       type: String,

diff --git a/models/schemas/multiplayerMatchSchema.ts b/models/schemas/multiplayerMatchSchema.ts
@@ -35,6 +35,10 @@ const MultiplayerMatchSchema = new mongoose.Schema<MultiplayerMatch>(
     endTime: {
       type: Date,
     },
+    gameId: {
+      type: String,
+      required: false,
+    },
     levels: [
       {
         type: mongoose.Schema.Types.ObjectId,

diff --git a/models/schemas/multiplayerProfileSchema.ts b/models/schemas/multiplayerProfileSchema.ts
@@ -25,6 +25,10 @@ const MultiplayerProfileSchema = new mongoose.Schema<MultiplayerProfile>(
       required: true,
       default: 0,
     },
+    gameId: {
+      type: String,
+      required: false,
+    },
     ratingRushBullet: {
       type: Number,
       required: true,

diff --git a/models/schemas/notificationSchema.ts b/models/schemas/notificationSchema.ts
@@ -13,6 +13,10 @@ const NotificationSchema = new mongoose.Schema<Notification>({
     required: true,
     default: false,
   },
+  gameId: {
+    type: String,
+    required: false,
+  },
   source: {
     type: mongoose.Schema.Types.ObjectId,
     refPath: 'sourceModel',

diff --git a/models/schemas/playAttemptSchema.ts b/models/schemas/playAttemptSchema.ts
@@ -22,6 +22,11 @@ const PlayAttemptSchema = new mongoose.Schema<PlayAttempt>({
     type: Number,
     required: true,
   },
+  gameId: {
+    type: String,
+    required: false,
+  },
+
   isDeleted: {
     type: Boolean,
   },

diff --git a/models/schemas/recordSchema.ts b/models/schemas/recordSchema.ts
@@ -9,6 +9,10 @@ const RecordSchema = new mongoose.Schema<Record>({
   isDeleted: {
     type: Boolean,
   },
+  gameId: {
+    type: String,
+    required: false,
+  },
   levelId: {
     type: mongoose.Schema.Types.ObjectId,
     ref: 'Level',

diff --git a/models/schemas/reviewSchema.ts b/models/schemas/reviewSchema.ts
@@ -9,6 +9,10 @@ const ReviewSchema = new mongoose.Schema<Review>({
   isDeleted: {
     type: Boolean,
   },
+  gameId: {
+    type: String,
+    required: false,
+  },
   levelId: {
     type: mongoose.Schema.Types.ObjectId,
     ref: 'Level',

diff --git a/models/schemas/statSchema.ts b/models/schemas/statSchema.ts
@@ -14,6 +14,9 @@ const StatSchema = new mongoose.Schema<Stat>({
     type: Boolean,
     required: true,
   },
+  gameId: {
+    type: String
+  },
   isDeleted: {
     type: Boolean,
   },

diff --git a/models/schemas/userConfigSchema.ts b/models/schemas/userConfigSchema.ts
@@ -20,6 +20,10 @@ const UserConfigSchema = new mongoose.Schema<UserConfig>(
       required: true,
       default: [],
     },
+    gameId: {
+      type: String,
+      required: false,
+    },
     emailConfirmationToken: {
       type: String,
       select: false,

diff --git a/pages/api/collection/index.ts b/pages/api/collection/index.ts
@@ -43,6 +43,7 @@ export default withAuth({
       collection = (await CollectionModel.create([{
         _id: new Types.ObjectId(),
         authorNote: authorNote?.trim(),
+        gameId: req.gameId,
         isPrivate: setIsPrivate,
         name: trimmedName,
         slug: slug,

diff --git a/pages/api/level/index.ts b/pages/api/level/index.ts
@@ -1,3 +1,4 @@
+import { GameId } from '@root/constants/GameId';
 import mongoose, { Types } from 'mongoose';
 import type { NextApiResponse } from 'next';
 import { ValidType } from '../../../helpers/apiWrapper';
@@ -26,6 +27,7 @@ export default withAuth({ POST: {
 
       await LevelModel.create([{
         _id: levelId,
+        gameId: req.gameId,
         authorNote: authorNote?.trim(),
         data: data,
         height: rows.length,