Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: P4ADEV-1352 api to retrieve citizen data #12

Merged
merged 5 commits into from
Dec 11, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
P4ADEV-1352 fix openapi component name
RiccardoGiuliani committed Dec 10, 2024
commit c00a889eb8b9064e9180359ea7df63f596403034
32 changes: 17 additions & 15 deletions openapi/p4pa-pdnd.openapi.yaml
Original file line number Diff line number Diff line change
@@ -24,20 +24,7 @@ paths:
content:
application/json:
schema:
type: object
properties:
firstName:
type: string
example: Mario
lastName:
type: string
example: Rossi
dateOfBirth:
type: string
format: YYYY-MM-DD
example: '2021-11-15'
address:
$ref: '#/components/schemas/Address'
$ref: '#/components/schemas/Citizen'
'400':
description: Invalid request
'403':
@@ -68,4 +55,19 @@ components:
example: 00100
country:
type: string
example: Italy
example: Italy
Citizen:
type: object
properties:
firstName:
type: string
example: Mario
lastName:
type: string
example: Rossi
dateOfBirth:
type: string
format: YYYY-MM-DD
example: '2021-11-15'
address:
$ref: '#/components/schemas/Address'
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package it.gov.pagopa.payhub.pdnd.anpr.controller;

import it.gov.pagopa.payhub.controller.generated.DefaultApi;
import it.gov.pagopa.payhub.model.generated.AnprServiceE002CitizenGet200Response;
import it.gov.pagopa.payhub.model.generated.Citizen;
import it.gov.pagopa.payhub.pdnd.anpr.service.PdndService;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
@@ -16,8 +16,8 @@ public PdndServiceController(PdndService pdndService) {
}

@Override
public ResponseEntity<AnprServiceE002CitizenGet200Response> anprServiceE002CitizenGet(String fiscalCode) {
AnprServiceE002CitizenGet200Response response = pdndService.getCitizenData(fiscalCode);
public ResponseEntity<Citizen> anprServiceE002CitizenGet(String fiscalCode) {
Citizen response = pdndService.getCitizenData(fiscalCode);
return ResponseEntity.ok(response);
}
}
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
import it.gov.pagopa.payhub.anpr.C003.model.generated.TipoDatiSoggettiEnte;
import it.gov.pagopa.payhub.anpr.C003.model.generated.TipoInfoSoggettoEnte;
import it.gov.pagopa.payhub.model.generated.Address;
import it.gov.pagopa.payhub.model.generated.AnprServiceE002CitizenGet200Response;
import it.gov.pagopa.payhub.model.generated.Citizen;

import java.util.List;
import java.util.Map;
@@ -15,7 +15,7 @@ public class AnprResponseMapper {
private AnprResponseMapper() {
}

public static AnprServiceE002CitizenGet200Response mapToAnprResponse(RispostaE002OK responseC003) {
public static Citizen mapToAnprResponse(RispostaE002OK responseC003) {
List<TipoInfoSoggettoEnte> subTypeInfo = getTipoInfoSoggettoEnteList(responseC003);

Map<String, String> valuesMap = subTypeInfo.stream()
@@ -31,7 +31,7 @@ public static AnprServiceE002CitizenGet200Response mapToAnprResponse(RispostaE00
.country(valuesMap.get("country"))
.build();

return AnprServiceE002CitizenGet200Response.builder()
return Citizen.builder()
.firstName(valuesMap.get("firstName"))
.lastName(valuesMap.get("lastName"))
.dateOfBirth(valuesMap.get("dateOfBirth"))
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package it.gov.pagopa.payhub.pdnd.anpr.service;

import it.gov.pagopa.payhub.model.generated.AnprServiceE002CitizenGet200Response;
import it.gov.pagopa.payhub.model.generated.Citizen;

public interface PdndService {

AnprServiceE002CitizenGet200Response getCitizenData(String fiscalCode);
Citizen getCitizenData(String fiscalCode);
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package it.gov.pagopa.payhub.pdnd.anpr.service;

import it.gov.pagopa.payhub.anpr.C030.model.generated.RispostaE002OK;
import it.gov.pagopa.payhub.model.generated.AnprServiceE002CitizenGet200Response;
import it.gov.pagopa.payhub.model.generated.Citizen;
import it.gov.pagopa.payhub.pdnd.anpr.c003.service.AnprC003Service;
import it.gov.pagopa.payhub.pdnd.anpr.c030.service.AnprC030Service;
import it.gov.pagopa.payhub.pdnd.anpr.mapper.AnprResponseMapper;
@@ -19,7 +19,7 @@ public PdndServiceImpl(AnprC003Service anprC003Service, AnprC030Service anprC030
}

@Override
public AnprServiceE002CitizenGet200Response getCitizenData(String fiscalCode) {
public Citizen getCitizenData(String fiscalCode) {
RispostaE002OK anprC030Response = anprC030Service.getIdAnprFromFc(fiscalCode);
String idAnpr = anprC030Response.getListaSoggetti()
.getDatiSoggetto()