Added fileMaker and fileReviewer for new flow

src/users/entities/db-service/file-maker.db.service.ts

@@ -0,0 +1,63 @@
+import { Injectable } from "@nestjs/common";
+import { InjectModel } from "@nestjs/mongoose";
+import { FilterQuery, Model, Types } from "mongoose";
+import { FileMakerModel } from "../schema/file-maker.schema";
+
+@Injectable()
+export class FileMakerDbService {
+  constructor(
+    @InjectModel(FileMakerModel.name)
+    private readonly fileMakerModel: Model<FileMakerModel>,
+  ) {}
+
+  async create(
+    user: Partial<FileMakerModel> & { password: string },
+  ): Promise<FileMakerModel> {
+    return await this.fileMakerModel.create(user);
+  }
+
+  async findOne(
+    filter: FilterQuery<FileMakerModel>,
+  ): Promise<FileMakerModel | null> {
+    return await this.fileMakerModel.findOne(filter);
+  }
+
+  async findByLoginIdentifier(
+    identifier: string,
+  ): Promise<FileMakerModel | null> {
+    const id = identifier.trim();
+    const or: FilterQuery<FileMakerModel>[] = [
+      { email: id },
+      { username: id },
+    ];
+    if (/^\d{10}$/.test(id)) {
+      or.push({ nationalCode: id });
+    }
+    return await this.fileMakerModel.findOne({ $or: or });
+  }
+
+  async findById(userId: string): Promise<FileMakerModel | null> {
+    return await this.fileMakerModel.findOne({
+      _id: new Types.ObjectId(userId),
+    });
+  }
+
+  async findOneAndUpdate(
+    filter: FilterQuery<FileMakerModel>,
+    update: FilterQuery<FileMakerModel>,
+  ) {
+    return await this.fileMakerModel.findOneAndUpdate(filter, update, {
+      new: true,
+    });
+  }
+
+  async findAll(
+    filter: FilterQuery<FileMakerModel>,
+  ): Promise<(FileMakerModel & { _id: Types.ObjectId })[]> {
+    return await this.fileMakerModel.find(filter).lean();
+  }
+
+  async updateOne(filter: FilterQuery<FileMakerModel>, update: any) {
+    return this.fileMakerModel.updateOne(filter, update);
+  }
+}

src/users/entities/db-service/file-reviewer.db.service.ts

@@ -0,0 +1,63 @@
+import { Injectable } from "@nestjs/common";
+import { InjectModel } from "@nestjs/mongoose";
+import { FilterQuery, Model, Types } from "mongoose";
+import { FileReviewerModel } from "../schema/file-reviewer.schema";
+
+@Injectable()
+export class FileReviewerDbService {
+  constructor(
+    @InjectModel(FileReviewerModel.name)
+    private readonly fileReviewerModel: Model<FileReviewerModel>,
+  ) {}
+
+  async create(
+    user: Partial<FileReviewerModel> & { password: string },
+  ): Promise<FileReviewerModel> {
+    return await this.fileReviewerModel.create(user);
+  }
+
+  async findOne(
+    filter: FilterQuery<FileReviewerModel>,
+  ): Promise<FileReviewerModel | null> {
+    return await this.fileReviewerModel.findOne(filter);
+  }
+
+  async findByLoginIdentifier(
+    identifier: string,
+  ): Promise<FileReviewerModel | null> {
+    const id = identifier.trim();
+    const or: FilterQuery<FileReviewerModel>[] = [
+      { email: id },
+      { username: id },
+    ];
+    if (/^\d{10}$/.test(id)) {
+      or.push({ nationalCode: id });
+    }
+    return await this.fileReviewerModel.findOne({ $or: or });
+  }
+
+  async findById(userId: string): Promise<FileReviewerModel | null> {
+    return await this.fileReviewerModel.findOne({
+      _id: new Types.ObjectId(userId),
+    });
+  }
+
+  async findOneAndUpdate(
+    filter: FilterQuery<FileReviewerModel>,
+    update: FilterQuery<FileReviewerModel>,
+  ) {
+    return await this.fileReviewerModel.findOneAndUpdate(filter, update, {
+      new: true,
+    });
+  }
+
+  async findAll(
+    filter: FilterQuery<FileReviewerModel>,
+  ): Promise<(FileReviewerModel & { _id: Types.ObjectId })[]> {
+    return await this.fileReviewerModel.find(filter).lean();
+  }
+
+  async updateOne(filter: FilterQuery<FileReviewerModel>, update: any) {
+    return this.fileReviewerModel.updateOne(filter, update);
+  }
+}

src/users/entities/schema/file-maker.schema.ts

