Cors 2075 new saga le sa

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [3.71.0](https://github.com/Backbase/stream-services/compare/3.70.0...3.71.0)
+### Added
+- Added new models for LE and SA to cover requirements in the new bootstrap. In the new structure, LE supports just master service agreement and custom service agreement has been dropped. Product groups, job profile users, reference job roles, contacts were moved from LE to new SA model. In the new bootstrap, LE and SA are now separated and can be defined in the different JSON files and independently ingested.  
+
 ## [3.70.0](https://github.com/Backbase/stream-services/compare/3.69.0...3.70.0)
 ### Added
 - Support to Events via Azure Service Bus for the Stream Composition Services

api/stream-legal-entity/openapi.yaml

@@ -2,7 +2,7 @@ openapi: 3.0.1
 info:
   title: Ingest Legal Entity API
   description: Ingestion Saga for Legal Entities and their products
-  version: 2.3.2
+  version: 2.4.0
   x-logo:
     url: "http://www.backbase.com/wp-content/uploads/2017/04/backbase-logo-png.png"
     backgroundColor: "#FFFFFF"
@@ -1132,6 +1132,69 @@ components:
         - legalEntityType
         - administrators
         - jobProfile
+
+    LegalEntityV2:
+      title: Legal Entity v2
+      description: |
+        (This Legal Entity is the restructured one)
+        A Legal Entity is any personal or non-personal entity that is involved in a transaction or an product with the bank. Both the bank and its customers are legal entities
+
+        A Legal Entity:
+        * Has one or more users that act on its behalf.
+        * A legal entity hierarchy is a collection of parent-child relationships. For example, within the same deployment, this allows you to:
+        * Set up a holding structure for a corporate customer of the bank.
+        * Set up a structure within the bank to support country and regional offices.
+      type: object
+      properties:
+        name:
+          type: string
+        activateSingleServiceAgreement:
+          type: boolean
+        internalId:
+          $ref: '#/components/schemas/InternalIdentifier'
+        externalId:
+          $ref: '#/components/schemas/ExternalIdentifier'
+        legalEntityType:
+          $ref: '#/components/schemas/LegalEntityType'
+        customerCategory:
+          $ref: '#/components/schemas/CustomerCategory'
+        realmName:
+          type: string
+          description: Realm to which the Legal Entity should be mapped.
+        parentExternalId:
+          $ref: '#/components/schemas/ExternalIdentifier'
+        parentInternalId:
+          $ref: '#/components/schemas/InternalIdentifier'
+        subsidiaries:
+          type: array
+          items:
+            $ref: '#/components/schemas/LegalEntityV2'
+        limit:
+          $ref: '#/components/schemas/Limit'
+        administrators:
+          type: array
+          items:
+            $ref: '#/components/schemas/User'
+        users:
+          type: array
+          items:
+            $ref: '#/components/schemas/User'
+        masterServiceAgreement:
+          $ref: '#/components/schemas/ServiceAgreementV2'
+        contacts:
+          type: array
+          items:
+            $ref: '#/components/schemas/ExternalContact'
+        additions:
+          type: object
+          additionalProperties:
+            type: string
+      required:
+        - name
+        - external
+        - legalEntityType
+        - administrators
+
     JobProfileUser:
       type: object
       properties:
@@ -1607,6 +1670,89 @@ components:
           type: object
           additionalProperties:
             type: string
+
+    ServiceAgreementV2:
+      title: Service Agreement
+      description: |
+        The formal vehicle that allows users of one entity to access products of that or other entities
+        A Service agreement is:
+        - A contract that includes one or more legal entities. A legal entity that is participating in a service agreement can allow a subset of its users to act through that service agreement and/or allow a subset of its products to be accessed through the service agreement. Within each service agreement, permissions to perform specific tasks are granted to users, including access to products shared by one or more legal entities (participating in that service agreement). As such, a service agreement is a way to give third party users specific access to your products.
+        - A special kind of service agreement is called the master service agreement. This service agreement has one legal entity participant and once configured, the participant cannot be changed. Important to know is that once the user is granted with administrative permissions (e.g. manage account groups), he or she has the power to execute the task in any service agreement lower in the hierarchy. For example, if the user of the bank is assigned with manage account groups permission in the master service agreement of the bank, the user can manage account groups in any service agreement lower in the hierarchy.
+        - A service agreement may be restricted in time, by setting a time bound. Permissions granted to users in the time-restricted service agreement, are active and may be consumed, only while the time bound is valid.
+      properties:
+        internalId:
+          $ref: '#/components/schemas/InternalIdentifier'
+        externalId:
+          $ref: '#/components/schemas/ExternalIdentifier'
+        name:
+          maxLength: 128
+          minLength: 1
+          pattern: ^\S(.*(\S))?$
+          type: string
+          description: The service agreement name
+        description:
+          maxLength: 255
+          minLength: 1
+          pattern: ^(\S|\n)((.|\n)*(\S|\n))?$
+          type: string
+          description: Description
+        jobProfileUsers:
+          type: array
+          items:
+            $ref: '#/components/schemas/JobProfileUser'
+        participants:
+          type: array
+          description: Participants of the service agreement
+          items:
+            $ref: '#/components/schemas/LegalEntityParticipant'
+        validFromDate:
+          type: string
+          format: date
+          description: Start date of the service agreement.
+        validFromTime:
+          type: string
+          description: Start time of the service agreement.
+        validUntilDate:
+          type: string
+          format: date
+          description: End date of the service agreement.
+        validUntilTime:
+          type: string
+          description: End time of the service agreement.
+        status:
+          $ref: '#/components/schemas/LegalEntityStatus'
+        isMaster:
+          type: boolean
+          description: Master flag
+        regularUserAps:
+          $ref: '#/components/schemas/ApsIdentifiers'
+        adminUserAps:
+          $ref: '#/components/schemas/ApsIdentifiers'
+        jobRoles:
+          type: array
+          items:
+            $ref: '#/components/schemas/JobRole'
+        referenceJobRoles:
+          type: array
+          items:
+            $ref: '#/components/schemas/ReferenceJobRole'
+        creatorLegalEntity:
+          $ref: '#/components/schemas/ExternalIdentifier'
+        limit:
+          $ref: '#/components/schemas/Limit'
+        contacts:
+          type: array
+          items:
+            $ref: '#/components/schemas/ExternalContact'
+        productGroups:
+          type: array
+          items:
+            $ref: "#/components/schemas/ProductGroup"
+        additions:
+          type: object
+          additionalProperties:
+            type: string
+
     ApsIdentifiers:
       type: object
       properties:
@@ -1652,6 +1798,7 @@ components:
             - "REMOVE"
         limit:
           $ref: '#/components/schemas/Limit'
+
     LegalEntityStatus:
       type: string
       description: Status of the entity

stream-access-control/access-control-core/src/main/java/com/backbase/stream/mapper/AccessGroupMapper.java

@@ -15,6 +15,7 @@
 import com.backbase.stream.legalentity.model.LegalEntityParticipant;
 import com.backbase.stream.legalentity.model.Privilege;
 import com.backbase.stream.legalentity.model.ServiceAgreement;
+import com.backbase.stream.legalentity.model.ServiceAgreementV2;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -29,6 +30,9 @@ public interface AccessGroupMapper {
     @Mapping(source = "id", target = "internalId")
     ServiceAgreement toStream(ServiceAgreementItemQuery getServiceAgreement);
 
+    @Mapping(source = "id", target = "internalId")
+    ServiceAgreementV2 toStreamV2(ServiceAgreementItemQuery getServiceAgreement);
+
     @Mapping(source = "id", target = "internalId")
     ServiceAgreement toStream(ServiceAgreementItem serviceAgreementItem);
 
@@ -37,6 +41,9 @@ public interface AccessGroupMapper {
     @Mapping(source = "participants", target = "participantsToIngest")
     ServicesAgreementIngest toPresentation(ServiceAgreement serviceAgreement);
 
+    @Mapping(source = "participants", target = "participantsToIngest")
+    ServicesAgreementIngest toPresentation(ServiceAgreementV2 serviceAgreement);
+
     ServiceAgreementPut toPresentationPut(ServiceAgreement serviceAgreement);
 
     // Initialize users list to workaround https://backbase.atlassian.net/browse/MAINT-10442

stream-access-control/access-control-core/src/main/java/com/backbase/stream/mapper/LegalEntityMapper.java

@@ -7,7 +7,9 @@
 import com.backbase.dbs.accesscontrol.api.service.v3.model.LegalEntityPut;
 import com.backbase.dbs.accesscontrol.api.service.v3.model.LegalEntityType;
 import com.backbase.stream.legalentity.model.LegalEntity;
+import com.backbase.stream.legalentity.model.LegalEntityV2;
 import com.backbase.stream.legalentity.model.ServiceAgreement;
+import com.backbase.stream.legalentity.model.ServiceAgreementV2;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
@@ -18,15 +20,27 @@ public interface LegalEntityMapper {
     @Mapping(source = "legalEntityType", target = "type")
     LegalEntityCreateItem toPresentation(LegalEntity legalEntity);
 
+    @Mapping(source = "legalEntityType", target = "type")
+    LegalEntityCreateItem toPresentation(LegalEntityV2 legalEntity);
+
     @Mapping(source = "type", target = "legalEntityType")
     @Mapping(source = "id", target = "internalId")
     LegalEntity toStream(LegalEntityItemBase legalEntityItemBase);
 
+    @Mapping(source = "type", target = "legalEntityType")
+    @Mapping(source = "id", target = "internalId")
+    LegalEntityV2 toStreamV2(LegalEntityItemBase legalEntityItemBase);
+
     @Mapping(source = "type", target = "legalEntityType")
     @Mapping(source = "id", target = "internalId")
     @Mapping(source = "parentId", target = "parentInternalId")
     LegalEntity toStream(LegalEntityItem legalEntityItem);
 
+    @Mapping(source = "type", target = "legalEntityType")
+    @Mapping(source = "id", target = "internalId")
+    @Mapping(source = "parentId", target = "parentInternalId")
+    LegalEntityV2 toStreamV2(LegalEntityItem legalEntityItem);
+
     com.backbase.stream.legalentity.model.LegalEntityType map(LegalEntityType legalEntityType);
 
     @Mapping(source = "type", target = "legalEntityType")
@@ -35,6 +49,9 @@ public interface LegalEntityMapper {
     @Mapping(source = "id", target = "internalId")
     ServiceAgreement toStream(GetServiceAgreement getServiceAgreement);
 
+    @Mapping(source = "id", target = "internalId")
+    ServiceAgreementV2 toStreamV2(GetServiceAgreement getServiceAgreement);
+
     @Mapping(source = "additions", target = "newValues.additions")
     @Mapping(source = "externalId", target = "newValues.externalId")
     @Mapping(source = "name", target = "newValues.name")
@@ -44,4 +61,14 @@ public interface LegalEntityMapper {
     @Mapping(source = "activateSingleServiceAgreement", target = "newValues.activateSingleServiceAgreement")
     @Mapping(source = "externalId", target = "currentExternalId")
     LegalEntityPut toLegalEntityPut(LegalEntity legalEntity);
+
+    @Mapping(source = "additions", target = "newValues.additions")
+    @Mapping(source = "externalId", target = "newValues.externalId")
+    @Mapping(source = "name", target = "newValues.name")
+    @Mapping(source = "legalEntityType", target = "newValues.type")
+    @Mapping(source = "customerCategory", target = "newValues.customerCategory")
+    @Mapping(source = "parentExternalId", target = "newValues.parentExternalId")
+    @Mapping(source = "activateSingleServiceAgreement", target = "newValues.activateSingleServiceAgreement")
+    @Mapping(source = "externalId", target = "currentExternalId")
+    LegalEntityPut toLegalEntityPut(LegalEntityV2 legalEntity);
 }

stream-access-control/access-control-core/src/main/java/com/backbase/stream/service/AccessGroupService.java

@@ -60,6 +60,7 @@
 import com.backbase.stream.legalentity.model.ReferenceJobRole;
 import com.backbase.stream.legalentity.model.ServiceAgreement;
 import com.backbase.stream.legalentity.model.ServiceAgreementUserAction;
+import com.backbase.stream.legalentity.model.ServiceAgreementV2;
 import com.backbase.stream.legalentity.model.User;
 import com.backbase.stream.mapper.AccessGroupMapper;
 import com.backbase.stream.mapper.ParticipantMapper;
@@ -455,6 +456,14 @@ private BiFunction<IdItem, ServiceAgreement, ServiceAgreement> storeIdInServiceA
         };
     }
 
+    private BiFunction<IdItem, ServiceAgreementV2, ServiceAgreementV2> storeIdInServiceAgreementV2() {
+        return (idItem, serviceAgreement1) -> {
+            serviceAgreement1.setInternalId(idItem.getId());
+            log.info("Created Service Agreement: {} with id: {}", serviceAgreement1.getName(), idItem.getId());
+            return serviceAgreement1;
+        };
+    }
+
     public Mono<LegalEntity> setAdministrators(LegalEntity legalEntity) {
 
         List<PresentationServiceAgreementUserPair> userPairs = legalEntity.getAdministrators().stream().map(user -> {
@@ -537,9 +546,9 @@ public Mono<BatchProductGroupTask> assignPermissionsBatch(BatchProductGroupTask
                             .dataGroupIdentifiers(
                                 usersPermissions.get(user).get(bfg).stream()
                                     .map(pg -> mapDataGroupId(pg.getInternalId()))
-                                    .collect(Collectors.toList())))
-                        .collect(Collectors.toList())))
-            .collect(Collectors.toList());
+                                    .toList()))
+                        .toList()))
+            .toList();
 
         return Mono.just(request)
             .flatMap(userPermissionsRequest -> {
@@ -1086,6 +1095,38 @@ public Mono<Void> deleteAdmins(ServiceAgreement serviceAgreement) {
             });
     }
 
