[SELC-5413] feat: add logo field in InstitutionResponse (#26)

apps/institution-ms/app/src/main/docs/openapi.json

@@ -3334,6 +3334,9 @@
  "istatCode" : {
  "type" : "string"
  },
+ "logo" : {
+ "type" : "string"
+ },
  "onboarding" : {
  "type" : "array",
  "items" : {

apps/institution-ms/app/src/main/resources/config/core-config.properties

@@ -1,6 +1,7 @@
 mscore.port=8080
 
 mscore.logoPath = ${PAGOPA_LOGO_URL:resources/logo.png}
+mscore.logoUrl = ${LOGO_URL}
 mscore.infoCamereEnable = ${INFOCAMERE_ENABLE:false}
 mscore.sender-mail = ${MAIL_SENDER_ADDRESS:[email protected]}
 mscore.destination-mails = ${DESTINATION_MAILS:}

apps/institution-ms/connector-api/src/main/java/it/pagopa/selfcare/mscore/config/CoreConfig.java

@@ -16,6 +16,7 @@
 public class CoreConfig {
 
  private String logoPath;
+ private String logoUrl;
  private String senderMail;
  private List<String> destinationMails;
  private String institutionAlternativeEmail;

apps/institution-ms/core/src/main/java/it/pagopa/selfcare/mscore/core/InstitutionService.java

@@ -67,4 +67,6 @@ public interface InstitutionService {
 
  List<Institution> getInstitutionBrokers(String productId, InstitutionType type);
 
+ String getLogo(String institutionId);
+
 }

apps/institution-ms/core/src/main/java/it/pagopa/selfcare/mscore/core/InstitutionServiceImpl.java

@@ -409,4 +409,9 @@ public void checkIfAlreadyExists(String externalId) {
  public List<Institution> getInstitutionBrokers(String productId, InstitutionType type) {
  return institutionConnector.findBrokers(productId, type);
  }
+
+ @Override
+ public String getLogo(String institutionId) {
+ return coreConfig.getLogoUrl().concat(institutionId).concat("/logo.png");
+ }
 }

apps/institution-ms/core/src/test/java/it/pagopa/selfcare/mscore/core/InstitutionServiceImplTest.java

@@ -1098,5 +1098,15 @@ void getInstitutionsByTaxCode() {
 
  }
 
+ @Test
+ void getLogoTest() {
+ String institutionId = "institutionId";
+ String expectedUrl = "https://test.it/institutions/institutionId/logo.png";
+ String baseUrl = "https://test.it/institutions/";
+ when(coreConfig.getLogoUrl()).thenReturn(baseUrl);
+ String actual = institutionServiceImpl.getLogo(institutionId);
+ assertEquals(expectedUrl, actual);
+ }
+
 }
 

apps/institution-ms/web/src/main/java/it/pagopa/selfcare/mscore/web/controller/InstitutionController.java

@@ -420,7 +420,9 @@ public ResponseEntity<InstitutionResponse> retrieveInstitutionById(@ApiParam("${
  @PathVariable("id") String id) {
  CustomExceptionMessage.setCustomMessage(GenericError.GET_INSTITUTION_BY_ID_ERROR);
  Institution institution = institutionService.retrieveInstitutionById(id);
- return ResponseEntity.ok().body(institutionResourceMapper.toInstitutionResponse(institution));
+ InstitutionResponse institutionResponse = institutionResourceMapper.toInstitutionResponse(institution);
+ institutionResponse.setLogo(institutionService.getLogo(id));
+ return ResponseEntity.ok().body(institutionResponse);
  }
 
 

apps/institution-ms/web/src/main/java/it/pagopa/selfcare/mscore/web/model/institution/InstitutionResponse.java

@@ -48,5 +48,6 @@ public class InstitutionResponse {
  private OffsetDateTime createdAt;
  private OffsetDateTime updatedAt;
  private boolean delegation;
+ private String logo;
 
 }

apps/institution-ms/web/src/main/java/it/pagopa/selfcare/mscore/web/model/mapper/InstitutionResourceMapper.java

@@ -1,10 +1,8 @@
 package it.pagopa.selfcare.mscore.web.model.mapper;
 
 
-import it.pagopa.selfcare.mscore.model.institution.Billing;
 import it.pagopa.selfcare.mscore.model.institution.Institution;
 import it.pagopa.selfcare.mscore.model.institution.InstitutionGeographicTaxonomies;
-import it.pagopa.selfcare.mscore.web.model.institution.BillingRequest;
 import it.pagopa.selfcare.mscore.web.model.institution.GeoTaxonomies;
 import it.pagopa.selfcare.mscore.web.model.institution.InstitutionResponse;
 import it.pagopa.selfcare.mscore.web.model.institution.RootParentResponse;
@@ -31,10 +29,6 @@ static RootParentResponse setRootParent(Institution institution) {
  return null;
  }
 
-
- Billing billingRequestToBilling(BillingRequest billingRequest);
-
  InstitutionGeographicTaxonomies toInstitutionGeographicTaxonomies(GeoTaxonomies geoTaxonomies);
 
-
 }

apps/institution-ms/web/src/test/java/it/pagopa/selfcare/mscore/web/controller/InstitutionControllerTest.java

@@ -267,6 +267,7 @@ void retrieveInstitutionById() throws Exception {
  SecurityContext securityContext = Mockito.mock(SecurityContext.class);
  SecurityContextHolder.setContext(securityContext);
  when(institutionService.retrieveInstitutionById("42")).thenReturn(staticInstitution);
+ when(institutionService.getLogo("42")).thenReturn("logoUrl");
  staticInstitution.setId("id");
  MockHttpServletRequestBuilder requestBuilder = get("/institutions/{id}", "42");
  ResultActions actualPerformResult = MockMvcBuilders.standaloneSetup(institutionController)

infra/container_apps/institution-ms/env/dev-pnpg/terraform.tfvars

@@ -40,6 +40,10 @@ app_settings = [
  name = "SELFCARE_URL"
  value = "https://selfcare.pagopa.it"
  },
+ {
+ name = "LOGO_URL"
+ value = "https://pnpg.dev.selfcare.pagopa.it/institutions/"
+ },
  {
  name = "MAIL_TEMPLATE_DELEGATION_NOTIFICATION_PATH"
  value = "contracts/template/mail/delegation-notification/1.0.0.json"

infra/container_apps/institution-ms/env/dev/terraform.tfvars

@@ -46,6 +46,10 @@ app_settings = [
  name = "SELFCARE_URL"
  value = "https://selfcare.pagopa.it"
  },
+ {
+ name = "LOGO_URL"
+ value = "https://dev.selfcare.pagopa.it/institutions/"
+ },
  {
  name = "MAIL_TEMPLATE_DELEGATION_NOTIFICATION_PATH"
  value = "contracts/template/mail/delegation-notification/1.0.0.json"

infra/container_apps/institution-ms/env/prod-pnpg/terraform.tfvars

@@ -35,6 +35,10 @@ app_settings = [
  name = "SELFCARE_URL"
  value = "https://selfcare.pagopa.it"
  },
+ {
+ name = "LOGO_URL"
+ value = "https://pnpg.selfcare.pagopa.it/institutions/"
+ },
  {
  name = "MAIL_TEMPLATE_DELEGATION_NOTIFICATION_PATH"
  value = "contracts/template/mail/delegation-notification/1.0.0.json"

infra/container_apps/institution-ms/env/prod/terraform.tfvars

@@ -41,6 +41,10 @@ app_settings = [
  name = "SELFCARE_URL"
  value = "https://selfcare.pagopa.it"
  },
+ {
+ name = "LOGO_URL"
+ value = "https://selfcare.pagopa.it/institutions/"
+ },
  {
  name = "MAIL_TEMPLATE_DELEGATION_NOTIFICATION_PATH"
  value = "contracts/template/mail/delegation-notification/1.0.0.json"

infra/container_apps/institution-ms/env/uat-pnpg/terraform.tfvars

@@ -28,6 +28,10 @@ app_settings = [
  name = "SELFCARE_URL"
  value = "https://selfcare.pagopa.it"
  },
+ {
+ name = "LOGO_URL"
+ value = "https://pnpg.uat.selfcare.pagopa.it/institutions/"
+ },
  {
  name = "MAIL_TEMPLATE_DELEGATION_NOTIFICATION_PATH"
  value = "contracts/template/mail/delegation-notification/1.0.0.json"

infra/container_apps/institution-ms/env/uat/terraform.tfvars

@@ -29,6 +29,10 @@ app_settings = [
  name = "SELFCARE_URL"
  value = "https://selfcare.pagopa.it"
  },
+ {
+ name = "LOGO_URL"
+ value = "https://uat.selfcare.pagopa.it/institutions/"
+ },
  {
  name = "MAIL_TEMPLATE_DELEGATION_NOTIFICATION_PATH"
  value = "contracts/template/mail/delegation-notification/1.0.0.json"