feat: conflict requests

Author: CatDevelop

backend/src/app/analytic/analytic.module.ts

@@ -24,6 +24,8 @@ import { ProgramService } from "../program/program.service";
 import { Program } from "../program/entities/program.entity";
 import { RequestProgramService } from "../request-program/request-program.service";
 import { RequestProgram } from "../request-program/entities/request-program.entity";
+import { PassportProgram } from "../passport-program/entities/passport-program.entity";
+import { PassportProgramService } from "../passport-program/passport-program.service";
 
 @Module({
     imports: [
@@ -39,6 +41,7 @@ import { RequestProgram } from "../request-program/entities/request-program.enti
             Student,
             Program,
             RequestProgram,
+            PassportProgram,
         ]),
         SSEModule,
     ],
@@ -55,6 +58,7 @@ import { RequestProgram } from "../request-program/entities/request-program.enti
         PeriodService,
         StudentService,
         RequestProgramService,
+        PassportProgramService,
     ],
 })
 export class AnalyticModule {}

backend/src/app/app.module.ts

@@ -27,6 +27,7 @@ import { ServeStaticModule } from "@nestjs/serve-static";
 import { SSEModule } from "./sse/sse.module";
 import { ProgramModule } from "./program/program.module";
 import { RequestProgramModule } from "./request-program/request-program.module";
