From c6adc71f77513d17c20600c1ecffe66aa46efe88 Mon Sep 17 00:00:00 2001
From: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Thu, 11 Nov 2021 12:31:06 +0100
Subject: [PATCH] Updated export functionality

---
 .../deltagare-export.component.html           | 10 +++---
 .../deltagare-export.component.ts             | 34 ++++++++++++++-----
 .../deltagare-export.model.ts                 |  1 +
 .../api/deltagare-export.request.model.ts     |  1 +
 .../shared/services/api/export.api.service.ts |  4 +--
 5 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/apps/mina-sidor-fa/src/app/pages/exports/pages/deltagare-export/deltagare-export.component.html b/apps/mina-sidor-fa/src/app/pages/exports/pages/deltagare-export/deltagare-export.component.html
index c24f9f6..535871d 100644
--- a/apps/mina-sidor-fa/src/app/pages/exports/pages/deltagare-export/deltagare-export.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/exports/pages/deltagare-export/deltagare-export.component.html
@@ -4,10 +4,11 @@
       <header class="deltagare-export__header">
         <h1>Exportera information om deltagare</h1>
         <p>
-          Här kan du exportera deltagarinformation. Informationen laddas ner till din dator i CSV-format. Du kan endast
-          exportera deltagare som du har behörighet att se. Detta innebär att du bara kan få ut de deltagare som är
-          kopplade till samma utförande verksamhet och adress som du är inloggad på. Du kan även välja att inkludera
-          deltagare som exporterats vid tidigare tillfälle. Deltagare som exporterats tidigare markeras i filen.
+          Här kan du exportera deltagarinformation. Informationen laddas ner till din dator i CSV eller Excel format. Du
+          kan endast exportera deltagare som du har behörighet att se. Detta innebär att du bara kan få ut de deltagare
+          som är kopplade till samma utförande verksamhet och adress som du är inloggad på. Du kan även välja att
+          inkludera deltagare som exporterats vid tidigare tillfälle. Deltagare som exporterats tidigare markeras i
+          filen.
         </p>
       </header>
       <form class="deltagare-export__form" [formGroup]="formGroup" (ngSubmit)="fetchExportFile()">
@@ -41,6 +42,7 @@
           [formControl]="includeExportedDeltagareFormControl"
           uiLabel="Inkludera redan exporterade deltagare"
         ></ui-checkbox>
+        <ui-checkbox [formControl]="isExcelFormControl" uiLabel="Exportera i Excel format"></ui-checkbox>
         <footer class="deltagare-export__footer">
           <digi-notification-alert
             *ngIf="fetchError$ | async as error"
diff --git a/apps/mina-sidor-fa/src/app/pages/exports/pages/deltagare-export/deltagare-export.component.ts b/apps/mina-sidor-fa/src/app/pages/exports/pages/deltagare-export/deltagare-export.component.ts
index 595aa97..8b14d87 100644
--- a/apps/mina-sidor-fa/src/app/pages/exports/pages/deltagare-export/deltagare-export.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/exports/pages/deltagare-export/deltagare-export.component.ts
@@ -2,6 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { DeltagareExportRequest } from '@msfa-models/api/deltagare-export.request.model';
 import { CustomError } from '@msfa-models/error/custom-error';
+import { formatDate } from '@msfa-shared/utils/format-to-date.util';
 import { saveAs } from 'file-saver';
 import { BehaviorSubject } from 'rxjs';
 import { take } from 'rxjs/operators';
@@ -25,6 +26,7 @@ export class DeltagareExportComponent {
       startDate: new FormControl(null),
       endDate: new FormControl(null),
       includeExportedDeltagare: new FormControl(false),
+      isExcel: new FormControl(false),
     },
     [DeltagareExportValidator.isDeltagareExportValid()]
   );
