[SELC-4383] Feat: Added dependency and configuration of product libs

.github/workflows/release_open_api.yml

@@ -12,6 +12,7 @@ jobs:
   swagger_conflict_update:  
     runs-on: ubuntu-20.04
     permissions: write-all
+    secrets: inherit
     name: Swagger Detect Conflict and Update
     steps:
       - id: swagger-conflict-update

Dockerfile.new

@@ -2,7 +2,21 @@ FROM maven:3-eclipse-temurin-17@sha256:0d328fa6843bb26b60cf44d69833f241ffe96218f
 
 COPY . .
 
-RUN mvn clean package -DskipTests=true
+RUN echo "<settings>\n" \
+         "<servers>\n" \
+         "<server>\n" \
+         "<id>\${repositoryOnboarding}</id>\n" \
+         "<username>\${repoLogin}</username>\n" \
+         "<password>\${repoPwd}</password>\n" \
+         "</server>\n" \
+         "</servers>\n" \
+         "</settings>\n" > settings.xml
+
+ARG REPO_ONBOARDING
+ARG REPO_USERNAME
+ARG REPO_PASSWORD
+
+RUN mvn --global-settings settings.xml -DrepositoryOnboarding=${REPO_ONBOARDING} -DrepoLogin=${REPO_USERNAME} -DrepoPwd=${REPO_PASSWORD} clean package -DskipTests=true
 
 FROM openjdk:17-jdk@sha256:528707081fdb9562eb819128a9f85ae7fe000e2fbaeaf9f87662e7b3f38cb7d8 AS runtime
 

app/src/main/resources/config/core-config.properties

@@ -51,3 +51,7 @@ scheduler.threads.max-number=${THREADS_SCHEDULE_MAX_NUMBER:1}
 scheduler.fixed-delay.delay=${SCHEDULER_FIXED_DELAY:20000}
 scheduler.regenerate-kafka-queue-config.name=${SCHEDULER_REGENERATE_KAFKA_QUEUE_CONFIG_NAME:KafkaScheduler}
 scheduler.regenerate-kafka-queue.enabled=${SCHEDULER_REGENERATE_KAFKA_QUEUE_ENABLED:false}
+
+mscore.blob-storage.container-product=${PRODUCT_STORAGE_CONTAINER:selc-d-product}
+mscore.blob-storage.filepath-product = products.json
+mscore.blob-storage.connection-string-product = ${BLOB_STORAGE_CONN_STRING:UseDevelopmentStorage=true;}

app/src/main/resources/swagger/api-docs.json

@@ -2367,7 +2367,7 @@
           "200" : {
             "description" : "OK",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "$ref" : "#/components/schemas/BulkInstitutions"
                 }
@@ -2481,7 +2481,7 @@
           "204" : {
             "description" : "No Content",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "$ref" : "#/components/schemas/RelationshipsManagement"
                 }
@@ -2618,7 +2618,7 @@
           "200" : {
             "description" : "OK",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "$ref" : "#/components/schemas/OnboardingInfoResponse"
                 }
