From 5768dc71c12dc8c5315585e743fc9637f958c723 Mon Sep 17 00:00:00 2001 From: manuraf Date: Fri, 12 Jul 2024 16:13:44 +0200 Subject: [PATCH 1/2] chore: Move to Container App Env workload DEV --- infra/container_apps/env/dev/terraform.tfvars | 2 ++ .../mscore/web/controller/InstitutionController.java | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/infra/container_apps/env/dev/terraform.tfvars b/infra/container_apps/env/dev/terraform.tfvars index a4471baf..06b85d6a 100644 --- a/infra/container_apps/env/dev/terraform.tfvars +++ b/infra/container_apps/env/dev/terraform.tfvars @@ -1,5 +1,7 @@ env_short = "d" env = "dev" +suffix_increment = "-002" +cae_name = "cae-002" tags = { CreatedBy = "Terraform" diff --git a/web/src/main/java/it/pagopa/selfcare/mscore/web/controller/InstitutionController.java b/web/src/main/java/it/pagopa/selfcare/mscore/web/controller/InstitutionController.java index efe28e09..c927fe63 100644 --- a/web/src/main/java/it/pagopa/selfcare/mscore/web/controller/InstitutionController.java +++ b/web/src/main/java/it/pagopa/selfcare/mscore/web/controller/InstitutionController.java @@ -408,7 +408,10 @@ public ResponseEntity> retrieveInstitutionGeoTaxonomi * * Code: 200, Message: successful operation, DataType: InstitutionResponse * * Code: 404, Message: GeographicTaxonomies or Institution not found, DataType: Problem */ - @Tags({@Tag(name = "external-v2"), @Tag(name = "Institution")}) + @Tag(name = "external-v2") + @Tag(name = "internal-v1") + @Tag(name = "external-pnpg") + @Tag(name = "Institution") @ResponseStatus(HttpStatus.OK) @ApiOperation(value = "${swagger.mscore.institution}", notes = "${swagger.mscore.institution}") @GetMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE) @@ -472,6 +475,7 @@ public ResponseEntity> getValidInstitutionToOnboard(@ * * Code: 404, Message: Institution or Token or UserBinding not found, DataType: Problem */ @ResponseStatus(HttpStatus.OK) + @Tag(name = "internal-v1") @ApiOperation(value = "${swagger.mscore.institutions.updateCreatedAt}", notes = "${swagger.mscore.institutions.updateCreatedAt}") @PutMapping(value = "/{institutionId}/createdAt", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity updateCreatedAt(@ApiParam("${swagger.mscore.institutions.model.institutionId}") From d159846db22fcf49ae1416e920e9f1554c143f66 Mon Sep 17 00:00:00 2001 From: manuraf Date: Fri, 12 Jul 2024 16:25:55 +0200 Subject: [PATCH 2/2] update openapi --- app/src/main/resources/swagger/api-docs.json | 4 ++-- .../selfcare/mscore/web/controller/InstitutionController.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/resources/swagger/api-docs.json b/app/src/main/resources/swagger/api-docs.json index 936ecd7f..d900e5fc 100644 --- a/app/src/main/resources/swagger/api-docs.json +++ b/app/src/main/resources/swagger/api-docs.json @@ -1548,7 +1548,7 @@ }, "/institutions/{id}" : { "get" : { - "tags" : [ "Institution", "external-v2" ], + "tags" : [ "Institution", "external-pnpg", "external-v2", "internal-v1" ], "summary" : "Gets the corresponding institution using internal institution id", "description" : "Gets the corresponding institution using internal institution id", "operationId" : "retrieveInstitutionByIdUsingGET", @@ -1938,7 +1938,7 @@ }, "/institutions/{institutionId}/createdAt" : { "put" : { - "tags" : [ "Institution" ], + "tags" : [ "Institution", "internal-v1" ], "summary" : "The service updates the createdAt field for the institution-product pair", "description" : "The service updates the createdAt field for the institution-product pair", "operationId" : "updateCreatedAtUsingPUT", diff --git a/web/src/main/java/it/pagopa/selfcare/mscore/web/controller/InstitutionController.java b/web/src/main/java/it/pagopa/selfcare/mscore/web/controller/InstitutionController.java index c927fe63..ddcb1e19 100644 --- a/web/src/main/java/it/pagopa/selfcare/mscore/web/controller/InstitutionController.java +++ b/web/src/main/java/it/pagopa/selfcare/mscore/web/controller/InstitutionController.java @@ -476,6 +476,7 @@ public ResponseEntity> getValidInstitutionToOnboard(@ */ @ResponseStatus(HttpStatus.OK) @Tag(name = "internal-v1") + @Tag(name = "Institution") @ApiOperation(value = "${swagger.mscore.institutions.updateCreatedAt}", notes = "${swagger.mscore.institutions.updateCreatedAt}") @PutMapping(value = "/{institutionId}/createdAt", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity updateCreatedAt(@ApiParam("${swagger.mscore.institutions.model.institutionId}")