jp.db.schemas 2.2.11 → 2.2.13

package/src/models/rating-add-bulk-item.interface.ts

@@ -3,5 +3,5 @@ export interface IRatingAddBulkItem {
   userName: string;
   userAvatarUrl: string;
   game: string;
-  channels: string;
+  channel: string;
 }

package/src/models/rating-monthly-result.interface.ts

@@ -4,8 +4,9 @@ export interface IRatingMonthlyResult {
   userName: string;
   userAvatarUrl: string;
   game: string;
-  channels: string;
+  channel: string;
   count: number;
   date: string;
   rank: number;
+  profit: number;
 }

package/src/repositories/achievement.repository.ts

@@ -3,6 +3,7 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
 import { Achievement, AchievementDocument } from '..';
+import { getGameRegExpFilter } from '../utils';
 
 @Injectable()
 export class AchievementRepository {
@@ -11,7 +12,11 @@ export class AchievementRepository {
     private menuModel: Model<AchievementDocument>,
   ) {}
 
-  async findAchievements(): Promise<Array<Achievement>> {
-    return this.menuModel.find().exec();
+  async findAchievements(game: string): Promise<Array<Achievement>> {
+    return this.menuModel
+      .find({
+        game: getGameRegExpFilter(game),
+      })
+      .exec();
   }
 }

package/src/repositories/activity-log.repository.ts

@@ -36,7 +36,7 @@ export class ActivityLogRepository {
           userName: { $first: '$userName' },
           event: { $first: '$event' },
           game: { $first: '$game' },
-          channels: { $first: '$channels' },
+          channel: { $first: '$channel' },
           count: { $sum: 1 },
         },
       },
@@ -113,14 +113,14 @@ export class ActivityLogRepository {
     userId: string,
     userName: string,
     game: string,
-    channels: string,
+    channel: string,
   ): Promise<ActivityLog> {
     return this.addActivityLog({
       event: ActivityLogEnum.USER_LOGIN,
       userId,
       userName,
       game,
-      channels,
+      channel,
     });
   }
 
