Revert "[SELC-6300] feat: add role ADMIN_EA_IO (#245)"

giulia-tremolada · web-flow · commit 318ce0d4f176 · 2025-02-06T10:14:54.000+01:00
This reverts commit 15490d8.
diff --git a/apps/pom.xml b/apps/pom.xml
@@ -13,7 +13,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <onboarding-sdk.version>0.6.8</onboarding-sdk.version>
+    <onboarding-sdk.version>0.4.1</onboarding-sdk.version>
   </properties>
 
   <dependencies>
diff --git a/apps/user-group-ms/pom.xml b/apps/user-group-ms/pom.xml
@@ -18,7 +18,7 @@
     <description>Microservice to manage Self Care User Group</description>
 
     <properties>
-        <selc-commons.version>2.5.6</selc-commons.version>
+        <selc-commons.version>2.5.1</selc-commons.version>
         <sonar.host.url>https://sonarcloud.io/</sonar.host.url>
         <sonar.skip>true</sonar.skip>
     </properties>
diff --git a/apps/user-ms/src/main/docs/openapi.json b/apps/user-ms/src/main/docs/openapi.json
@@ -981,7 +981,7 @@
           "name" : "role",
           "in" : "query",
           "schema" : {
-            "description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO",
+            "description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA",
             "type" : "string"
           }
         }, {
@@ -1518,7 +1518,7 @@
             "type" : "string"
           },
           "role" : {
-            "description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO",
+            "description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA",
             "type" : "string"
           },
           "env" : {
@@ -1552,7 +1552,7 @@
             "type" : "string"
           },
           "role" : {
-            "description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO",
+            "description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA",
             "type" : "string"
           },
           "env" : {
@@ -1619,7 +1619,7 @@
             "type" : "string"
           },
           "role" : {
-            "description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO",
+            "description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA",
             "type" : "string"
           },
           "tokenId" : {
@@ -1645,7 +1645,7 @@
             "type" : "string"
           },
           "role" : {
-            "description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO",
+            "description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA",
             "type" : "string"
           },
           "tokenId" : {
@@ -1849,7 +1849,7 @@
             "type" : "string"
           },
           "role" : {
-            "description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO",
+            "description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA",
             "type" : "string"
           },
           "status" : {
@@ -1987,7 +1987,7 @@
             "type" : "string"
           },
           "role" : {
-            "description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO",
+            "description" : "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA",
             "type" : "string"
           },
           "productRole" : {
diff --git a/apps/user-ms/src/main/docs/openapi.yaml b/apps/user-ms/src/main/docs/openapi.yaml
@@ -708,7 +708,7 @@ paths:
         in: query
         schema:
           description: "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR,\
-            \ ADMIN_EA, ADMIN_EA_IO"
+            \ ADMIN_EA"
           type: string
       - name: status
         in: query
@@ -1096,7 +1096,7 @@ components:
           type: string
         role:
           description: "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR,\
-            \ ADMIN_EA, ADMIN_EA_IO"
+            \ ADMIN_EA"
           type: string
         env:
           $ref: "#/components/schemas/Env"
@@ -1126,7 +1126,7 @@ components:
           type: string
         role:
           description: "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR,\
-            \ ADMIN_EA, ADMIN_EA_IO"
+            \ ADMIN_EA"
           type: string
         env:
           $ref: "#/components/schemas/Env"
@@ -1183,7 +1183,7 @@ components:
           type: string
         role:
           description: "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR,\
-            \ ADMIN_EA, ADMIN_EA_IO"
+            \ ADMIN_EA"
           type: string
         tokenId:
           type: string
@@ -1205,7 +1205,7 @@ components:
           type: string
         role:
           description: "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR,\
-            \ ADMIN_EA, ADMIN_EA_IO"
+            \ ADMIN_EA"
           type: string
         tokenId:
           type: string
@@ -1348,7 +1348,7 @@ components:
           type: string
         role:
           description: "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR,\
-            \ ADMIN_EA, ADMIN_EA_IO"
+            \ ADMIN_EA"
           type: string
         status:
           $ref: "#/components/schemas/OnboardedProductState"
@@ -1444,7 +1444,7 @@ components:
           type: string
         role:
           description: "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR,\
-            \ ADMIN_EA, ADMIN_EA_IO"
+            \ ADMIN_EA"
           type: string
         productRole:
           type: string
diff --git a/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/UserController.java b/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/UserController.java
@@ -184,7 +184,7 @@ public Uni<Void> deleteProducts(@PathParam(value = "userId") String userId,
     public Uni<Response> updateUserStatus(@PathParam(value = "id") String userId,
                                           @QueryParam(value = "institutionId") String institutionId,
                                           @QueryParam(value = "productId") String productId,
-                                          @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO") @QueryParam(value = "role") String role,
+                                          @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA") @QueryParam(value = "role") String role,
                                           @QueryParam(value = "productRole") String productRole,
                                           @QueryParam(value = "status") OnboardedProductState status) {
         log.debug("updateProductStatus - userId: {}", userId);
diff --git a/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/request/AddUserRoleDto.java b/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/request/AddUserRoleDto.java
@@ -28,7 +28,7 @@ public static class Product {
         private String productId;
 
         @NotNull(message = "role is required")
-        @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO")
+        @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA")
         private String role;
 
         private String tokenId;
diff --git a/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/request/CreateUserDto.java b/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/request/CreateUserDto.java
@@ -44,7 +44,7 @@ public static class Product {
         private String productId;
 
         @NotNull(message = "role is required")
-        @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO")
+        @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA")
         private String role;
 
         private String tokenId;
diff --git a/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/response/OnboardedProductResponse.java b/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/response/OnboardedProductResponse.java
@@ -14,7 +14,7 @@ public class OnboardedProductResponse {
     private String tokenId;
     private OnboardedProductState status;
     private String productRole;
-    @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO")
+    @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA")
     private String role;
     private Env env;
     private OffsetDateTime createdAt;
diff --git a/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/response/UserInstitutionRoleResponse.java b/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/response/UserInstitutionRoleResponse.java
@@ -10,7 +10,7 @@ public class UserInstitutionRoleResponse {
     private String institutionId;
     private String institutionName;
     private String institutionRootName;
-    @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO")
+    @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA")
     private String role;
     private OnboardedProductState status;
 }
diff --git a/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/response/product/OnboardedProductWithActions.java b/apps/user-ms/src/main/java/it/pagopa/selfcare/user/controller/response/product/OnboardedProductWithActions.java
@@ -20,7 +20,7 @@ public class OnboardedProductWithActions {
     private String tokenId;
     private OnboardedProductState status;
     private String productRole;
-    @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO")
+    @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA")
     private String role;
     private Env env = ROOT;
     private OffsetDateTime createdAt;
diff --git a/apps/user-ms/src/main/resources/role_action_mapping.json b/apps/user-ms/src/main/resources/role_action_mapping.json
@@ -60,20 +60,6 @@
     "Selc:ViewInstitutionData",
     "Selc:UpdateInstitutionData"
   ],
-  "ADMIN_EA_IO": [
-    "Selc:UploadLogo",
-    "Selc:ViewBilling",
-    "Selc:ListActiveProducts",
-    "Selc:AccessProductBackoffice",
-    "Selc:ViewManagedInstitutions",
-    "Selc:ViewDelegations",
-    "Selc:ManageProductUsers",
-    "Selc:ListProductUsers",
-    "Selc:ManageProductGroups",
-    "Selc:CreateDelegation",
-    "Selc:ViewInstitutionData",
-    "Selc:UpdateInstitutionData"
-  ],
   "OPERATOR": [
     "Selc:ViewBilling",
     "Selc:AccessProductBackoffice",
diff --git a/apps/user-ms/src/test/java/it/pagopa/selfcare/user/service/UserServiceTest.java b/apps/user-ms/src/test/java/it/pagopa/selfcare/user/service/UserServiceTest.java
@@ -1324,7 +1324,7 @@ void createUserFromOnboardingByUserIdInvalidRole() {
 
         userService.createUserByUserId(addUserRoleDto, "userId", loggedUser)
                 .subscribe().withSubscriber(UniAssertSubscriber.create())
-                .assertFailedWith(InvalidRequestException.class, "Invalid role: INVALID. Allowed value are: [MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO]");
+                .assertFailedWith(InvalidRequestException.class, "Invalid role: INVALID. Allowed value are: [MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA]");
     }
 
 
diff --git a/apps/user-ms/src/test/java/it/pagopa/selfcare/user/util/ActionMapRetrieverTest.java b/apps/user-ms/src/test/java/it/pagopa/selfcare/user/util/ActionMapRetrieverTest.java
@@ -14,11 +14,10 @@ void retrieveActionsMap_returnsCorrectActionsMap() {
 
         // Then
         assertNotNull(actionMapRetriever.getUserActionsMap());
-        assertEquals(6, actionMapRetriever.getUserActionsMap().size());
+        assertEquals(5, actionMapRetriever.getUserActionsMap().size());
         assertTrue(actionMapRetriever.getUserActionsMap().containsKey(PartyRole.MANAGER.name()));
         assertTrue(actionMapRetriever.getUserActionsMap().containsKey(PartyRole.DELEGATE.name()));
         assertTrue(actionMapRetriever.getUserActionsMap().containsKey(PartyRole.ADMIN_EA.name()));
-        assertTrue(actionMapRetriever.getUserActionsMap().containsKey(PartyRole.ADMIN_EA_IO.name()));
         assertTrue(actionMapRetriever.getUserActionsMap().containsKey(PartyRole.SUB_DELEGATE.name()));
         assertTrue(actionMapRetriever.getUserActionsMap().containsKey(PartyRole.OPERATOR.name()));
 
diff --git a/apps/user-ms/src/test/resources/role_action_mapping_test.json b/apps/user-ms/src/test/resources/role_action_mapping_test.json
@@ -19,10 +19,6 @@
     "Selc:ViewBilling",
     "Selc:RequestProductAccess"
   ],
-  "ADMIN_EA_IO": [
-    "Selc:UploadLogo",
-    "Selc:ViewBilling"
-  ],
   "OPERATOR": [
     "Selc:ViewBilling"
   ]
diff --git a/libs/user-sdk-event/src/main/java/it/pagopa/selfcare/user/model/UserToNotify.java b/libs/user-sdk-event/src/main/java/it/pagopa/selfcare/user/model/UserToNotify.java
@@ -19,7 +19,7 @@ public class UserToNotify {
     private String name;
     private String familyName;
     private String email;
-    @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO")
+    @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA")
     private String role;
     private String productRole;
     private List<String> roles;
diff --git a/libs/user-sdk-model/pom.xml b/libs/user-sdk-model/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>it.pagopa.selfcare</groupId>
             <artifactId>onboarding-sdk-common</artifactId>
-            <version>0.6.8</version>
+            <version>0.3.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class UserInstitutionRoleResponse {`
`10`	`10`	`private String institutionId;`
`11`	`11`	`private String institutionName;`
`12`	`12`	`private String institutionRootName;`
`13`		`- @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA, ADMIN_EA_IO")`
	`13`	`+ @Schema(description = "Available values: MANAGER, DELEGATE, SUB_DELEGATE, OPERATOR, ADMIN_EA")`
`14`	`14`	`private String role;`
`15`	`15`	`private OnboardedProductState status;`
`16`	`16`	`}`