@@ -0,0 +1,67 @@
+import { Prop, Schema, SchemaFactory } from "@nestjs/mongoose";
+import { Types } from "mongoose";
+import { RoleEnum } from "src/Types&Enums/role.enum";
+
+@Schema({
+  collection: "file-maker",
+  versionKey: false,
+  timestamps: true,
+})
+export class FileMakerModel {
+  _id?: Types.ObjectId;
+
+  @Prop({ required: true })
+  firstName: string;
+
+  @Prop({ required: true })
+  lastName: string;
+
+  @Prop({ type: String, unique: true, sparse: true, required: false })
+  email?: string;
+
+  @Prop({ type: String })
+  username?: string;
+
+  @Prop({ type: String, index: true, sparse: true })
+  nationalCode?: string;
+
+  @Prop({ type: Types.ObjectId, index: true })
+  clientKey?: Types.ObjectId;
+
+  @Prop({ type: Types.ObjectId, index: true })
+  branchId?: Types.ObjectId;
+
+  @Prop({ required: true })
+  password: string;
+
+  @Prop({ required: false })
+  mobile?: string;
+
+  @Prop({ required: false })
+  phone?: string;
+
+  @Prop({ default: RoleEnum.FILE_MAKER })
+  role: RoleEnum;
+
+  @Prop({ type: "string", default: "" })
+  otp: string;
+
+  @Prop({ type: "string", required: false })
+  expertCode?: string;
+
+  createdAt: Date;
+}
+
+export const FileMakerDbSchema = SchemaFactory.createForClass(FileMakerModel);
+
+FileMakerDbSchema.index(
+  { clientKey: 1, nationalCode: 1 },
+  { unique: true, sparse: true },
+);
+
+FileMakerDbSchema.pre("save", function (next) {
+  if (!this.username) {
+    this.username = (this as any).email || (this as any).nationalCode;
+  }
+  next();
+});

src/users/entities/schema/file-reviewer.schema.ts

@@ -0,0 +1,68 @@
+import { Prop, Schema, SchemaFactory } from "@nestjs/mongoose";
+import { Types } from "mongoose";
+import { RoleEnum } from "src/Types&Enums/role.enum";
+
+@Schema({
+  collection: "file-reviewer",
+  versionKey: false,
+  timestamps: true,
+})
+export class FileReviewerModel {
+  _id?: Types.ObjectId;
+
+  @Prop({ required: true })
+  firstName: string;
+
+  @Prop({ required: true })
+  lastName: string;
+
+  @Prop({ type: String, unique: true, sparse: true, required: false })
+  email?: string;
+
+  @Prop({ type: String })
+  username?: string;
+
+  @Prop({ type: String, index: true, sparse: true })
+  nationalCode?: string;
+
+  @Prop({ type: Types.ObjectId, index: true })
+  clientKey?: Types.ObjectId;
+
+  @Prop({ type: Types.ObjectId, index: true })
+  branchId?: Types.ObjectId;
+
+  @Prop({ required: true })
+  password: string;
+
+  @Prop({ required: false })
+  mobile?: string;
+
+  @Prop({ required: false })
+  phone?: string;
+
+  @Prop({ default: RoleEnum.FILE_REVIEWER })
+  role: RoleEnum;
+
+  @Prop({ type: "string", default: "" })
+  otp: string;
+
+  @Prop({ type: "string", required: false })
+  expertCode?: string;
+
+  createdAt: Date;
+}
+
+export const FileReviewerDbSchema =
+  SchemaFactory.createForClass(FileReviewerModel);
+
+FileReviewerDbSchema.index(
+  { clientKey: 1, nationalCode: 1 },
+  { unique: true, sparse: true },
+);
+
+FileReviewerDbSchema.pre("save", function (next) {
+  if (!this.username) {
+    this.username = (this as any).email || (this as any).nationalCode;
+  }
+  next();
+});

src/users/users.module.ts

@@ -9,6 +9,8 @@ import { InsurerExpertDbService } from "./entities/db-service/insurer-expert.db.
 import { RegistrarDbService } from "./entities/db-service/registrar.db.service";
 import { UserDbService } from "./entities/db-service/user.db.service";
 import { ExpertFileActivityDbService } from "./entities/db-service/expert-file-activity.db.service";
+import { FileMakerDbService } from "./entities/db-service/file-maker.db.service";
+import { FileReviewerDbService } from "./entities/db-service/file-reviewer.db.service";
 import {
   DamageExpertDbSchema,
   DamageExpertModel,
@@ -31,6 +33,14 @@ import {
   RegistrarModel,
 } from "./entities/schema/registrar.schema";
 import { UserModel, UserDbSchema } from "./entities/schema/user.schema";
+import {
+  FileMakerDbSchema,
+  FileMakerModel,
+} from "./entities/schema/file-maker.schema";
+import {
+  FileReviewerDbSchema,
+  FileReviewerModel,
+} from "./entities/schema/file-reviewer.schema";
 
 @Module({
   imports: [
@@ -42,6 +52,8 @@ import { UserModel, UserDbSchema } from "./entities/schema/user.schema";
       { name: InsurerExpertModel.name, schema: InsurerExpertDbSchema },
       { name: RegistrarModel.name, schema: RegistrarDbSchema },
       { name: ExpertFileActivity.name, schema: ExpertFileActivitySchema },
+      { name: FileMakerModel.name, schema: FileMakerDbSchema },
+      { name: FileReviewerModel.name, schema: FileReviewerDbSchema },
     ]),
     HashModule,
   ],
@@ -54,6 +66,8 @@ import { UserModel, UserDbSchema } from "./entities/schema/user.schema";
     InsurerExpertDbService,
     RegistrarDbService,
     ExpertFileActivityDbService,
+    FileMakerDbService,
+    FileReviewerDbService,
   ],
   exports: [
     UserDbService,
@@ -63,6 +77,8 @@ import { UserModel, UserDbSchema } from "./entities/schema/user.schema";
     InsurerExpertDbService,
     RegistrarDbService,
     ExpertFileActivityDbService,
+    FileMakerDbService,
+    FileReviewerDbService,
   ],
 })
 export class UsersModule {}