+import { PassportProgramModule } from "./passport-program/passport-program.module";
 
 @Module({
     imports: [
@@ -72,6 +73,7 @@ import { RequestProgramModule } from "./request-program/request-program.module";
         SSEModule,
         ProgramModule,
         RequestProgramModule,
+        PassportProgramModule,
     ],
     controllers: [AppController],
     providers: [AppService],

backend/src/app/partner/partner.controller.ts

@@ -41,6 +41,13 @@ export class PartnerController {
     createRequestReport(@Body() createRequestReportDto: CreateRequestReportDto) {
         return this.partnerService.createRequestReport(createRequestReportDto);
     }
+    @ApiBearerAuth()
+    @Post("request-conflict/report")
+    @UsePipes(new ValidationPipe())
+    @UseGuards(JwtAuthGuard)
+    createRequestConflictReport(@Body() dto: CreateRequestReportDto) {
+        return this.partnerService.createRequestConflictReport(dto);
+    }
 
     @ApiBearerAuth()
     @Post("passport/report")

backend/src/app/partner/partner.module.ts

@@ -20,6 +20,8 @@ import { Program } from "../program/entities/program.entity";
 import { ProgramService } from "../program/program.service";
 import { RequestProgramService } from "../request-program/request-program.service";
 import { RequestProgram } from "../request-program/entities/request-program.entity";
+import { PassportProgramService } from "../passport-program/passport-program.service";
+import { PassportProgram } from "../passport-program/entities/passport-program.entity";
 
 @Module({
     imports: [
@@ -33,6 +35,7 @@ import { RequestProgram } from "../request-program/entities/request-program.enti
             Period,
             Program,
             RequestProgram,
+            PassportProgram,
         ]),
         SSEModule,
     ],
@@ -42,6 +45,7 @@ import { RequestProgram } from "../request-program/entities/request-program.enti
         PassportService,
         ProgramService,
         RequestProgramService,
+        PassportProgramService,
         RequestService,
         CourseService,
         CustomerCompanyService,

backend/src/app/partner/partner.service.ts

@@ -32,6 +32,7 @@ import { RequestProgramService } from "../request-program/request-program.servic
 import { v4 as uuidv4 } from "uuid";
 import { CreateRequestReportDto } from "./dto/create-request-report.dto";
 import { CreatePassportReportDto } from "./dto/create-passport-report.dto";
+import { PassportProgramService } from "../passport-program/passport-program.service";
 
 const XLSX = require("xlsx");
 const JS_XLSX = require("js-xlsx");
@@ -50,6 +51,7 @@ export class PartnerService {
         private readonly periodService: PeriodService,
         private readonly programService: ProgramService,
         private readonly requestProgramService: RequestProgramService,
+        private readonly passportProgramService: PassportProgramService,
         private readonly sseService: SSEService,
     ) {}
 
@@ -317,21 +319,6 @@ export class PartnerService {
                         await this.requestService.update(currentRequest.id, RequestMappers.toUpdateDto(currentRequest));
                     }
 
-                    for (let program of currentPassport.programs) {
-                        if (!(await this.requestProgramService.isCreate(currentRequest.id, program.program.id))) {
-                            // Программы для заявки не существует
-                            if (await this.programService.isCreate(program.program.id)) {
-                                const requestProgram = await this.requestProgramService.create({
-                                    requestId: currentRequest.id,
-                                    programId: program.program.id,
-                                });
-                                this.logger.log(
-                                    "\tCreate request program: (id:" + requestProgram.requestProgramID + ")",
-                                );
-                            }
-                        }
-                    }
-
                     if (!(await this.passportService.isCreate(passport.id))) {
                         // Паспорта не существует
                         this.logger.log("\tCreate passport: (id:" + passport.id + ")");
@@ -343,6 +330,21 @@ export class PartnerService {
                             PassportMappers.toUpdateDto(currentPassport),
                         );
                     }
+
+                    for (let program of currentPassport.programs) {
+                        if (!(await this.passportProgramService.isCreate(currentPassport.id, program.program.id))) {
+                            // Программы для паспорта не существует
+                            if (await this.programService.isCreate(program.program.id)) {
+                                const passportProgram = await this.passportProgramService.create({
+                                    passportId: currentPassport.id,
+                                    programId: program.program.id,
+                                });
+                                this.logger.log(
+                                    "\tCreate passport program: (id:" + passportProgram.passportProgramID + ")",
+                                );
+                            }
+                        }
+                    }
                 }
             } catch (error) {
                 throw new BadRequestException(error);
@@ -765,4 +767,208 @@ export class PartnerService {
         console.log("End of create report");
         return { reportFile: `${bookId}.xlsx` };
     }
+
+    async createRequestConflictReport(dto: CreateRequestReportDto) {
+        let requests = await this.requestService.findConflicts({
+            period_id: dto.periodId,
+            programs: [],
+        });
+
+        let workbook = XLSX.utils.book_new();
+
+        let requestsWithMixedSheet = {
+            "!ref": "A1:K" + (requests.requestsWithMixed.length + 1),
+            A1: {
+                t: "s",
+                v: "Номер заявки",
+            },
+            B1: {
+                t: "s",
+                v: "Название",
+            },
+            C1: {
+                t: "s",
+                v: "Описание",
+            },
+            D1: {
+                t: "s",
+                v: "Цель",
+            },
+            E1: {
+                t: "s",
+                v: "Критерии",
+            },
+            F1: {
+                t: "s",
+                v: "Статус",
+            },
+            G1: {
+                t: "s",
+                v: "Заказчик",
+            },
+            H1: {
+                t: "s",
+                v: "Представитель заказчика",
+            },
+            I1: {
+                t: "s",
+                v: "Количество паспортов",
+            },
+            J1: {
+                t: "s",
+                v: "Ссылка",
+            },
+            K1: {
+                t: "s",
+                v: "Программы",
+            },
+        };
+
+        requests.requestsWithMixed.forEach((request, index) => {
+            requestsWithMixedSheet["A" + (index + 2)] = { t: "s", v: request.uid };
+            requestsWithMixedSheet["B" + (index + 2)] = { t: "s", v: request.name };
+            requestsWithMixedSheet["C" + (index + 2)] = {
+                t: "s",
+                v: htmlToText(request.description),
+            };
+            requestsWithMixedSheet["D" + (index + 2)] = {
+                t: "s",
+                v: htmlToText(request.goal),
+            };
+            requestsWithMixedSheet["E" + (index + 2)] = {
+                t: "s",
+                v: htmlToText(request.criteria),
+            };
+            requestsWithMixedSheet["F" + (index + 2)] = {
+                t: "s",
+                v: htmlToText(request.status),
+            };
+            requestsWithMixedSheet["G" + (index + 2)] = {
+                t: "s",
+                v: htmlToText(request.customer_user.customer_company.name),
+            };
+            requestsWithMixedSheet["H" + (index + 2)] = {
+                t: "s",
+                v:
+                    (request.customer_user.last_name || "") +
+                    " " +
+                    (request.customer_user.first_name || "") +
+                    " " +
+                    (request.customer_user.middle_name || ""),
+            };
+            requestsWithMixedSheet["I" + (index + 2)] = {
+                t: "s",
+                v: request.passports.length,
+            };
+            requestsWithMixedSheet["J" + (index + 2)] = {
+                t: "s",
+                v: "https://partner.urfu.ru/ptraining/services/learning/#/requests/" + request.id,
+            };
+            requestsWithMixedSheet["K" + (index + 2)] = {
+                t: "s",
+                v: request.programs.map((p) => `${p.program.uid} ${p.program.name}`).join("\n"),
+            };
+        });
+
+        let requestsWithoutShesterov = {
+            "!ref": "A1:K" + (requests.requestsWithoutShesterov.length + 1),
+            A1: {
+                t: "s",
+                v: "Номер заявки",
+            },
+            B1: {
+                t: "s",
+                v: "Название",
+            },
+            C1: {
+                t: "s",
+                v: "Описание",
+            },
+            D1: {
+                t: "s",
+                v: "Цель",
+            },
+            E1: {
+                t: "s",
+                v: "Критерии",
+            },
+            F1: {
+                t: "s",
+                v: "Статус",
+            },
+            G1: {
+                t: "s",
+                v: "Заказчик",
+            },
+            H1: {
+                t: "s",
+                v: "Представитель заказчика",
+            },
+            I1: {
+                t: "s",
+                v: "Количество паспортов",
+            },
+            J1: {
+                t: "s",
+                v: "Ссылка",
+            },
+            K1: {
+                t: "s",
+                v: "Программы",
+            },
+        };
+
+        requests.requestsWithoutShesterov.forEach((request, index) => {
+            requestsWithoutShesterov["A" + (index + 2)] = { t: "s", v: request.uid };
+            requestsWithoutShesterov["B" + (index + 2)] = { t: "s", v: request.name };
+            requestsWithoutShesterov["C" + (index + 2)] = {
+                t: "s",
+                v: htmlToText(request.description),
+            };
+            requestsWithoutShesterov["D" + (index + 2)] = {
+                t: "s",
+                v: htmlToText(request.goal),
+            };
+            requestsWithoutShesterov["E" + (index + 2)] = {
+                t: "s",
+                v: htmlToText(request.criteria),
+            };
+            requestsWithoutShesterov["F" + (index + 2)] = {
+                t: "s",
+                v: htmlToText(request.status),
+            };
+            requestsWithoutShesterov["G" + (index + 2)] = {
+                t: "s",
+                v: htmlToText(request.customer_user.customer_company.name),
+            };
+            requestsWithoutShesterov["H" + (index + 2)] = {
+                t: "s",
+                v:
+                    (request.customer_user.last_name || "") +
+                    " " +
+                    (request.customer_user.first_name || "") +
+                    " " +
+                    (request.customer_user.middle_name || ""),
+            };
+            requestsWithoutShesterov["I" + (index + 2)] = {
+                t: "s",
+                v: request.passports.length,
+            };
+            requestsWithoutShesterov["J" + (index + 2)] = {
+                t: "s",
+                v: "https://partner.urfu.ru/ptraining/services/learning/#/requests/" + request.id,
+            };
+            requestsWithoutShesterov["K" + (index + 2)] = {
+                t: "s",
+                v: request.programs.map((p) => `${p.program.uid} ${p.program.name}`).join("\n"),
+            };
+        });
+
+        XLSX.utils.book_append_sheet(workbook, requestsWithMixedSheet, "Есть целевые и другие");
+        XLSX.utils.book_append_sheet(workbook, requestsWithoutShesterov, "Есть только другие");
+        const bookId = uuidv4();
+        JS_XLSX.writeFile(workbook, `static/${bookId}.xlsx`);
+        console.log("End of create report");
+        return { reportFile: `${bookId}.xlsx` };
+    }
 }

backend/src/app/passport-program/dto/create-passport-program.dto.ts

@@ -0,0 +1,12 @@
+import { IsNumber } from "class-validator";
+import { ApiProperty } from "@nestjs/swagger";
+
+export class CreatePassportProgramDto {
+    @ApiProperty()
+    @IsNumber()
+    passportId: number;
+
+    @ApiProperty()
+    @IsNumber()
+    programId: number;
+}

backend/src/app/passport-program/entities/passport-program.entity.ts

@@ -0,0 +1,22 @@
+import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from "typeorm";
+import { ApiProperty } from "@nestjs/swagger";
+import { Program } from "../../program/entities/program.entity";
+import { Passport } from "../../passport/entities/passport.entity";
+
+@Entity()
+export class PassportProgram {
+    @ApiProperty()
+    @PrimaryGeneratedColumn()
+    id: number;
+
+    @Column({ nullable: true })
+    status: string;
+
+    @ManyToOne(() => Passport, (passport) => passport.id, { nullable: true })
+    @JoinColumn({ name: "passport" })
+    passport: Passport;
+
+    @ManyToOne(() => Program, (program) => program.id, { nullable: true })
+    @JoinColumn({ name: "program" })
+    program: Program;
+}