+    public Mono<Void> deleteAdmins(ServiceAgreementV2 serviceAgreement) {
+        log.debug("Removing admins for Service Agreement {}", serviceAgreement.getName());
+        return serviceAgreementsApi.getServiceAgreementAdmins(serviceAgreement.getInternalId())
+            .flatMapMany(admins -> Flux.fromIterable(admins.getAdmins()))
+            // get External  ID for each admin.
+            // We need to  get the user by using the internal id to facilitate the delete for issue #46
+            .flatMap(userId -> usersApi.getUserById(userId, true)).map(GetUser::getExternalId)
+            .collectList()
+            .doOnNext(adminIds -> log.debug("Found  admins: {}", adminIds))
+            .map(adminsExternalIds -> adminsExternalIds.stream()
+                .map(adminId -> new PresentationServiceAgreementUserPair()
+                    .externalServiceAgreementId(serviceAgreement.getExternalId())
+                    .externalUserId(adminId))
+                .collect(Collectors.toList()))
+            .flatMap(admins -> {
+                if (CollectionUtils.isEmpty(admins)) {
+                    return Mono.empty();
+                } else {
+                    return serviceAgreementsApi.putPresentationServiceAgreementAdminsBatchUpdate(
+                            new PresentationServiceAgreementUsersBatchUpdate()
+                                .action(PresentationAction.REMOVE)
+                                .users(admins))
+                        .map(r -> batchResponseUtils.checkBatchResponseItem(r, "Delete Admin", r.getStatus().getValue(), r.getResourceId(), r.getErrors()))
+                        .collectList()
+                        .onErrorResume(WebClientResponseException.class, e -> {
+                            log.error("Failed to delete admin: {}", e.getResponseBodyAsString(), e);
+                            return Mono.error(e);
+                        }).then();
+                }
+            });
+    }
+
     /**
      * Get internal identifiers of all arrangements mentioned in all Data Groups for specified Service Agreement.
      *

stream-access-control/access-control-core/src/main/java/com/backbase/stream/service/LegalEntityService.java

@@ -177,5 +177,4 @@ public Mono<LegalEntity> putLegalEntity(LegalEntity legalEntity) {
                 .onErrorStop()
                 .then(getLegalEntityByExternalId(legalEntityPut.getNewValues().getExternalId()));
     }
-
 }

stream-access-control/access-control-core/src/test/java/com/backbase/stream/mapper/LegalEntityMapperTest.java

@@ -38,7 +38,7 @@ class LegalEntityMapperTest {
 
     @Test
     void toPresentationWithNullArg() {
-        assertNull(mapper.toPresentation(null));
+        assertNull(mapper.toPresentation((LegalEntity) null));
     }
 
     @Test
@@ -174,7 +174,7 @@ void toStreamFromGetServiceAgreementShouldCopyAllAttributes() {
 
     @Test
     void testToLegalEntityPutWithNullArg() {
-        assertNull(mapper.toLegalEntityPut(null));
+        assertNull(mapper.toLegalEntityPut((LegalEntity) null));
     }
 
     @Test

stream-legal-entity/legal-entity-core/src/main/java/com/backbase/stream/LegalEntitySaga.java

@@ -124,7 +124,6 @@ public LegalEntitySaga(LegalEntityService legalEntityService,
         UserService userService,
         UserProfileService userProfileService,
         AccessGroupService accessGroupService,
-        ProductIngestionSaga productIngestionSaga,
         BatchProductIngestionSaga batchProductIngestionSaga,
         LimitsSaga limitsSaga,
         ContactsSaga contactsSaga,