@@ -39,6 +41,9 @@ export class DeltagareExportComponent {
   get includeExportedDeltagareFormControl(): FormControl {
     return this.formGroup.get('includeExportedDeltagare') as FormControl;
   }
+  get isExcelFormControl(): FormControl {
+    return this.formGroup.get('isExcel') as FormControl;
+  }
 
   get deltagagareExportFormData(): DeltagareExportFormData {
     return this.formGroup.value as DeltagareExportFormData;
@@ -53,22 +58,23 @@ export class DeltagareExportComponent {
   }
 
   fetchExportFile(): void {
+    this.fetchError$.next(null);
     if (this.formGroup.invalid) {
       this.shouldValidate$.next(true);
       return;
     }
 
-    const requestData = this._formDataToRequestData(this.deltagagareExportFormData);
-
     this.fetchIsLoading$.next(true);
     this.deltagareExportService
-      .fetchExportFile$(requestData)
+      .fetchExportFile$(this._formDataToRequestData)
       .pipe(take(1))
       .subscribe({
         next: response => {
-          const blob = new Blob([response], { type: 'text/csv' });
-          saveAs(blob, 'deltagare-export.csv');
+          const isExcel = this._formDataToRequestData.exportToExcel;
+          const blob = new Blob([response], { type: this._getFileType(isExcel) });
+          saveAs(blob, this._getFileName(isExcel));
           this.fetchIsLoading$.next(false);
+          this.formGroup.reset();
         },
         error: (customError: CustomError) => {
           this.fetchError$.next({ ...customError, message: customError.error.message });
@@ -78,10 +84,22 @@ export class DeltagareExportComponent {
       });
   }
 
-  private _formDataToRequestData(formData: DeltagareExportFormData): DeltagareExportRequest {
-    const { startDate, endDate, includeExportedDeltagare } = formData;
+  private _getFileName(isExcel: boolean): string {
+    const baseFileName = 'deltagare-export';
+    const extension = isExcel ? 'xlsx' : 'csv';
+
+    return `${baseFileName}-${formatDate(new Date())}.${extension}`;
+  }
+
+  private _getFileType(isExcel: boolean): string {
+    return isExcel ? 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' : 'text/csv';
+  }
+
+  private get _formDataToRequestData(): DeltagareExportRequest {
+    const { startDate, endDate, includeExportedDeltagare, isExcel } = this.deltagagareExportFormData;
     const requestData: DeltagareExportRequest = {
-      includeExportedDeltagare,
+      includeExportedDeltagare: !!includeExportedDeltagare,
+      exportToExcel: !!isExcel,
     };
     if (startDate) {
       requestData.startDate = startDate;
diff --git a/apps/mina-sidor-fa/src/app/pages/exports/pages/deltagare-export/deltagare-export.model.ts b/apps/mina-sidor-fa/src/app/pages/exports/pages/deltagare-export/deltagare-export.model.ts
index d55df3f..cc7ee44 100644
--- a/apps/mina-sidor-fa/src/app/pages/exports/pages/deltagare-export/deltagare-export.model.ts
+++ b/apps/mina-sidor-fa/src/app/pages/exports/pages/deltagare-export/deltagare-export.model.ts
@@ -2,6 +2,7 @@ export interface DeltagareExportFormData {
   startDate: string;
   endDate: string;
   includeExportedDeltagare: boolean;
+  isExcel: boolean;
 }
 
 export type DeltagareExportFormKeys = keyof DeltagareExportFormData;
diff --git a/apps/mina-sidor-fa/src/app/shared/models/api/deltagare-export.request.model.ts b/apps/mina-sidor-fa/src/app/shared/models/api/deltagare-export.request.model.ts
index 73d4043..e57c27a 100644
--- a/apps/mina-sidor-fa/src/app/shared/models/api/deltagare-export.request.model.ts
+++ b/apps/mina-sidor-fa/src/app/shared/models/api/deltagare-export.request.model.ts
@@ -2,4 +2,5 @@ export interface DeltagareExportRequest {
   startDate?: string;
   endDate?: string;
   includeExportedDeltagare: boolean;
+  exportToExcel?: boolean;
 }
diff --git a/apps/mina-sidor-fa/src/app/shared/services/api/export.api.service.ts b/apps/mina-sidor-fa/src/app/shared/services/api/export.api.service.ts
index 6af6ade..9217d18 100644
--- a/apps/mina-sidor-fa/src/app/shared/services/api/export.api.service.ts
+++ b/apps/mina-sidor-fa/src/app/shared/services/api/export.api.service.ts
@@ -1,9 +1,9 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { Params } from '@angular/router';
 import { ErrorType } from '@msfa-enums/error-type.enum';
 import { environment } from '@msfa-environment';
 import { DeltagareExportRequest } from '@msfa-models/api/deltagare-export.request.model';
-import { Params } from '@msfa-models/api/params.model';
 import { CustomError } from '@msfa-models/error/custom-error';
 import { Observable } from 'rxjs';
 import { catchError } from 'rxjs/operators';
@@ -23,7 +23,7 @@ export class ExportApiService {
     };
 
     return this.httpClient
-      .post<Blob>(`${this._apiBaseUrl}/deltagare`, { params, responseType: 'blob' })
+      .get<Blob>(`${this._apiBaseUrl}/deltagare`, { params, responseType: 'blob' as 'json' })
       .pipe(
         catchError((error: Error) => {
           throw new CustomError({