arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Daniel Appelgren
2021-10-26 10:40:05 +02:00
parent 7b8c3efe2d
commit aac7cf6c6a
15 changed files with 146 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/mina-sidor-fa/src/app/shared/enums/report-type.enum.ts
View File

@@ -4,4 +4,5 @@ export enum ReportType {
GemensamPlanering = 'Gemensam planering',
Avvikelse = 'Avvikelserapport (avvikelse)',
Franvaro = 'Avvikelserapport (frånvaro)',
PeriodiskRedovisning = 'Periodisk redovisning',
}

21
apps/mina-sidor-fa/src/app/shared/services/api/gemensam-planering-api.service.ts
View File

@@ -5,17 +5,11 @@ import { environment } from '@msfa-environment';
import { Activity, mapResponseToActivity } from '@msfa-models/activity.model';
import { ActivityResponse } from '@msfa-models/api/activity.response.model';
import { GemensamPlaneringPostRequest } from '@msfa-models/api/gemensam-planering.request.model';
import { GemensamPlaneringResponse } from '@msfa-models/api/gemensam-planering.response.model';
import { Params } from '@msfa-models/api/params.model';
import { Avrop } from '@msfa-models/avrop.model';
import { CustomError, errorToCustomError } from '@msfa-models/error/custom-error';
import {
GemensamPlaneringDetailed,
mapResponseToGemensamPlaneringDetailed,
} from '@msfa-models/gemensam-planering.model';
import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service';
import { Observable } from 'rxjs';
import { catchError, filter, map, shareReplay, switchMap } from 'rxjs/operators';
import { catchError, filter, map, shareReplay } from 'rxjs/operators';
@Injectable({
providedIn: 'root',
@@ -41,16 +35,9 @@ export class GemensamPlaneringApiService {
return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens);
}
public fetchReport$(genomforandeReferens: number, reportId: string): Observable<GemensamPlaneringDetailed> {
const params: Params = {
genomforandereferens: genomforandeReferens.toString(),
};
return this.fetchActivities$().pipe(
switchMap(activities =>
this.httpClient
.get<{ data: GemensamPlaneringResponse }>(`${this._apiHandlingarUrl}/${reportId}`, { params })
.pipe(map(({ data }) => mapResponseToGemensamPlaneringDetailed(data, activities)))
)
public fetchAllChosenActivities(genomforandereferens: number): Observable<{ data: ActivityResponse[] }> {
return this.httpClient.get<{ data: ActivityResponse[] }>(
`${this._apiBaseUrl}/alla-valda-aktiviteter/${genomforandereferens}`
);
}

30
apps/mina-sidor-fa/src/app/shared/services/api/handlingar.api.service.ts Normal file
View File

@@ -0,0 +1,30 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { environment } from '@msfa-environment';
import { AvvikelseReportResponse } from '@msfa-models/api/avvikelse-response.model';
import { FranvaroReportResponse } from '@msfa-models/api/franvaro-response.model';
import { GemensamPlaneringResponse } from '@msfa-models/api/gemensam-planering.response.model';
import { Observable } from 'rxjs';
@Injectable({
providedIn: 'root',
})
export class HandlingarApiService {
private _apiBaseUrl = `${environment.api.url}/handlingar`;
constructor(private httpClient: HttpClient) {}
public fetchGemensamPlanering$(handlingId: string): Observable<{ data: GemensamPlaneringResponse }> {
return this.httpClient.get<{ data: GemensamPlaneringResponse }>(
`${this._apiBaseUrl}/gemensam-planering/${handlingId}`
);
}
public fetchFranvaroReport$(handlingId: string): Observable<{ data: FranvaroReportResponse }> {
return this.httpClient.get<{ data: FranvaroReportResponse }>(`${this._apiBaseUrl}/franvaro/${handlingId}`);
}
public fetchAvvikelseReport$(handlingId: string): Observable<{ data: AvvikelseReportResponse }> {
return this.httpClient.get<{ data: AvvikelseReportResponse }>(`${this._apiBaseUrl}/avvikelse/${handlingId}`);
}
}

107
apps/mina-sidor-fa/src/app/shared/services/api/report.api.service.ts
View File

@@ -1,107 +0,0 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { environment } from '@msfa-environment';
import { Activity } from '@msfa-models/activity.model';
import { AvvikelseReportResponse } from '@msfa-models/api/avvikelse-response.model';
import { FranvaroReportResponse } from '@msfa-models/api/franvaro-response.model';
import { GemensamPlaneringResponse } from '@msfa-models/api/gemensam-planering.response.model';
import { Params } from '@msfa-models/api/params.model';
import { Avrop } from '@msfa-models/avrop.model';
import { AvvikelseQuestion } from '@msfa-models/avvikelse-question.model';
import { AvvikelseReason } from '@msfa-models/avvikelse-reason.model';
import { AvvikelseReport, mapResponseToAvvikelse } from '@msfa-models/avvikelse.model';
import { FranvaroReason } from '@msfa-models/franvaro-reason.model';
import { FranvaroReport, mapResponseToFranvaro } from '@msfa-models/franvaro.model';
import {
GemensamPlaneringDetailed,
mapResponseToGemensamPlaneringDetailed,
} from '@msfa-models/gemensam-planering.model';
import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service';
import { combineLatest, Observable } from 'rxjs';
import { filter, map, switchMap } from 'rxjs/operators';
import { AvvikelseApiService } from './avvikelse-api.service';
import { FranvaroReportApiService } from './franvaro-report.api.service';
import { GemensamPlaneringApiService } from './gemensam-planering-api.service';
@Injectable({
providedIn: 'root',
})
export class ReportApiService {
private _apiBaseUrl = `${environment.api.url}/handlingar`;
private _avvikelseReasons$: Observable<AvvikelseReason[]> = this.avvikelseApiService.fetchAvvikelseReasons$();
private _avvikelseQuestions$: Observable<AvvikelseQuestion[]> = this.avvikelseApiService.fetchAvvikelseQuestions$();
private _activities$: Observable<Activity[]> = this.gemensamPlaneringApiService.fetchActivities$();
private _franvaroReasons$: Observable<FranvaroReason[]> = this.franvaroReportApiService.fetchReasons$();
private _otherFranvaroReasons$: Observable<
FranvaroReason[]
> = this.franvaroReportApiService.fetchOtherKnownReasons$();
constructor(
private httpClient: HttpClient,
private deltagareApiService: DeltagareApiService,
private gemensamPlaneringApiService: GemensamPlaneringApiService,
private franvaroReportApiService: FranvaroReportApiService,
private avvikelseApiService: AvvikelseApiService
) {}
public fetchAvropInformation$(genomforandeReferens: number): Observable<Avrop> {
return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens);
}
public fetchGemensamPlanering$(
genomforandeReferens: number,
reportId: string
): Observable<GemensamPlaneringDetailed> {
const params: Params = {
genomforandereferens: genomforandeReferens.toString(),
};
return this._activities$.pipe(
switchMap(activities =>
this.httpClient
.get<{ data: GemensamPlaneringResponse }>(`${this._apiBaseUrl}/${reportId}`, { params })
.pipe(map(({ data }) => mapResponseToGemensamPlaneringDetailed(data, activities)))
)
);
}
public fetchFranvaroReport$(genomforandeReferens: number, reportId: string): Observable<FranvaroReport> {
const params: Params = {
genomforandereferens: genomforandeReferens.toString(),
};
return combineLatest([this._franvaroReasons$, this._otherFranvaroReasons$]).pipe(
filter(([reasons, otherReasons]) => !!(reasons && otherReasons)),
switchMap(([reasons, otherReasons]) => {
return this.httpClient
.get<{ data: FranvaroReportResponse }>(`${this._apiBaseUrl}/${reportId}`, { params })
.pipe(
map(({ data }) => ({
genomforandeReferens: data.genomforandeReferens,
franvaro: mapResponseToFranvaro(data.franvaro, reasons, otherReasons),
}))
);
})
);
}
public fetchAvvikelseReport$(genomforandeReferens: number, reportId: string): Observable<AvvikelseReport> {
const params: Params = {
genomforandereferens: genomforandeReferens.toString(),
};
return combineLatest([this._avvikelseReasons$, this._avvikelseQuestions$]).pipe(
filter(([reasons, questions]) => !!(reasons && questions)),
switchMap(([reasons, questions]) => {
return this.httpClient
.get<{ data: AvvikelseReportResponse }>(`${this._apiBaseUrl}/${reportId}`, { params })
.pipe(
map(({ data }) => ({
genomforandeReferens: data.genomforandeReferens,
avvikelse: mapResponseToAvvikelse(data.avvikelseAlternativ, reasons, questions),
}))
);
})
);
}
}