[SELC-5621] feat: add field categoryCode in getInstitutionById API (#490

)
pagopa · Oct 10, 2024 · 0de770a · 0de770a
1 parent 002cd82
commit 0de770a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/app/src/main/resources/swagger/api-docs.json b/app/src/main/resources/swagger/api-docs.json
@@ -3594,7 +3594,11 @@
  },
  "category" : {
  "type" : "string",
- "description" : "Institution's category"
+ "description" : "Institution's category description"
+ },
+ "categoryCode" : {
+ "type" : "string",
+ "description" : "Institution's category code"
  },
  "city" : {
  "type" : "string",

diff --git a/web/src/main/java/it/pagopa/selfcare/dashboard/web/model/InstitutionResource.java b/web/src/main/java/it/pagopa/selfcare/dashboard/web/model/InstitutionResource.java
@@ -1,7 +1,6 @@
 package it.pagopa.selfcare.dashboard.web.model;
 
 import io.swagger.annotations.ApiModelProperty;
-import it.pagopa.selfcare.onboarding.common.InstitutionType;
 import lombok.Data;
 
 import java.util.List;
@@ -30,6 +29,9 @@ public class InstitutionResource {
  @ApiModelProperty(value = "${swagger.dashboard.institutions.model.category}")
  private String category;
 
+ @ApiModelProperty(value = "${swagger.dashboard.institutions.model.categoryCode}")
+ private String categoryCode;
+
  @ApiModelProperty(value = "${swagger.dashboard.institutions.model.fiscalCode}")
  private String fiscalCode;
 

diff --git a/...rc/main/java/it/pagopa/selfcare/dashboard/web/model/mapper/InstitutionResourceMapper.java b/...rc/main/java/it/pagopa/selfcare/dashboard/web/model/mapper/InstitutionResourceMapper.java
@@ -43,6 +43,7 @@ public interface InstitutionResourceMapper {
  @Mapping(target = "products", source = "onboarding")
  @Mapping(target = "parentDescription", source = "rootParent.description")
  @Mapping(target = "category", expression = "java(retrieveCategory(model.getAttributes()))")
+ @Mapping(target = "categoryCode", expression = "java(retrieveCategoryCode(model.getAttributes()))")
  InstitutionResource toResource(Institution model);
 
  UpdateInstitutionResource toUpdateResource(UpdateInstitutionDto dto);
@@ -55,6 +56,14 @@ default String retrieveCategory(List<Attribute> attributes){
  return null;
  }
 
+ @Named("retrieveCategoryCode")
+ default String retrieveCategoryCode(List<Attribute> attributes){
+ if(!CollectionUtils.isEmpty(attributes)){
+ return attributes.get(0).getCode();
+ }
+ return null;
+ }
+
  @Named("toUserRole")
  default String toUserRole(String institutionId, RelationshipState status) {
  Authentication authentication = SecurityContextHolder.getContext().getAuthentication();

diff --git a/web/src/main/resources/swagger/swagger_en.properties b/web/src/main/resources/swagger/swagger_en.properties
@@ -36,7 +36,8 @@ swagger.dashboard.institutions.model.institutionType=Institution's type
 swagger.dashboard.institutions.model.logo=Institution's logo
 swagger.dashboard.institutions.model.imageUrl=Institution's depict image
 swagger.dashboard.institutions.model.name=Institution's name
-swagger.dashboard.institutions.model.category=Institution's category
+swagger.dashboard.institutions.model.category=Institution's category description
+swagger.dashboard.institutions.model.categoryCode=Institution's category code
 swagger.dashboard.institutions.model.fiscalCode=Fiscal code corresponding to the institution
 swagger.dashboard.institutions.model.mailAddress=Institution's email address
 swagger.dashboard.institutions.model.status=Institution's status

diff --git a/web/src/test/resources/json/InstitutionResource.json b/web/src/test/resources/json/InstitutionResource.json
@@ -6,6 +6,7 @@
  "institutionType": "SCP",
  "name": "A description",
  "category": "description1",
+ "categoryCode": "code1",
  "fiscalCode": "tax123",
  "mailAddress": "[email protected]",
  "address": "123 Street",