fix download cv in profile

Author: Awakich

projects/social_platform/src/app/auth/services/auth.service.ts

@@ -76,12 +76,8 @@ export class AuthService {
       .pipe(map(json => plainToInstance(RegisterResponse, json)));
   }
 
-  /**
-   * Отправить резюме по email
-   * @returns Observable завершения операции
-   */
-  sendCV(): Observable<any> {
-    return this.apiService.get(`${this.AUTH_USERS_URL}/send_mail_cv/`);
+  downloadCV() {
+    return this.apiService.getFile(`${this.AUTH_USERS_URL}/download_cv/`);
   }
 
   /** Поток данных профиля пользователя */

projects/social_platform/src/app/office/features/detail/detail.component.html

@@ -545,10 +545,9 @@ <h3 class="text-body-14 cancel__title" style="flex-wrap: wrap; width: 90%">
 
           @if (+profile.id === +info().id) {
           <app-button
-            (click)="sendCVEmail()"
+            (click)="downloadCV()"
             size="medium"
-            style="opacity: 0, 5"
-            [disabled]="true"
+            [loader]="isSended"
             appearance="outline"
             customTypographyClass="text-body-12"
             >cкачать CV</app-button
@@ -645,18 +644,19 @@ <h3 class="text-body-12 lists__title">подтвердить владение н
                 <i
                   (click)="isDelayModalOpen = false"
                   appIcon
+                  appSquare="8"
                   icon="cross"
                   class="cancel__cross"
                 ></i>
                 <p class="cancel__title text-bold-body-16">Повторите загрузку позже</p>
               </div>
               <p class="text-body-14 cancel__text">
-                Скачивание будет доступно через {{ errorMessageModal() }} секунд.
+                Скачивание будет доступно через несколько секунд.
               </p>
             </div>
           </app-modal>
 
-          <app-modal [open]="isSended" (openChange)="isSended = !isSended">
+          <!-- <app-modal [open]="isSended" (openChange)="isSended = !isSended">
             <div class="cancel">
               <div class="cancel__top">
                 <i
@@ -673,7 +673,7 @@ <h3 class="text-body-12 lists__title">подтвердить владение н
                 Технические сложности? Мы всегда на связи в Telegram — {{ "@procollab_support" }}
               </p>
             </div>
-          </app-modal>
+          </app-modal> -->
         </ng-template>
 
         <router-outlet></router-outlet>

projects/social_platform/src/app/office/features/detail/detail.component.ts

@@ -2,8 +2,8 @@
 
 import { CommonModule, Location } from "@angular/common";
 import { ChangeDetectorRef, Component, inject, OnDestroy, OnInit, signal } from "@angular/core";
-import { ButtonComponent, InputComponent } from "@ui/components";
-import { BackComponent, IconComponent } from "@uilib";
+import { ButtonComponent } from "@ui/components";
+import { IconComponent } from "@uilib";
 import { ModalComponent } from "@ui/components/modal/modal.component";
 import { ActivatedRoute, Router, RouterModule } from "@angular/router";
 import { AuthService } from "@auth/services";
@@ -23,15 +23,13 @@ import { ProfileDataService } from "@office/profile/detail/services/profile-date
 import { ProfileService } from "projects/skills/src/app/profile/services/profile.service";
 import { SnackbarService } from "@ui/services/snackbar.service";
 import { ApproveSkillComponent } from "../approve-skill/approve-skill.component";
-import { ProjectsService } from "@office/projects/services/projects.service";
-import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe";
 import { ProgramService } from "@office/program/services/program.service";
 import { ProjectFormService } from "@office/projects/edit/services/project-form.service";
 import {
   PartnerProgramFields,
   projectNewAdditionalProgramVields,
 } from "@office/models/partner-program-fields.model";
-import { HttpRequest, HttpResponse } from "@angular/common/http";
+import { saveFile } from "@utils/helpers/export-file";
 
 @Component({
   selector: "app-detail",
@@ -42,13 +40,10 @@ import { HttpRequest, HttpResponse } from "@angular/common/http";
     RouterModule,
     IconComponent,
     ButtonComponent,
-    BackComponent,
     ModalComponent,
     AvatarComponent,
     TooltipComponent,
-    InputComponent,
     ApproveSkillComponent,
-    TruncatePipe,
   ],
   standalone: true,
 })
@@ -64,7 +59,6 @@ export class DeatilComponent implements OnInit, OnDestroy {
   private readonly location = inject(Location);
   private readonly profileDataService = inject(ProfileDataService);
   public readonly skillsProfileService = inject(ProfileService);
-  private readonly projectsService = inject(ProjectsService);
   public readonly chatService = inject(ChatService);
   private readonly cdRef = inject(ChangeDetectorRef);
   private readonly programService = inject(ProgramService);
@@ -388,15 +382,17 @@ export class DeatilComponent implements OnInit, OnDestroy {
    * Отправка CV пользователя на email
    * Проверяет ограничения по времени и отправляет CV на почту пользователя
    */
-  sendCVEmail() {
-    this.authService.sendCV().subscribe({
-      next: () => {
-        this.isSended = true;
+  downloadCV() {
+    this.isSended = true;
+    this.authService.downloadCV().subscribe({
+      next: blob => {
+        saveFile(blob, "cv", this.profile?.firstName + " " + this.profile?.lastName);
+        this.isSended = false;
       },
       error: err => {
+        this.isSended = false;
         if (err.status === 400) {
           this.isDelayModalOpen = true;
-          this.errorMessageModal.set(err.error.seconds_after_retry);
         }
       },
     });

projects/social_platform/src/app/office/program/detail/list/list.component.ts

@@ -506,7 +506,7 @@ export class ProgramListComponent implements OnInit, OnDestroy, AfterViewInit {
 
     this.exportFileService.exportAllProjects(programId).subscribe({
       next: blob => {
-        saveFile(this.programDataService.getProgramName(), blob, "all");
+        saveFile(blob, "all", this.programDataService.getProgramName());
         this.loadingExportProjects.set(false);
       },
       error: err => {
@@ -522,7 +522,7 @@ export class ProgramListComponent implements OnInit, OnDestroy, AfterViewInit {
 
     this.exportFileService.exportSubmittedProjects(programId).subscribe({
       next: blob => {
-        saveFile(this.programDataService.getProgramName(), blob, "submitted");
+        saveFile(blob, "submitted", this.programDataService.getProgramName());
         this.loadingExportSubmittedProjects.set(false);
       },
       error: () => {
@@ -537,7 +537,7 @@ export class ProgramListComponent implements OnInit, OnDestroy, AfterViewInit {
 
     this.exportFileService.exportProgramRates(programId).subscribe({
       next: blob => {
-        saveFile(this.programDataService.getProgramName(), blob, "rates");
+        saveFile(blob, "rates", this.programDataService.getProgramName());
         this.loadingExportRates.set(false);
       },
       error: () => {

projects/social_platform/src/app/utils/helpers/export-file.ts

@@ -8,13 +8,16 @@
 import { saveAs } from "file-saver";
 
 export const saveFile = (
-  programName: string,
   blob: Blob,
-  type: "all" | "submitted" | "rates"
+  type: "all" | "submitted" | "rates" | "cv",
+  name?: string
 ): void => {
   const prefixFileName =
     type === "all" ? "projects" : type === "rates" ? "scores" : "projects_review";
   const todayDate = new Date().toLocaleDateString("ru-RU");
-  const fullName = prefixFileName + "-" + programName + "-" + todayDate + ".xlsx";
+  const fullName =
+    (type !== "cv" ? prefixFileName + "-" : "") +
+    name +
+    (type !== "cv" ? "-" + todayDate + ".xlsx" : ".pdf");
   saveAs(blob, fullName);
 };