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

Updated api-call for disabilities

Browse Source
This commit is contained in:
Erik Tiekstra
2021-08-02 08:08:43 +02:00
parent 2dc2ca33c8
commit 3a6d09110c
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dafa-web/src/app/shared/models/disability.model.ts
View File

@@ -12,6 +12,6 @@ export function mapResponseToDisability(data: DisabilityResponse): Disability {
return { return {
code: kod, code: kod,
title: funktionsnedsattning, // TODO: Needed from API title: funktionsnedsattning, // TODO: Needed from API
description: beskrivning || null, //TODO: Needed from API description: beskrivning, //TODO: Needed from API
}; };
} }

23
apps/dafa-web/src/app/shared/services/api/deltagare.service.ts
View File

@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
import { environment } from '@dafa-environment'; import { environment } from '@dafa-environment';
import { ContactInformationResponse } from '@dafa-models/api/contact-information.response.model'; import { ContactInformationResponse } from '@dafa-models/api/contact-information.response.model';
import { DeltagareResponse } from '@dafa-models/api/deltagare.response.model'; import { DeltagareResponse } from '@dafa-models/api/deltagare.response.model';
import { DisabilitiesResponse } from '@dafa-models/api/disabilities.response.model'; import { DisabilityResponse } from '@dafa-models/api/disability.response.model';
import { DriversLicenseResponse } from '@dafa-models/api/drivers-license.response.model'; import { DriversLicenseResponse } from '@dafa-models/api/drivers-license.response.model';
import { EducationsResponse } from '@dafa-models/api/educations.response.model'; import { EducationsResponse } from '@dafa-models/api/educations.response.model';
import { HighestEducationResponse } from '@dafa-models/api/highest-education.response.model'; import { HighestEducationResponse } from '@dafa-models/api/highest-education.response.model';
@@ -80,17 +80,26 @@ export class DeltagareService {
} }
private _fetchDisabilities$(id: string): Observable<Disability[]> { private _fetchDisabilities$(id: string): Observable<Disability[]> {
return this.httpClient return this.httpClient
.get<{ data: DisabilitiesResponse }>(`${this._apiBaseUrl}/work/disability/${id}`, { ...API_HEADERS }) .get<DisabilityResponse[]>(`${this._apiBaseUrl}/work/disability/${id}`, { ...API_HEADERS })
.pipe( .pipe(
map(response => map(response =>
response.data.funktionsnedsattningar response ? response.map(funktionsnedsattning => mapResponseToDisability(funktionsnedsattning)) : []
? response.data.funktionsnedsattningar.map(funktionsnedsattning =>
mapResponseToDisability(funktionsnedsattning)
)
: []
) )
); );
} }
// private _fetchDisabilities$(id: string): Observable<Disability[]> {
// return this.httpClient
// .get<{ data: DisabilitiesResponse }>(`${this._apiBaseUrl}/work/disability/${id}`, { ...API_HEADERS })
// .pipe(
// map(respoqnse =>
// response.data.funktionsnedsattningar
// ? response.data.funktionsnedsattningar.map(funktionsnedsattning =>
// mapResponseToDisability(funktionsnedsattning)
// )
// : []
// )
// );
// }
private _fetchWorkExperiences$(id: string): Observable<WorkExperience[]> { private _fetchWorkExperiences$(id: string): Observable<WorkExperience[]> {
return this.httpClient return this.httpClient
.get<{ data: WorkExperiencesResponse }>(`${this._apiBaseUrl}/work/${id}`, { ...API_HEADERS }) .get<{ data: WorkExperiencesResponse }>(`${this._apiBaseUrl}/work/${id}`, { ...API_HEADERS })

9
apps/dafa-web/src/app/shared/services/api/user.service.ts
View File

@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
import { environment } from '@dafa-environment'; import { environment } from '@dafa-environment';
import { mapUserApiResponseToUser, User, UserApiResponse } from '@dafa-models/user.model'; import { mapUserApiResponseToUser, User, UserApiResponse } from '@dafa-models/user.model';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { map } from 'rxjs/operators'; import { filter, map } from 'rxjs/operators';
const API_HEADERS = { headers: environment.api.headers }; const API_HEADERS = { headers: environment.api.headers };
@@ -12,9 +12,10 @@ const API_HEADERS = { headers: environment.api.headers };
}) })
export class UserService { export class UserService {
private _userApiUrl = `${environment.api.url}/auth`; private _userApiUrl = `${environment.api.url}/auth`;
public user$: Observable<User> = this.httpClient public user$: Observable<User> = this.httpClient.get<UserApiResponse>(this._userApiUrl, API_HEADERS).pipe(
.get<UserApiResponse>(this._userApiUrl, API_HEADERS) filter(response => !!response.data),
.pipe(map(response => mapUserApiResponseToUser(response.data))); map(response => mapUserApiResponseToUser(response.data))
);
constructor(private httpClient: HttpClient) {} constructor(private httpClient: HttpClient) {}
} }

1
config/proxy.conf.api.json
View File

@@ -1,5 +1,6 @@
{ {
"/api": { "/api": {
// "target": "http://dafa-api-test.tocp.arbetsformedlingen.se",
"target": "http://mina-sidor-fa-test-api.tocp.arbetsformedlingen.se", "target": "http://mina-sidor-fa-test-api.tocp.arbetsformedlingen.se",
"secure": false, "secure": false,
"changeOrigin": true "changeOrigin": true