Merge branch 'release-dev' into fix-github-action

app/src/test/java/it/pagopa/selfcare/dashboard/web/config/SwaggerConfigTest.java

@@ -60,6 +60,9 @@ class SwaggerConfigTest {
     @MockBean
     private UserService userServiceMock;
 
+    @MockBean
+    private UserV2Service userServiceV2Mock;
+
     @MockBean
     private BrokerService brokerService;
 

connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/api/MsCoreConnector.java

@@ -5,30 +5,23 @@
 import it.pagopa.selfcare.dashboard.connector.model.delegation.Delegation;
 import it.pagopa.selfcare.dashboard.connector.model.delegation.DelegationId;
 import it.pagopa.selfcare.dashboard.connector.model.delegation.DelegationRequest;
-import it.pagopa.selfcare.dashboard.connector.model.institution.Institution;
-import it.pagopa.selfcare.dashboard.connector.model.institution.InstitutionInfo;
-import it.pagopa.selfcare.dashboard.connector.model.institution.UpdateInstitutionResource;
+import it.pagopa.selfcare.dashboard.connector.model.institution.*;
 import it.pagopa.selfcare.dashboard.connector.model.product.PartyProduct;
+import it.pagopa.selfcare.dashboard.connector.model.user.CreateUserDto;
 import it.pagopa.selfcare.dashboard.connector.model.user.UserInfo;
+import it.pagopa.selfcare.dashboard.connector.onboarding.OnboardingRequestInfo;
 
 import java.util.Collection;
 import java.util.List;
 
 public interface MsCoreConnector {
 
-    @Deprecated
-    Collection<InstitutionInfo> getOnBoardedInstitutions();
-
     List<InstitutionInfo> getUserProducts(String userId);
 
-    UserInfo getUser(String relationshipId);
-
     List<PartyProduct> getInstitutionProducts(String institutionId);
 
     Collection<AuthInfo> getAuthInfo(String institutionId);
 
-    Collection<UserInfo> getUsers(String institutionId, UserInfo.UserInfoFilter userInfoFilter);
-
     Institution getInstitution(String institutionId);
 
     Institution updateInstitutionDescription(String institutionId, UpdateInstitutionResource updatePnPGInstitutionResource);
@@ -41,4 +34,29 @@ public interface MsCoreConnector {
 
     void updateUser(String userId, String institutionId);
 
+    InstitutionInfo getOnBoardedInstitution(String institutionId);
+
+    void updateInstitutionGeographicTaxonomy(String institutionId, GeographicTaxonomyList geographicTaxonomies);
+
+    List<GeographicTaxonomy> getGeographicTaxonomyList(String institutionId);
+
+    UserInfo getUser(String relationshipId);
+
+    void createUsers(String institutionId, String productId, String userId, CreateUserDto userDto, String productTitle);
+
+    void checkExistingRelationshipRoles(String institutionId, String productId, CreateUserDto userDto, String userId);
+
+    void suspend(String relationshipId);
+
+    void activate(String relationshipId);
+
+    void delete(String relationshipId);
+
+    OnboardingRequestInfo getOnboardingRequestInfo(String tokenId);
+
+    void approveOnboardingRequest(String tokenId);
+
+    void rejectOnboardingRequest(String tokenId);
+
+    Collection<UserInfo> getUsers(String institutionId, UserInfo.UserInfoFilter userInfoFilter);
 }

connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/api/UserApiConnector.java

@@ -0,0 +1,17 @@
+package it.pagopa.selfcare.dashboard.connector.api;
+
+import it.pagopa.selfcare.dashboard.connector.model.institution.InstitutionInfo;
+
+import java.util.List;
+
+
+public interface UserApiConnector {
+
+    List<InstitutionInfo> getUserProducts(String userId);
+
+    void suspendUserProduct(String userId, String institutionId, String productId);
+
+    void activateUserProduct(String userId, String institutionId, String productId);
+
+    void deleteUserProduct(String userId, String institutionId, String productId);
+}

connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/exception/SupportException.java

@@ -4,4 +4,7 @@ public class SupportException extends RuntimeException {
     public SupportException(String message) {
         super(message);
     }
+    public SupportException(String message, Throwable t) {
+        super(message, t);
+    }
 }

connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/AdditionalInformations.java

@@ -0,0 +1,18 @@
+package it.pagopa.selfcare.dashboard.connector.model.institution;
+
+import lombok.Data;
+
+@Data
+public class AdditionalInformations {
+
+    private boolean belongRegulatedMarket;
+    private String regulatedMarketNote;
+    private boolean ipa;
+    private String ipaCode;
+    private boolean establishedByRegulatoryProvision;
+    private String establishedByRegulatoryProvisionNote;
+    private boolean agentOfPublicService;
+    private String agentOfPublicServiceNote;
+    private String otherNote;
+
+}

connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/Institution.java

@@ -35,5 +35,6 @@ public class Institution {
     private String city;
     private String country;
     private String county;
+    private boolean delegation;
 
 }

connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/InstitutionInfo.java

@@ -34,6 +34,7 @@ public class InstitutionInfo {
     private String aooParentCode;
     private String parentDescription;
     private String rootParentId;
+    private AdditionalInformations additionalInformations;
 
     @Override
     public boolean equals(Object o) {

connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/support/SupportRequest.java

@@ -7,6 +7,8 @@ public class SupportRequest {
 
     private String email;
     private String productId;
+    private String userId;
+    private String institutionId;
     private String name;
     private UserField userFields;
 

connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/support/UserField.java

@@ -1,10 +1,12 @@
 package it.pagopa.selfcare.dashboard.connector.model.support;
 
-import lombok.Data;
-import lombok.ToString;
+import lombok.*;
 
 @Data
 @ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class UserField {
     private String aux_data;
 }

connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/user/UserInfo.java

@@ -17,10 +17,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.EnumSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 
 @Data
 @EqualsAndHashCode(of = "id")
@@ -33,34 +30,13 @@ public class UserInfo {
     private String status;
     private String institutionId;
 
-
     @Data
     public static class UserInfoFilter {
-        private Optional<SelfCareAuthority> role = Optional.empty();
-        private Optional<String> productId = Optional.empty();
-        private Optional<Set<String>> productRoles = Optional.empty();
-        private Optional<String> userId = Optional.empty();
-        private Optional<EnumSet<RelationshipState>> allowedStates = Optional.empty();
-
-        public void setRole(Optional<SelfCareAuthority> role) {
-            this.role = role == null ? Optional.empty() : role;
-        }
-
-        public void setProductId(Optional<String> productId) {
-            this.productId = productId == null ? Optional.empty() : productId;
-        }
-
-        public void setProductRoles(Optional<Set<String>> productRoles) {
-            this.productRoles = productRoles == null ? Optional.empty() : productRoles;
-        }
-
-        public void setUserId(Optional<String> userId) {
-            this.userId = userId == null ? Optional.empty() : userId;
-        }
-
-        public void setAllowedState(Optional<EnumSet<RelationshipState>> allowedStates) {
-            this.allowedStates = allowedStates == null ? Optional.empty() : allowedStates;
-        }
+        private SelfCareAuthority role;
+        private String productId;
+        private List<String> productRoles;
+        private String userId;
+        private List<RelationshipState> allowedStates;
     }
 
 }

connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/onboarding/OnboardingRequestInfo.java

@@ -12,5 +12,6 @@ public class OnboardingRequestInfo {
     private InstitutionInfo institutionInfo;
     private UserInfo manager;
     private List<UserInfo> admins;
+    private String productId;
 
 }