@@ -2725,7 +2725,7 @@
           "200" : {
             "description" : "OK",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "type" : "array",
                   "items" : {
@@ -2791,7 +2791,7 @@
           "200" : {
             "description" : "OK",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "type" : "string",
                   "format" : "byte"
@@ -2844,7 +2844,7 @@
           "200" : {
             "description" : "OK",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "type" : "array",
                   "items" : {
@@ -2909,7 +2909,7 @@
           "200" : {
             "description" : "OK",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "type" : "array",
                   "items" : {
@@ -3356,7 +3356,7 @@
           "200" : {
             "description" : "OK",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "$ref" : "#/components/schemas/PaginatedTokenResponse"
                 }
@@ -3429,7 +3429,7 @@
           "200" : {
             "description" : "OK",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "$ref" : "#/components/schemas/TokenListResponse"
                 }
@@ -3490,7 +3490,7 @@
           "200" : {
             "description" : "OK",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "$ref" : "#/components/schemas/TokenResource"
                 }
@@ -3544,7 +3544,7 @@
           "204" : {
             "description" : "No Content",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "$ref" : "#/components/schemas/OnboardedUsersResponse"
                 }
@@ -3597,7 +3597,7 @@
           "200" : {
             "description" : "OK",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "$ref" : "#/components/schemas/RelationshipResult"
                 }
@@ -3836,7 +3836,7 @@
           "200" : {
             "description" : "OK",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "$ref" : "#/components/schemas/UsersNotificationResponse"
                 }
@@ -3907,7 +3907,7 @@
           "200" : {
             "description" : "OK",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "$ref" : "#/components/schemas/UserResponse"
                 }
@@ -4147,7 +4147,7 @@
           "200" : {
             "description" : "OK",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "$ref" : "#/components/schemas/OnboardingInfoResponse"
                 }
@@ -4293,7 +4293,7 @@
           "200" : {
             "description" : "OK",
             "content" : {
-              "*/*" : {
+              "application/json" : {
                 "schema" : {
                   "$ref" : "#/components/schemas/UserProductsResponse"
                 }

connector-api/pom.xml

@@ -34,6 +34,19 @@
             <groupId>it.pagopa.selfcare</groupId>
             <artifactId>selc-commons-base</artifactId>
         </dependency>
+        <dependency>
+            <groupId>it.pagopa.selfcare</groupId>
+            <artifactId>onboarding-sdk-product</artifactId>
+            <version>0.1.9</version>
+        </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>selfcare-onboarding</id>
+            <name>Selfcare Onboarding SDK</name>
+            <url>https://maven.pkg.github.com/pagopa/selfcare-onboarding</url>
+        </repository>
+    </repositories>
+
 </project>

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

@@ -23,4 +23,12 @@ public class CoreConfig {
     private Integer onboardingExpiringDate;
     private boolean infoCamereEnable;
     private boolean enableSendDelegationMail;
+    private BlobStorage blobStorage;
+
+    @Data
+    public static class BlobStorage {
+        private String containerProduct;
+        private String filepathProduct;
+        private String connectionStringProduct;
+    }
 }

connector/dao/src/main/java/it/pagopa/selfcare/mscore/connector/dao/UserConnectorImpl.java

@@ -8,7 +8,6 @@
 import it.pagopa.selfcare.mscore.connector.dao.model.inner.UserBindingEntity;
 import it.pagopa.selfcare.mscore.connector.dao.model.mapper.UserEntityMapper;
 import it.pagopa.selfcare.mscore.connector.dao.model.mapper.UserInstitutionAggregationMapper;
-import it.pagopa.selfcare.mscore.connector.rest.client.ProductsRestClient;
 import it.pagopa.selfcare.mscore.constant.Env;
 import it.pagopa.selfcare.mscore.constant.RelationshipState;
 import it.pagopa.selfcare.mscore.exception.InvalidRequestException;
@@ -19,10 +18,11 @@
 import it.pagopa.selfcare.mscore.model.onboarding.OnboardedProduct;
 import it.pagopa.selfcare.mscore.model.onboarding.OnboardedUser;
 import it.pagopa.selfcare.mscore.model.onboarding.Token;
-import it.pagopa.selfcare.mscore.model.product.Product;
-import it.pagopa.selfcare.mscore.model.product.ProductRoleInfo;
 import it.pagopa.selfcare.mscore.model.user.UserBinding;
 import it.pagopa.selfcare.mscore.model.user.UserInfo;
+import it.pagopa.selfcare.product.entity.Product;
+import it.pagopa.selfcare.product.entity.ProductRoleInfo;
+import it.pagopa.selfcare.product.service.ProductService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.PageRequest;
@@ -65,7 +65,7 @@ public class UserConnectorImpl implements UserConnector {
 
     private final MongoOperations mongoOperations;
 
-    private final ProductsRestClient productRestClient;
+    private final ProductService productService;
 
 
     /**
@@ -370,8 +370,8 @@ public List<UserInstitutionAggregation> getUserInfo(String userId, String instit
     private void checkRoles(String productId, PartyRole role, String productRole) {
         if (StringUtils.hasText(productRole)) {
             Assert.notNull(role, ROLE_IS_NULL.getMessage());
-            Product product = productRestClient.getProductById(productId, null);
-            ProductRoleInfo productRoleInfo = product.getRoleMappings().get(role);
+            Product product = productService.getProduct(productId);
+            ProductRoleInfo productRoleInfo = product.getRoleMappings().get(it.pagopa.selfcare.onboarding.common.PartyRole.valueOf(role.name()));
             if (productRoleInfo == null) {
                 throw new InvalidRequestException(ROLE_NOT_FOUND.getMessage(), ROLE_NOT_FOUND.getCode());
             }

connector/dao/src/test/java/it/pagopa/selfcare/mscore/connector/dao/UserConnectorImplTest.java

@@ -10,7 +10,6 @@
 import it.pagopa.selfcare.mscore.connector.dao.model.inner.OnboardingEntity;
 import it.pagopa.selfcare.mscore.connector.dao.model.inner.UserBindingEntity;
 import it.pagopa.selfcare.mscore.connector.dao.model.mapper.*;
-import it.pagopa.selfcare.mscore.connector.rest.client.ProductsRestClient;
 import it.pagopa.selfcare.mscore.constant.Env;
 import it.pagopa.selfcare.mscore.constant.RelationshipState;
 import it.pagopa.selfcare.mscore.exception.ResourceNotFoundException;
@@ -22,9 +21,11 @@
 import it.pagopa.selfcare.mscore.model.onboarding.OnboardedProduct;
 import it.pagopa.selfcare.mscore.model.onboarding.OnboardedUser;
 import it.pagopa.selfcare.mscore.model.onboarding.Token;
-import it.pagopa.selfcare.mscore.model.product.Product;
-import it.pagopa.selfcare.mscore.model.product.ProductRoleInfo;
 import it.pagopa.selfcare.mscore.model.user.UserBinding;
+import it.pagopa.selfcare.product.entity.Product;
+import it.pagopa.selfcare.product.entity.ProductRole;
+import it.pagopa.selfcare.product.entity.ProductRoleInfo;
+import it.pagopa.selfcare.product.service.ProductService;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -62,7 +63,7 @@ class UserConnectorImplTest {
     private UserEntityMapper userMapper = new UserEntityMapperImpl();
 
     @Mock
-    private ProductsRestClient productsRestClient;
+    private ProductService productService;
 
     @Spy
     private OnboardedProductMapper productMapper = new OnboardedProductMapperImpl();
@@ -220,15 +221,15 @@ void findAndUpdateStateByInstitutionAndProduct() {
         when(userRepository.findAndModify(any(), any(), any(), any()))
                 .thenReturn(new UserEntity());
         Product product = mock(Product.class);
-        EnumMap<PartyRole, ProductRoleInfo> map = mock(EnumMap.class);
+        EnumMap<it.pagopa.selfcare.onboarding.common.PartyRole, ProductRoleInfo> map = mock(EnumMap.class);
         ProductRoleInfo productRoleInfo = mock(ProductRoleInfo.class);
-        ProductRoleInfo.ProductRole productRole = mock(ProductRoleInfo.ProductRole.class);
+        ProductRole productRole = mock(ProductRole.class);
         when(productRole.getCode()).thenReturn("productRole");
         when(productRoleInfo.getRoles()).thenReturn(List.of(productRole));
-        when(map.get(PartyRole.DELEGATE)).thenReturn(productRoleInfo);
+        when(map.get(it.pagopa.selfcare.onboarding.common.PartyRole.DELEGATE)).thenReturn(productRoleInfo);
         when(product.getRoleMappings()).thenReturn(map);
 
-        when(productsRestClient.getProductById(anyString(), any())).thenReturn(product);
+        when(productService.getProduct(anyString())).thenReturn(product);
         Assertions.assertDoesNotThrow(() -> userConnectorImpl.findAndUpdateStateWithOptionalFilter("42", "42", "productId", PartyRole.DELEGATE, "productRole", RelationshipState.PENDING));
     }
 
@@ -253,7 +254,7 @@ void findAndUpdateStateWithoutFilter() {
         Product product = mock(Product.class);
         EnumMap<PartyRole, ProductRoleInfo> map = mock(EnumMap.class);
         ProductRoleInfo productRoleInfo = mock(ProductRoleInfo.class);
-        ProductRoleInfo.ProductRole productRole = mock(ProductRoleInfo.ProductRole.class);
+        ProductRole productRole = mock(ProductRole.class);
         Assertions.assertDoesNotThrow(() -> userConnectorImpl.findAndUpdateStateWithOptionalFilter("42", null, null, null, null, RelationshipState.PENDING));
     }