@@ -128,7 +128,7 @@ export class ActivityLogRepository {
     userId: string,
     userName: string,
     game: string,
-    channels: string,
+    channel: string,
     amount: number,
   ): Promise<ActivityLog> {
     return this.addActivityLog({
@@ -136,7 +136,7 @@ export class ActivityLogRepository {
       userId,
       userName,
       game,
-      channels,
+      channel,
       amount,
     });
   }
@@ -145,14 +145,14 @@ export class ActivityLogRepository {
     userId: string,
     userName: string,
     game: string,
-    channels: string,
+    channel: string,
   ): Promise<ActivityLog> {
     return this.addActivityLog({
       event: ActivityLogEnum.USER_PLAYED_GAME,
       userId,
       userName,
       game,
-      channels,
+      channel,
     });
   }
 
@@ -160,14 +160,14 @@ export class ActivityLogRepository {
     userId: string,
     userName: string,
     game: string,
-    channels: string,
+    channel: string,
   ): Promise<ActivityLog> {
     return this.addActivityLog({
       event: ActivityLogEnum.USER_WON_GAME,
       userId,
       userName,
       game,
-      channels,
+      channel,
     });
   }
 
@@ -175,14 +175,14 @@ export class ActivityLogRepository {
     userId: string,
     userName: string,
     game: string,
-    channels: string,
+    channel: string,
   ): Promise<ActivityLog> {
     return this.addActivityLog({
       event: ActivityLogEnum.USER_WON_PROFI,
       userId,
       userName,
       game,
-      channels,
+      channel,
     });
   }
 
@@ -190,14 +190,14 @@ export class ActivityLogRepository {
     userId: string,
     userName: string,
     game: string,
-    channels: string,
+    channel: string,
   ): Promise<ActivityLog> {
     return this.addActivityLog({
       event: ActivityLogEnum.USER_WON_ONE_TABLE_TOURNAMENT,
       userId,
       userName,
       game,
-      channels,
+      channel,
     });
   }
 

package/src/repositories/banners.repository.ts

@@ -3,6 +3,7 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
 import { Banner, BannerDocument } from '../';
+import { getChannelRegExpFilter, getGameRegExpFilter } from '../utils';
 
 @Injectable()
 export class BannersRepository {
@@ -12,9 +13,15 @@ export class BannersRepository {
 
   async findEnabledBanner(
     game: string,
-    channels: string,
+    channel: string,
   ): Promise<Banner | null> {
-    return this.bannerModel.findOne({ enabled: true }).exec();
+    return this.bannerModel
+      .findOne({
+        game: getGameRegExpFilter(game),
+        channel: getChannelRegExpFilter(channel),
+        enabled: true,
+      })
+      .exec();
   }
 
   async findById(id: string): Promise<Banner | null> {

package/src/repositories/daily-bonus.repository.ts

@@ -3,7 +3,7 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
 import { DailyBonus, DailyBonusDocument } from '../';
-import { getChannelRegExpFilter } from '../utils';
+import { getChannelRegExpFilter, getGameRegExpFilter } from '../utils';
 
 @Injectable()
 export class DailyBonusRepository {
@@ -13,12 +13,13 @@ export class DailyBonusRepository {
   ) {}
 
   async findDailyBonuses(
-    channel: string,
     game: string,
+    channel: string,
   ): Promise<Array<DailyBonus> | null> {
     return this.dailyBonusModel
       .find({
-        channels: getChannelRegExpFilter(channel),
+        game: getGameRegExpFilter(game),
+        channel: getChannelRegExpFilter(channel),
       })
       .exec();
   }

package/src/repositories/friend.repository.ts

@@ -3,7 +3,6 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
 import { Friend, FriendDocument } from '..';
-import { getChannelRegExpFilter } from '../utils';
 
 @Injectable()
 export class FriendRepository {
@@ -11,14 +10,7 @@ export class FriendRepository {
     @InjectModel(Friend.name) private friendModel: Model<FriendDocument>,
   ) {}
 
-  async findFriend(
-    channel: string,
-    game: string,
-  ): Promise<Array<Friend> | null> {
-    return this.friendModel
-      .find({
-        channels: getChannelRegExpFilter(channel),
-      })
-      .exec();
+  async findFriends(game: string): Promise<Array<Friend> | null> {
+    return this.friendModel.find().exec();
   }
 }

package/src/repositories/game-statistic.repository.ts

@@ -3,7 +3,7 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
 import { GameStatistic, GameStatisticDocument } from '..';
-import { getChannelRegExpFilter } from '../utils';
+import { getGameRegExpFilter } from '../utils';
 
 @Injectable()
 export class GameStatisticRepository {
@@ -12,13 +12,10 @@ export class GameStatisticRepository {
     private gameStatisticModel: Model<GameStatisticDocument>,
   ) {}
 
-  async findGameStatistic(
-    channel: string,
-    game: string,
-  ): Promise<Array<GameStatistic> | null> {
+  async findGameStatistic(game: string): Promise<Array<GameStatistic> | null> {
     return this.gameStatisticModel
       .find({
-        channels: getChannelRegExpFilter(channel),
+        game: getGameRegExpFilter(game),
       })
       .exec();
   }

package/src/repositories/index.ts

@@ -4,7 +4,6 @@ import { BannersRepository } from './banners.repository';
 import { ComplainsRepository } from './complains.repository';
 import { NotificationRepository } from './notification.repository';
 import { ProductsRepository } from './products.repository';
-import { ScheduledTournamentsRepository } from './scheduled-tournaments.repository';
 import { ServersRepository } from './servers.repository';
 import { UsersRepository } from './users.repository';
 import { MenuRepository } from './menu.repository';
@@ -16,11 +15,10 @@ import { SettingRepository } from './setting.repository';
 import { PremiumRepository } from './premium.repository';
 import { WelcomeRepository } from './welcome.repository';
 import { DailyBonusRepository } from './daily-bonus.repository';
-import { RoomsRepository } from './rooms.repository';
 import { GameResultRepository } from './game-result.repository';
 import { SimpleRoomsRepository } from './simple-rooms.repository';
-import { TournamentOneTableRoomsRepository } from './tournament-one-table-rooms.repository';
-import { TournamentManyTablesRoomsRepository } from './tournament-many-tables-rooms.repository';
+import { OneTableTournamentRoomsRepository } from './one-table-tournament-rooms.repository';
+import { ManyTablesTournamentRoomsRepository } from './many-tables-tournament-rooms.repository';
 import { ActivityLogRepository } from './activity-log.repository';
 import { AchievementRepository } from './achievement.repository';
 import { PurchaseRepository } from './purchase.repository';
@@ -35,7 +33,6 @@ export {
   ComplainsRepository,
   NotificationRepository,
   ProductsRepository,
-  ScheduledTournamentsRepository,
   ServersRepository,
   UsersRepository,
   MenuRepository,
@@ -47,11 +44,10 @@ export {
   PremiumRepository,
   WelcomeRepository,
   DailyBonusRepository,
-  RoomsRepository,
   GameResultRepository,
   SimpleRoomsRepository,
-  TournamentOneTableRoomsRepository,
-  TournamentManyTablesRoomsRepository,
+  OneTableTournamentRoomsRepository,
+  ManyTablesTournamentRoomsRepository,
   ActivityLogRepository,
   AchievementRepository,
   PurchaseRepository,

package/src/repositories/{tournament-many-tables-rooms.repository.ts → many-tables-tournament-rooms.repository.ts}

@@ -3,39 +3,35 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import dayjs from 'dayjs';
 
-import {
-  TournamentManyTablesRoom,
-  TournamentManyTablesRoomDocument,
-  TournamentOneTableRoomDocument,
-} from '../';
+import { ManyTablesTournamentRoom, ManyTablesTournamentRoomDocument } from '..';
 import { TournamentStatusEnum } from '../models/tournament-status.enum';
 import { ITournamentWinner } from '../models/tournament-winner.interface';
 import { TournamentTemplateEnum } from '../models/tournament-template.enum';
 import { ITournamentParticipant } from '../models/tournament-participant.interface';
 
 @Injectable()
-export class TournamentManyTablesRoomsRepository {
+export class ManyTablesTournamentRoomsRepository {
   constructor(
-    @InjectModel(TournamentManyTablesRoom.name)
-    private tournamentModel: Model<TournamentManyTablesRoomDocument>,
+    @InjectModel(ManyTablesTournamentRoom.name)
+    private tournamentModel: Model<ManyTablesTournamentRoomDocument>,
   ) {}
 
   async findTournamentById(
     tournamentId: string,
-  ): Promise<TournamentManyTablesRoomDocument | null> {
+  ): Promise<ManyTablesTournamentRoomDocument | null> {
     return this.tournamentModel.findById(tournamentId).exec();
   }
 
   async findTemplateById(
     templateId: string,
     gameType: string,
-  ): Promise<TournamentOneTableRoomDocument | null> {
+  ): Promise<ManyTablesTournamentRoomDocument | null> {
     return this.tournamentModel.findOne({ templateId, gameType }).exec();
   }
 
   async findActualTournaments(
     gameType: string,
-  ): Promise<Array<TournamentManyTablesRoomDocument>> {
+  ): Promise<Array<ManyTablesTournamentRoomDocument>> {
     return this.tournamentModel
       .find({
         $and: [
@@ -58,7 +54,7 @@ export class TournamentManyTablesRoomsRepository {
     gameType: string,
     startDate: Date,
     endDate: Date,
-  ): Promise<TournamentOneTableRoomDocument | null> {
+  ): Promise<ManyTablesTournamentRoomDocument | null> {
     return this.tournamentModel
       .findOne({
         gameType,
@@ -70,15 +66,15 @@ export class TournamentManyTablesRoomsRepository {
   }
 
   async createTournament(
-    tournament: Partial<TournamentManyTablesRoom>,
-  ): Promise<TournamentManyTablesRoomDocument> {
+    tournament: Partial<ManyTablesTournamentRoom>,
+  ): Promise<ManyTablesTournamentRoomDocument> {
     return this.tournamentModel.create(tournament);
   }
 
   async scheduleTournamentFromMasterTemplate(
     gameType: string,
     scheduleDate: Date,
-  ): Promise<TournamentManyTablesRoomDocument> {
+  ): Promise<ManyTablesTournamentRoomDocument> {
     const masterTemplate = await this.findTemplateById(
       TournamentTemplateEnum.MASTER,
       gameType,
@@ -108,8 +104,8 @@ export class TournamentManyTablesRoomsRepository {
 
   async updateTournament(
     tournamentId: string,
-    tournament: Partial<TournamentManyTablesRoom>,
-  ): Promise<TournamentManyTablesRoomDocument> {
+    tournament: Partial<ManyTablesTournamentRoom>,
+  ): Promise<ManyTablesTournamentRoomDocument> {
     return this.tournamentModel
       .findByIdAndUpdate(tournamentId, {
         $set: {

package/src/repositories/menu.repository.ts

@@ -3,16 +3,17 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
 import { Menu, MenuDocument } from '../';
-import { getChannelRegExpFilter } from '../utils';
+import { getGameRegExpFilter, getChannelRegExpFilter } from '../utils';
 
 @Injectable()
 export class MenuRepository {
   constructor(@InjectModel(Menu.name) private menuModel: Model<MenuDocument>) {}
 
-  async findMenus(channel: string, game: string): Promise<Array<Menu> | null> {
+  async findMenus(game: string, channel: string): Promise<Array<Menu> | null> {
     return this.menuModel
       .find({
-        channels: getChannelRegExpFilter(channel),
+        game: getGameRegExpFilter(game),
+        channel: getChannelRegExpFilter(channel),
       })
       .exec();
   }

package/src/repositories/{tournament-one-table-rooms.repository.ts → one-table-tournament-rooms.repository.ts}

@@ -3,29 +3,29 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import dayjs from 'dayjs';
 
-import { TournamentOneTableRoom, TournamentOneTableRoomDocument } from '../';
+import { OneTableTournamentRoom, OneTableTournamentRoomDocument } from '..';
 import { ITournamentParticipant } from '../models/tournament-participant.interface';
 import { TournamentStatusEnum } from '../models/tournament-status.enum';
 import { ITournamentWinner } from '../models/tournament-winner.interface';
 import { TournamentTemplateEnum } from '../models/tournament-template.enum';
 
 @Injectable()
-export class TournamentOneTableRoomsRepository {
+export class OneTableTournamentRoomsRepository {
   constructor(
-    @InjectModel(TournamentOneTableRoom.name)
-    private tournamentModel: Model<TournamentOneTableRoomDocument>,
+    @InjectModel(OneTableTournamentRoom.name)
+    private tournamentModel: Model<OneTableTournamentRoomDocument>,
   ) {}
 
   async findTournamentById(
     tournamentId: string,
-  ): Promise<TournamentOneTableRoomDocument | null> {
+  ): Promise<OneTableTournamentRoomDocument | null> {
     return this.tournamentModel.findById(tournamentId).exec();
   }
 
   async findTemplateById(
     templateId: string,
     gameType: string,
-  ): Promise<TournamentOneTableRoomDocument | null> {
+  ): Promise<OneTableTournamentRoomDocument | null> {
     return this.tournamentModel
       .findOne({ isTemplate: true, templateId, gameType })
       .exec();
@@ -33,7 +33,7 @@ export class TournamentOneTableRoomsRepository {
 
   async findActualTournaments(
     gameType: string,
-  ): Promise<Array<TournamentOneTableRoomDocument>> {
+  ): Promise<Array<OneTableTournamentRoomDocument>> {
     return this.tournamentModel
       .find({
         $and: [
@@ -54,7 +54,7 @@ export class TournamentOneTableRoomsRepository {
 
   async findWaitingTournament(
     gameType: string,
-  ): Promise<TournamentOneTableRoomDocument | null> {
+  ): Promise<OneTableTournamentRoomDocument | null> {
     return this.tournamentModel
       .findOne({
         gameType,
@@ -65,14 +65,14 @@ export class TournamentOneTableRoomsRepository {
   }
 
   async createTournament(
-    tournament: Partial<TournamentOneTableRoom>,
-  ): Promise<TournamentOneTableRoomDocument> {
+    tournament: Partial<OneTableTournamentRoom>,
+  ): Promise<OneTableTournamentRoomDocument> {
     return this.tournamentModel.create(tournament);
   }
 
   async createTournamentFromMasterTemplate(
     gameType: string,
-  ): Promise<TournamentOneTableRoomDocument> {
+  ): Promise<OneTableTournamentRoomDocument> {
     const masterTemplate = await this.findTemplateById(
       TournamentTemplateEnum.MASTER,
       gameType,

package/src/repositories/premium.repository.ts

@@ -3,6 +3,7 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
 import { Premium, PremiumDocument } from '..';
+import { getGameRegExpFilter, getChannelRegExpFilter } from '../utils';
 
 @Injectable()
 export class PremiumRepository {
@@ -10,7 +11,12 @@ export class PremiumRepository {
     @InjectModel(Premium.name) private premiumModel: Model<PremiumDocument>,
   ) {}
 
-  async findPremium(gameType: string): Promise<Premium | null> {
-    return this.premiumModel.findOne({ gameType }).exec();
+  async findPremium(game: string, channel: string): Promise<Premium | null> {
+    return this.premiumModel
+      .findOne({
+        game: getGameRegExpFilter(game),
+        channel: getChannelRegExpFilter(channel),
+      })
+      .exec();
   }
 }

package/src/repositories/products.repository.ts

@@ -3,7 +3,7 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
 import { Product, ProductDocument } from '../';
-import { getChannelRegExpFilter } from '../utils';
+import { getChannelRegExpFilter, getGameRegExpFilter } from '../utils';
 
 @Injectable()
 export class ProductsRepository {
@@ -17,13 +17,15 @@ export class ProductsRepository {
 
   async findProducts(
     parentId: string | null,
+    game: string,
     channel: string,
   ): Promise<Array<Product> | null> {
     return this.productModel
       .find({
         parentId,
         active: true,
-        channels: getChannelRegExpFilter(channel),
+        game: getGameRegExpFilter(game),
+        channel: getChannelRegExpFilter(channel),
       })
       .exec();
   }

package/src/repositories/rating.repository.ts

@@ -3,7 +3,6 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
 import { Rating, RatingDocument } from '..';
-import { getChannelRegExpFilter } from '../utils';
 import { IRatingMonthlyResult } from '../models/rating-monthly-result.interface';
 
 @Injectable()
@@ -12,17 +11,6 @@ export class RatingRepository {
     @InjectModel(Rating.name) private ratingModel: Model<RatingDocument>,
   ) {}
 
-  async findRating(
-    channel: string,
-    game: string,
-  ): Promise<Array<Rating> | null> {
-    return this.ratingModel
-      .find({
-        channels: getChannelRegExpFilter(channel),
-      })
-      .exec();
-  }
-
   async addBulkPlayerRating(items: Array<Rating>): Promise<void> {
     await this.ratingModel.insertMany(items);
   }
@@ -57,7 +45,7 @@ export class RatingRepository {
           userName: { $first: '$userName' },
           userAvatarUrl: { $first: '$userAvatarUrl' },
           game: { $first: '$game' },
-          channels: { $first: '$channels' },
+          channel: { $first: '$channel' },
           count: { $sum: 1 },
           profit: { $sum: '$profit' },
         },
@@ -79,10 +67,11 @@ export class RatingRepository {
           userName: 1,
           userAvatarUrl: 1,
           game: 1,
-          channels: 1,
+          channel: 1,
           count: 1,
           date: '$_id.date',
           rank: 1,
+          profit: 1,
         },
       },
     ]);

package/src/repositories/rule.repository.ts

@@ -3,12 +3,18 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
 import { Rule, RuleDocument } from '..';
+import { getGameRegExpFilter, getChannelRegExpFilter } from '../utils';
 
 @Injectable()
 export class RuleRepository {
   constructor(@InjectModel(Rule.name) private ruleModel: Model<RuleDocument>) {}
 
-  async findRule(gameType: string): Promise<Rule | null> {
-    return this.ruleModel.findOne({ gameType }).exec();
+  async findRule(game: string, channel: string): Promise<Rule | null> {
+    return this.ruleModel
+      .findOne({
+        game: getGameRegExpFilter(game),
+        channel: getChannelRegExpFilter(channel),
+      })
+      .exec();
   }
 }

package/src/repositories/setting.repository.ts

@@ -3,7 +3,7 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
 import { Setting, SettingDocument } from '..';
-import { getChannelRegExpFilter } from '../utils';
+import { getChannelRegExpFilter, getGameRegExpFilter } from '../utils';
 
 @Injectable()
 export class SettingRepository {
@@ -12,12 +12,13 @@ export class SettingRepository {
   ) {}
 
   async findSettings(
-    channel: string,
     game: string,
+    channel: string,
   ): Promise<Array<Setting> | null> {
     return this.settingModel
       .find({
-        channels: getChannelRegExpFilter(channel),
+        game: getGameRegExpFilter(game),
+        channel: getChannelRegExpFilter(channel),
       })
       .exec();
   }

package/src/repositories/welcome.repository.ts

@@ -3,6 +3,7 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
 import { Welcome, WelcomeDocument } from '..';
+import { getGameRegExpFilter, getChannelRegExpFilter } from '../utils';
 
 @Injectable()
 export class WelcomeRepository {
@@ -10,7 +11,12 @@ export class WelcomeRepository {
     @InjectModel(Welcome.name) private welcomeModel: Model<WelcomeDocument>,
   ) {}
 
-  async findWelcome(game: string): Promise<Welcome | null> {
-    return this.welcomeModel.findOne({ game }).exec();
+  async findWelcome(game: string, channel: string): Promise<Welcome | null> {
+    return this.welcomeModel
+      .findOne({
+        game: getGameRegExpFilter(game),
+        channel: getChannelRegExpFilter(channel),
+      })
+      .exec();
   }
 }

package/src/schemas/achievement.schema.ts

@@ -12,17 +12,11 @@ export class Achievement {
   })
   readonly achievementId: string;
 
-  @Prop()
-  title: string;
-
-  @Prop()
-  titleEn: string;
+  @Prop({ type: Object })
+  title: Record<string, string>;
 
-  @Prop()
-  description: string;
-
-  @Prop()
-  descriptionEn: string;
+  @Prop({ type: Object })
+  description: Record<string, string>;
 
   @Prop()
   code: string;