jp.db.schemas 2.2.12 → 2.2.14

package/src/repositories/users.repository.ts

@@ -1,153 +1,153 @@
-import { Injectable } from '@nestjs/common';
-import { InjectModel } from '@nestjs/mongoose';
-import { Model } from 'mongoose';
-import { BulkWriteResult } from 'mongodb';
-
-import { User, UserDocument } from '../';
-
-function getFullNameFilter(userName: string) {
-  const regexpName = {
-    $regex: userName,
-    $options: 'i',
-  };
-
-  return userName
-    ? { $or: [{ fullName: regexpName }, { fullNameAlias: regexpName }] }
-    : {};
-}
-
-export type UserGameResultType = {
-  userId: string;
-  balanceAdding: number;
-  experienceAdding: number;
-  levelAdding: number;
-};
-
-@Injectable()
-export class UsersRepository {
-  constructor(@InjectModel(User.name) private userModel: Model<UserDocument>) {}
-
-  async findById(id: string): Promise<User | null> {
-    return this.userModel.findById(id).exec();
-  }
-
-  async findByVKId(vkId: number): Promise<User | null> {
-    return this.userModel.findOne({ 'vkUser.id': vkId }).exec();
-  }
-
-  async findByOkId(okId: string): Promise<User | null> {
-    return this.userModel.findOne({ 'okUser.uid': okId }).exec();
-  }
-
-  async findByYAId(yaId: string): Promise<User | null> {
-    return this.userModel.findOne({ 'yaUser.userId': yaId }).exec();
-  }
-
-  async findByGoogleId(googleId: string): Promise<User | null> {
-    return this.userModel.findOne({ 'googleUser.userId': googleId }).exec();
-  }
-
-  async findByFBId(fbId: string): Promise<User | null> {
-    return this.userModel.findOne({ 'fbUser.playerId': fbId }).exec();
-  }
-
-  async findByTGId(tgId: number): Promise<User | null> {
-    return this.userModel.findOne({ 'tgUser.id': tgId }).exec();
-  }
-
-  async findAndCount(
-    userName: string,
-    limit: number,
-    skip: number,
-  ): Promise<{
-    items: Array<User>;
-    total: number;
-  }> {
-    const items = await this.userModel
-      .find(getFullNameFilter(userName))
-      .limit(limit)
-      .skip(skip)
-      .exec();
-
-    const total = await this.userModel
-      .find(getFullNameFilter(userName))
-      .countDocuments()
-      .exec();
-
-    return { items, total };
-  }
-
-  async createUser(user: Partial<User>): Promise<User> {
-    return this.userModel.create(user);
-  }
-
-  async updateUser(
-    userId: string,
-    user: Partial<User>,
-    balanceAdding?: number,
-  ): Promise<UserDocument | null> {
-    delete user.balance;
-
-    return this.userModel
-      .findByIdAndUpdate(
-        userId,
-        {
-          $set: {
-            ...user,
-          },
-          $inc: { balance: balanceAdding ?? 0 },
-        },
-        { new: true },
-      )
-      .exec();
-  }
-
-  async saveGameResult(
-    usersBalances: Array<UserGameResultType>,
-  ): Promise<BulkWriteResult> {
-    return this.userModel.bulkWrite(
-      usersBalances.map((item) => ({
-        updateOne: {
-          filter: { _id: item.userId },
-          update: {
-            $inc: {
-              balance: item.balanceAdding,
-              experience: item.experienceAdding,
-              level: item.levelAdding,
-            },
-          },
-        },
-      })),
-    );
-  }
-
-  async addToBalance(
-    userId: string,
-    balanceAdding: number,
-  ): Promise<UserDocument | null> {
-    return this.userModel
-      .findByIdAndUpdate(
-        userId,
-        {
-          $inc: { balance: balanceAdding },
-        },
-        { new: true },
-      )
-      .exec();
-  }
-
-  async subtractFromBalance(
-    userId: string,
-    balanceSubtraction: number,
-  ): Promise<UserDocument | null> {
-    return this.userModel
-      .findByIdAndUpdate(
-        userId,
-        {
-          $inc: { balance: -balanceSubtraction },
-        },
-        { new: true },
-      )
-      .exec();
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { InjectModel } from '@nestjs/mongoose';
+import { Model } from 'mongoose';
+import { BulkWriteResult } from 'mongodb';
+
+import { User, UserDocument } from '../';
+
+function getFullNameFilter(userName: string) {
+  const regexpName = {
+    $regex: userName,
+    $options: 'i',
+  };
+
+  return userName
+    ? { $or: [{ fullName: regexpName }, { fullNameAlias: regexpName }] }
+    : {};
+}
+
+export type UserGameResultType = {
+  userId: string;
+  balanceAdding: number;
+  experienceAdding: number;
+  levelAdding: number;
+};
+
+@Injectable()
+export class UsersRepository {
+  constructor(@InjectModel(User.name) private userModel: Model<UserDocument>) {}
+
+  async findById(id: string): Promise<User | null> {
+    return this.userModel.findById(id).exec();
+  }
+
+  async findByVKId(vkId: number): Promise<User | null> {
+    return this.userModel.findOne({ 'vkUser.id': vkId }).exec();
+  }
+
+  async findByOkId(okId: string): Promise<User | null> {
+    return this.userModel.findOne({ 'okUser.uid': okId }).exec();
+  }
+
+  async findByYAId(yaId: string): Promise<User | null> {
+    return this.userModel.findOne({ 'yaUser.userId': yaId }).exec();
+  }
+
+  async findByGoogleId(googleId: string): Promise<User | null> {
+    return this.userModel.findOne({ 'googleUser.userId': googleId }).exec();
+  }
+
+  async findByFBId(fbId: string): Promise<User | null> {
+    return this.userModel.findOne({ 'fbUser.playerId': fbId }).exec();
+  }
+
+  async findByTGId(tgId: number): Promise<User | null> {
+    return this.userModel.findOne({ 'tgUser.id': tgId }).exec();
+  }
+
+  async findAndCount(
+    userName: string,
+    limit: number,
+    skip: number,
+  ): Promise<{
+    items: Array<User>;
+    total: number;
+  }> {
+    const items = await this.userModel
+      .find(getFullNameFilter(userName))
+      .limit(limit)
+      .skip(skip)
+      .exec();
+
+    const total = await this.userModel
+      .find(getFullNameFilter(userName))
+      .countDocuments()
+      .exec();
+
+    return { items, total };
+  }
+
+  async createUser(user: Partial<User>): Promise<User> {
+    return this.userModel.create(user);
+  }
+
+  async updateUser(
+    userId: string,
+    user: Partial<User>,
+    balanceAdding?: number,
+  ): Promise<UserDocument | null> {
+    delete user.balance;
+
+    return this.userModel
+      .findByIdAndUpdate(
+        userId,
+        {
+          $set: {
+            ...user,
+          },
+          $inc: { balance: balanceAdding ?? 0 },
+        },
+        { new: true },
+      )
+      .exec();
+  }
+
+  async saveGameResult(
+    usersBalances: Array<UserGameResultType>,
+  ): Promise<BulkWriteResult> {
+    return this.userModel.bulkWrite(
+      usersBalances.map((item) => ({
+        updateOne: {
+          filter: { _id: item.userId },
+          update: {
+            $inc: {
+              balance: item.balanceAdding,
+              experience: item.experienceAdding,
+              level: item.levelAdding,
+            },
+          },
+        },
+      })),
+    );
+  }
+
+  async addToBalance(
+    userId: string,
+    balanceAdding: number,
+  ): Promise<UserDocument | null> {
+    return this.userModel
+      .findByIdAndUpdate(
+        userId,
+        {
+          $inc: { balance: balanceAdding },
+        },
+        { new: true },
+      )
+      .exec();
+  }
+
+  async subtractFromBalance(
+    userId: string,
+    balanceSubtraction: number,
+  ): Promise<UserDocument | null> {
+    return this.userModel
+      .findByIdAndUpdate(
+        userId,
+        {
+          $inc: { balance: -balanceSubtraction },
+        },
+        { new: true },
+      )
+      .exec();
+  }
+}

package/src/repositories/welcome.repository.ts

@@ -1,16 +1,22 @@
-import { Injectable } from '@nestjs/common';
-import { InjectModel } from '@nestjs/mongoose';
-import { Model } from 'mongoose';
-
-import { Welcome, WelcomeDocument } from '..';
-
-@Injectable()
-export class WelcomeRepository {
-  constructor(
-    @InjectModel(Welcome.name) private welcomeModel: Model<WelcomeDocument>,
-  ) {}
-
-  async findWelcome(game: string): Promise<Welcome | null> {
-    return this.welcomeModel.findOne({ game }).exec();
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { InjectModel } from '@nestjs/mongoose';
+import { Model } from 'mongoose';
+
+import { Welcome, WelcomeDocument } from '..';
+import { getGameRegExpFilter, getChannelRegExpFilter } from '../utils';
+
+@Injectable()
+export class WelcomeRepository {
+  constructor(
+    @InjectModel(Welcome.name) private welcomeModel: Model<WelcomeDocument>,
+  ) {}
+
+  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

@@ -1,40 +1,34 @@
-import { Prop, Schema, SchemaFactory, Virtual } from '@nestjs/mongoose';
-import { Document, HydratedDocument } from 'mongoose';
-
-export type AchievementDocument = HydratedDocument<Achievement>;
-
-@Schema()
-export class Achievement {
-  @Virtual({
-    get: function (this: Document) {
-      return this._id.toString();
-    },
-  })
-  readonly achievementId: string;
-
-  @Prop()
-  title: string;
-
-  @Prop()
-  titleEn: string;
-
-  @Prop()
-  description: string;
-
-  @Prop()
-  descriptionEn: string;
-
-  @Prop()
-  code: string;
-
-  @Prop()
-  vkId: string;
-
-  @Prop()
-  prize: number;
-
-  @Prop()
-  game?: string;
-}
-
-export const AchievementSchema = SchemaFactory.createForClass(Achievement);
+import { Prop, Schema, SchemaFactory, Virtual } from '@nestjs/mongoose';
+import { Document, HydratedDocument } from 'mongoose';
+
+export type AchievementDocument = HydratedDocument<Achievement>;
+
+@Schema()
+export class Achievement {
+  @Virtual({
+    get: function (this: Document) {
+      return this._id.toString();
+    },
+  })
+  readonly achievementId: string;
+
+  @Prop({ type: Object })
+  title: Record<string, string>;
+
+  @Prop({ type: Object })
+  description: Record<string, string>;
+
+  @Prop()
+  code: string;
+
+  @Prop()
+  vkId: string;
+
+  @Prop()
+  prize: number;
+
+  @Prop()
+  game?: string;
+}
+
+export const AchievementSchema = SchemaFactory.createForClass(Achievement);

package/src/schemas/activity_log.schema.ts

@@ -1,37 +1,37 @@
-import { Prop, Schema, SchemaFactory, Virtual } from '@nestjs/mongoose';
-import { Document, HydratedDocument } from 'mongoose';
-
-export type ActivityLogDocument = HydratedDocument<ActivityLog>;
-
-@Schema({ collection: 'activity_log' })
-export class ActivityLog {
-  @Virtual({
-    get: function (this: Document) {
-      return this._id.toString();
-    },
-  })
-  readonly activityLogId: string;
-
-  @Prop({ default: new Date() })
-  date: Date;
-
-  @Prop()
-  event: string;
-
-  @Prop()
-  userId: string;
-
-  @Prop()
-  userName: string;
-
-  @Prop()
-  amount?: number;
-
-  @Prop()
-  game: string;
-
-  @Prop()
-  channels: string;
-}
-
-export const ActivityLogSchema = SchemaFactory.createForClass(ActivityLog);
+import { Prop, Schema, SchemaFactory, Virtual } from '@nestjs/mongoose';
+import { Document, HydratedDocument } from 'mongoose';
+
+export type ActivityLogDocument = HydratedDocument<ActivityLog>;
+
+@Schema({ collection: 'activity_log' })
+export class ActivityLog {
+  @Virtual({
+    get: function (this: Document) {
+      return this._id.toString();
+    },
+  })
+  readonly activityLogId: string;
+
+  @Prop({ default: new Date() })
+  date: Date;
+
+  @Prop()
+  event: string;
+
+  @Prop()
+  userId: string;
+
+  @Prop()
+  userName: string;
+
+  @Prop()
+  amount?: number;
+
+  @Prop()
+  game: string;
+
+  @Prop()
+  channel: string;
+}
+
+export const ActivityLogSchema = SchemaFactory.createForClass(ActivityLog);

package/src/schemas/admin.schema.ts

@@ -1,22 +1,22 @@
-import { Prop, Schema, SchemaFactory, Virtual } from '@nestjs/mongoose';
-import { Document, HydratedDocument } from 'mongoose';
-
-export type AdminDocument = HydratedDocument<Admin>;
-
-@Schema()
-export class Admin {
-  @Virtual({
-    get: function (this: Document) {
-      return this._id.toString();
-    },
-  })
-  readonly adminId: string;
-
-  @Prop()
-  login: string;
-
-  @Prop()
-  pass: string;
-}
-
-export const AdminSchema = SchemaFactory.createForClass(Admin);
+import { Prop, Schema, SchemaFactory, Virtual } from '@nestjs/mongoose';
+import { Document, HydratedDocument } from 'mongoose';
+
+export type AdminDocument = HydratedDocument<Admin>;
+
+@Schema()
+export class Admin {
+  @Virtual({
+    get: function (this: Document) {
+      return this._id.toString();
+    },
+  })
+  readonly adminId: string;
+
+  @Prop()
+  login: string;
+
+  @Prop()
+  pass: string;
+}
+
+export const AdminSchema = SchemaFactory.createForClass(Admin);

package/src/schemas/article.schema.ts

@@ -1,37 +1,37 @@
-import { Prop, Schema, SchemaFactory, Virtual } from '@nestjs/mongoose';
-import { Document, HydratedDocument } from 'mongoose';
-
-export type ArticleDocument = HydratedDocument<Article>;
-
-@Schema()
-export class Article {
-  @Virtual({
-    get: function (this: Document) {
-      return this._id.toString();
-    },
-  })
-  readonly articleId: string;
-
-  @Prop()
-  title: string;
-
-  @Prop()
-  titleEn: string;
-
-  @Prop()
-  text: string;
-
-  @Prop()
-  textEn: string;
-
-  @Prop()
-  cover: string;
-
-  @Prop()
-  createDate: Date;
-
-  @Prop()
-  keywords: string;
-}
-
-export const ArticleSchema = SchemaFactory.createForClass(Article);
+import { Prop, Schema, SchemaFactory, Virtual } from '@nestjs/mongoose';
+import { Document, HydratedDocument } from 'mongoose';
+
+export type ArticleDocument = HydratedDocument<Article>;
+
+@Schema()
+export class Article {
+  @Virtual({
+    get: function (this: Document) {
+      return this._id.toString();
+    },
+  })
+  readonly articleId: string;
+
+  @Prop()
+  title: string;
+
+  @Prop()
+  titleEn: string;
+
+  @Prop()
+  text: string;
+
+  @Prop()
+  textEn: string;
+
+  @Prop()
+  cover: string;
+
+  @Prop()
+  createDate: Date;
+
+  @Prop()
+  keywords: string;
+}
+
+export const ArticleSchema = SchemaFactory.createForClass(Article);