feature(APIer): Använder nya APIer för rapporter och Periodisk redovisning (TV-801)

Squashed commit of the following:

commit 4f0e9f977df96b4d902e96a66cc77257b4c0f5bb
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Oct 26 10:17:40 2021 +0200

    Revert "nx format"

    This reverts commit 71c32997fd8e7ff908ced30df66a5a411c948e2d.

commit 71c32997fd8e7ff908ced30df66a5a411c948e2d
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Oct 26 09:58:10 2021 +0200

    nx format

commit 5635e7acb9c9eb4cff8591a1fa3dcb227c314b57
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Oct 25 08:26:09 2021 +0200

    Update periodisk-redovisning-form.service.ts

commit 7da2c853b56d9571c6ab55ecfdf6964825e73336
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Fri Oct 22 12:51:53 2021 +0200

    Refaktoriserat services till nya api-strukturen

apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/deltagare-details.module.ts

@@ -20,7 +20,7 @@ const routes: Routes = [
       ),
   },
   {
-    path: 'avvikelserapport/:reportId',
+    path: 'avvikelserapport/:handlingId',
     data: { title: 'Avvikelserapport (avvikelse)' },
     loadChildren: () =>
       import('./pages/report-views/avvikelse-report-view/avvikelse-report-view.module').then(
@@ -36,7 +36,7 @@ const routes: Routes = [
       ),
   },
   {
-    path: 'franvarorapport/:reportId',
+    path: 'franvarorapport/:handlingId',
     data: { title: 'Avvikelserapport (frånvaro)' },
     loadChildren: () =>
       import('./pages/report-views/franvaro-report-view/franvaro-report-view.module').then(
@@ -52,7 +52,7 @@ const routes: Routes = [
       ),
   },
   {
-    path: 'gemensam-planering/:reportId',
+    path: 'gemensam-planering/:handlingId',
     data: { title: 'Gemensam planering' },
     loadChildren: () =>
       import('./pages/report-views/gemensam-planering-view/gemensam-planering-view.module').then(

apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.component.ts

@@ -58,6 +58,8 @@ export class ReportsListComponent {
         return `./franvarorapport/${report.id}`;
       case ReportType.Avvikelse:
         return `./avvikelserapport/${report.id}`;
+      case ReportType.PeriodiskRedovisning:
+        return `./periodisk-redovisning/${report.id}`;
       default:
         return null;
     }

apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.ts

@@ -12,7 +12,6 @@ import { AvropPeriod } from '@msfa-models/avrop-period.model';
 import { Avrop } from '@msfa-models/avrop.model';
 import { DateFormatOptions } from '@msfa-models/date-format-options.model';
 import { CustomError } from '@msfa-models/error/custom-error';
-import { GemensamPlaneringApiService } from '@msfa-services/api/gemensam-planering-api.service';
 import { capitalizeWords } from '@msfa-utils/capitalize-words.util';
 import { formatDate } from '@msfa-utils/format-to-date.util';
 import { RequiredValidator } from '@msfa-validators/required.validator';
@@ -62,7 +61,12 @@ export class PeriodiskRedovisningFormComponent implements OnInit {
     shareReplay(1)
   );
 
-  availableActivities$: Observable<Activity[]> = this.gemensamPlaneringApiService.fetchActivities$();
+  availableActivities$: Observable<Activity[]> = this.genomforandeReferens$.pipe(
+    switchMap(genomforandeReferens =>
+      this.periodiskRedovisningFormService.getAllChosenActivities(genomforandeReferens)
+    ),
+    shareReplay(1)
+  );
 
   periods$: Observable<AvropPeriod[]> = this.avrop$.pipe(
     map(avrop => extractAvropPeriods(avrop.startDate, avrop.endDate))
@@ -102,9 +106,7 @@ export class PeriodiskRedovisningFormComponent implements OnInit {
 
   constructor(
     private periodiskRedovisningFormService: PeriodiskRedovisningFormService,
-    private activatedRoute: ActivatedRoute,
-    // TODO. GemensamPlaneringApiService is used for fetching activities. Replace with own service once ready
-    private gemensamPlaneringApiService: GemensamPlaneringApiService
+    private activatedRoute: ActivatedRoute
   ) {}
 
   get periodFormControl(): AbstractControl | undefined {

apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.service.ts

@@ -4,12 +4,16 @@ import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service';
 import { PeriodiskRedovisningApiService } from '@msfa-services/api/periodisk-redovisning.api.service';
 import { Observable } from 'rxjs';
 import { PeriodiskRedovisningRequest } from '@msfa-models/api/periodisk-redovisning.request.model';
+import { map } from 'rxjs/operators';
+import { Activity, mapResponseToActivity } from '@msfa-models/activity.model';
+import { GemensamPlaneringApiService } from '@msfa-services/api/gemensam-planering-api.service';
 
 @Injectable()
 export class PeriodiskRedovisningFormService {
   constructor(
     private periodiskRedovisningApiService: PeriodiskRedovisningApiService,
-    private deltagareApiService: DeltagareApiService
+    private deltagareApiService: DeltagareApiService,
+    private gemensamPlaneringApiService: GemensamPlaneringApiService
   ) {}
 
   fetchAvropInformation$(genomforandeReferens: number): Observable<Avrop> {
@@ -19,4 +23,10 @@ export class PeriodiskRedovisningFormService {
   submitPeriodiskRedovisning$(submitData: PeriodiskRedovisningRequest): Observable<void> {
     return this.periodiskRedovisningApiService.postPeriodiskRedovisning$(submitData);
   }
+
+  getAllChosenActivities(genomforandeReferens: number): Observable<Activity[]> {
+    return this.gemensamPlaneringApiService
+      .fetchAllChosenActivities(genomforandeReferens)
+      .pipe(map(({ data }) => data.map(activity => mapResponseToActivity(activity))));
+  }
 }

apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.component.ts

@@ -27,9 +27,7 @@ export class AvvikelseReportViewComponent {
     shareReplay(1)
   );
   avvikelseReport$: Observable<AvvikelseReport> = this.params$.pipe(
-    switchMap(({ genomforandeReferens, reportId }) =>
-      this.avvikelseReportViewService.fetchAvvikelseReport$(+genomforandeReferens, reportId as string)
-    ),
+    switchMap(({ handlingId }) => this.avvikelseReportViewService.fetchAvvikelseReport$(handlingId as string)),
     shareReplay(1)
   );
 

apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.service.ts

@@ -1,18 +1,40 @@
 import { Injectable } from '@angular/core';
 import { Avrop } from '@msfa-models/avrop.model';
-import { AvvikelseReport } from '@msfa-models/avvikelse.model';
-import { ReportApiService } from '@msfa-services/api/report.api.service';
-import { Observable } from 'rxjs';
+import { AvvikelseReport, mapResponseToAvvikelse } from '@msfa-models/avvikelse.model';
+import { HandlingarApiService } from '@msfa-services/api/handlingar.api.service';
+import { combineLatest, Observable } from 'rxjs';
+import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service';
+import { filter, map, switchMap } from 'rxjs/operators';
+import { AvvikelseReason } from '@msfa-models/avvikelse-reason.model';
+import { AvvikelseQuestion } from '@msfa-models/avvikelse-question.model';
+import { AvvikelseApiService } from '@msfa-services/api/avvikelse-api.service';
 
 @Injectable()
 export class AvvikelseReportViewService {
-  constructor(private reportApiService: ReportApiService) {}
+  private _avvikelseReasons$: Observable<AvvikelseReason[]> = this.avvikelseApiService.fetchAvvikelseReasons$();
+  private _avvikelseQuestions$: Observable<AvvikelseQuestion[]> = this.avvikelseApiService.fetchAvvikelseQuestions$();
+
+  constructor(
+    private handlingarApiService: HandlingarApiService,
+    private deltagareApiService: DeltagareApiService,
+    private avvikelseApiService: AvvikelseApiService
+  ) {}
 
   public fetchAvropInformation$(genomforandeReferens: number): Observable<Avrop> {
-    return this.reportApiService.fetchAvropInformation$(genomforandeReferens);
+    return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens);
   }
 
-  public fetchAvvikelseReport$(genomforandeReferens: number, reportId: string): Observable<AvvikelseReport> {
-    return this.reportApiService.fetchAvvikelseReport$(genomforandeReferens, reportId);
+  public fetchAvvikelseReport$(handlingId: string): Observable<AvvikelseReport> {
+    return combineLatest([this._avvikelseReasons$, this._avvikelseQuestions$]).pipe(
+      filter(([reasons, questions]) => !!(reasons && questions)),
+      switchMap(([reasons, questions]) => {
+        return this.handlingarApiService.fetchAvvikelseReport$(handlingId).pipe(
+          map(({ data }) => ({
+            genomforandeReferens: data.genomforandeReferens,
+            avvikelse: mapResponseToAvvikelse(data.avvikelseAlternativ, reasons, questions),
+          }))
+        );
+      })
+    );
   }
 }

apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.component.ts

@@ -27,9 +27,7 @@ export class FranvaroReportViewComponent {
     shareReplay(1)
   );
   franvaroReport$: Observable<FranvaroReport> = this.params$.pipe(
-    switchMap(({ genomforandeReferens, reportId }) =>
-      this.franvaroReportViewService.fetchFranvaroReport$(+genomforandeReferens, reportId as string)
-    ),
+    switchMap(({ handlingId }) => this.franvaroReportViewService.fetchFranvaroReport$(handlingId as string)),
     shareReplay(1)
   );
 

apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.service.ts

@@ -1,18 +1,41 @@
 import { Injectable } from '@angular/core';
 import { Avrop } from '@msfa-models/avrop.model';
-import { FranvaroReport } from '@msfa-models/franvaro.model';
-import { ReportApiService } from '@msfa-services/api/report.api.service';
-import { Observable } from 'rxjs';
+import { FranvaroReport, mapResponseToFranvaro } from '@msfa-models/franvaro.model';
+import { HandlingarApiService } from '@msfa-services/api/handlingar.api.service';
+import { combineLatest, Observable } from 'rxjs';
+import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service';
+import { FranvaroReason } from '@msfa-models/franvaro-reason.model';
+import { FranvaroReportApiService } from '@msfa-services/api/franvaro-report.api.service';
+import { filter, map, switchMap } from 'rxjs/operators';
 
 @Injectable()
 export class FranvaroReportViewService {
-  constructor(private reportApiService: ReportApiService) {}
+  private _franvaroReasons$: Observable<FranvaroReason[]> = this.franvaroReportApiService.fetchReasons$();
+  private _otherFranvaroReasons$: Observable<
+    FranvaroReason[]
+  > = this.franvaroReportApiService.fetchOtherKnownReasons$();
+
+  constructor(
+    private handlingarApiService: HandlingarApiService,
+    private franvaroReportApiService: FranvaroReportApiService,
+    private deltagareApiService: DeltagareApiService
+  ) {}
 
   public fetchAvropInformation$(genomforandeReferens: number): Observable<Avrop> {
-    return this.reportApiService.fetchAvropInformation$(genomforandeReferens);
+    return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens);
   }
 
-  public fetchFranvaroReport$(genomforandeReferens: number, reportId: string): Observable<FranvaroReport> {
-    return this.reportApiService.fetchFranvaroReport$(genomforandeReferens, reportId);
+  public fetchFranvaroReport$(handlingId: string): Observable<FranvaroReport> {
+    return combineLatest([this._franvaroReasons$, this._otherFranvaroReasons$]).pipe(
+      filter(([reasons, otherReasons]) => !!(reasons && otherReasons)),
+      switchMap(([reasons, otherReasons]) => {
+        return this.handlingarApiService.fetchFranvaroReport$(handlingId).pipe(
+          map(({ data }) => ({
+            genomforandeReferens: data.genomforandeReferens,
+            franvaro: mapResponseToFranvaro(data.franvaro, reasons, otherReasons),
+          }))
+        );
+      })
+    );
   }
 }

apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.component.ts

@@ -27,9 +27,7 @@ export class GemensamPlaneringViewComponent {
     shareReplay(1)
   );
   gemensamPlanering$: Observable<GemensamPlaneringDetailed> = this.params$.pipe(
-    switchMap(({ genomforandeReferens, reportId }) =>
-      this.gemensamPlaneringViewService.fetchGemensamPlanering$(+genomforandeReferens, reportId as string)
-    ),
+    switchMap(({ handlingId }) => this.gemensamPlaneringViewService.fetchGemensamPlanering$(handlingId as string)),
     shareReplay(1)
   );
 

apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.service.ts

@@ -1,21 +1,37 @@
 import { Injectable } from '@angular/core';
 import { Avrop } from '@msfa-models/avrop.model';
-import { GemensamPlaneringDetailed } from '@msfa-models/gemensam-planering.model';
-import { ReportApiService } from '@msfa-services/api/report.api.service';
+import {
+  GemensamPlaneringDetailed,
+  mapResponseToGemensamPlaneringDetailed,
+} from '@msfa-models/gemensam-planering.model';
+import { HandlingarApiService } from '@msfa-services/api/handlingar.api.service';
 import { Observable } from 'rxjs';
+import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service';
+import { map, switchMap } from 'rxjs/operators';
+import { Activity } from '@msfa-models/activity.model';
+import { GemensamPlaneringApiService } from '@msfa-services/api/gemensam-planering-api.service';
 
 @Injectable()
 export class GemensamPlaneringViewService {
-  constructor(private reportApiService: ReportApiService) {}
+  private _activities$: Observable<Activity[]> = this.gemensamPlaneringApiService.fetchActivities$();
+
+  constructor(
+    private handlingarApiService: HandlingarApiService,
+    private deltagareApiService: DeltagareApiService,
+    private gemensamPlaneringApiService: GemensamPlaneringApiService
+  ) {}
 
   public fetchAvropInformation$(genomforandeReferens: number): Observable<Avrop> {
-    return this.reportApiService.fetchAvropInformation$(genomforandeReferens);
+    return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens);
   }
 
-  public fetchGemensamPlanering$(
-    genomforandeReferens: number,
-    reportId: string
-  ): Observable<GemensamPlaneringDetailed> {
-    return this.reportApiService.fetchGemensamPlanering$(genomforandeReferens, reportId);
+  public fetchGemensamPlanering$(handlingId: string): Observable<GemensamPlaneringDetailed> {
+    return this._activities$.pipe(
+      switchMap(activities =>
+        this.handlingarApiService
+          .fetchGemensamPlanering$(handlingId)
+          .pipe(map(({ data }) => mapResponseToGemensamPlaneringDetailed(data, activities)))
+      )
+    );
   }
 }