Reapply "Merge pull request #611 from catenax-ng/feat/510-dont-filter…

…-submodel-descriptors-from-shell" This reverts commit e78fb6c.
eclipse-tractusx · May 17, 2024 · 5ffd59c · 5ffd59c
1 parent 7cd3c53
commit 5ffd59c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 
 - Updated default accepted policy to latest traceability framework agreement #596
 - BPN summary was removed from Job response #568
+- Shells in Job response will contain all submodel descriptors returned by provider, instead filtered by aspect-type parameter. #510
 
 
 ## [5.1.1] - 2024-05-08
@@ -58,7 +59,6 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 ### Added
 
 - Cucumber test step definitions for Policy Store API (Happy Path) including some test helper utilities. #518
-
 
 ## [5.1.0] - 2024-05-06
 
@@ -75,7 +75,6 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 - Update bouncycastle to 1.78 to fix CVE's.
 - Fixed validation of json-schemas - IRS is creating tombstone instead collecting Submodel payload, when it not passes validation of schema #522
 
-
 ## [5.0.0] - 2024-04-16
 
 ### Added

diff --git a/...i/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegate.java b/...i/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegate.java
@@ -74,11 +74,6 @@ public ItemContainer process(final ItemContainer.ItemContainerBuilder itemContai
                                                           // DigitalTwinRegistryKey here
                                                           .findFirst().orElseThrow();
 
-            if (!expectedDepthOfTreeIsNotReached(jobData.getDepth(), aasTransferProcess.getDepth())) {
-                // filter submodel descriptors if next delegate will not be executed
-                shell.payload().withFilteredSubmodelDescriptors(jobData.getAspects());
-            }
-
             itemContainerBuilder.shell(
                     jobData.isAuditContractNegotiation() ? shell : shell.withoutContractAgreementId());
         } catch (final RegistryServiceException | RuntimeException e) {

diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java
@@ -55,7 +55,6 @@
 /**
  * Builds submodels array for AAShell from previous steps.
  * All submodels are being retrieved from EDC's components.
- * Additionally submodel descriptors from shell are being filtered to requested aspect types.
  */
 @Slf4j
 public class SubmodelDelegate extends AbstractDelegate {
@@ -86,21 +85,19 @@ public ItemContainer process(final ItemContainer.ItemContainerBuilder itemContai
             final List<SubmodelDescriptor> aasSubmodelDescriptors = shell.payload().getSubmodelDescriptors();
             log.info("Retrieved {} SubmodelDescriptor for itemId {}", aasSubmodelDescriptors.size(), itemId);
 
-            final List<SubmodelDescriptor> filteredSubmodelDescriptorsByAspectType = shell.payload()
-                                                                                          .filterDescriptorsByAspectTypes(
-                                                                                                  jobData.getAspects());
-
             if (jobData.isCollectAspects()) {
                 log.info("Collecting Submodels.");
+                final List<SubmodelDescriptor> filteredSubmodelDescriptorsByAspectType = shell.payload()
+                                                                                              .filterDescriptorsByAspectTypes(
+                                                                                                      jobData.getAspects());
+
                 filteredSubmodelDescriptorsByAspectType.forEach(submodelDescriptor -> itemContainerBuilder.submodels(
                         getSubmodels(submodelDescriptor, itemContainerBuilder, itemId.getGlobalAssetId(),
                                 itemId.getBpn(), jobData.isAuditContractNegotiation())));
-            }
-            log.trace("Unfiltered SubmodelDescriptor: {}", aasSubmodelDescriptors);
-            log.trace("Filtered SubmodelDescriptor: {}", filteredSubmodelDescriptorsByAspectType);
-
-            shell.payload().setSubmodelDescriptors(filteredSubmodelDescriptorsByAspectType);
 
+                log.trace("Unfiltered SubmodelDescriptor: {}", aasSubmodelDescriptors);
+                log.trace("Filtered SubmodelDescriptor: {}", filteredSubmodelDescriptorsByAspectType);
+            }
         });
 
         return next(itemContainerBuilder, jobData, aasTransferProcess, itemId);

diff --git a/...c/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegateTest.java b/...c/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegateTest.java
@@ -86,7 +86,7 @@ void shouldFillItemContainerWithShellAndContractAgreementIdWhenAuditFlag() throw
     }
 
     @Test
-    void shouldFillItemContainerWithShellAndFilteredSubmodelDescriptorsWhenDepthReached() throws RegistryServiceException {
+    void shouldFillItemContainerWithShellAndSubmodelDescriptorsWhenDepthReached() throws RegistryServiceException {
         // given
         when(digitalTwinRegistryService.fetchShells(any())).thenReturn(
                 List.of(shell("", shellDescriptor(List.of(submodelDescriptorWithoutHref("any"))))));
@@ -99,7 +99,7 @@ void shouldFillItemContainerWithShellAndFilteredSubmodelDescriptorsWhenDepthReac
         // then
         assertThat(result).isNotNull();
         assertThat(result.getShells()).isNotEmpty();
-        assertThat(result.getShells().get(0).payload().getSubmodelDescriptors()).isEmpty();
+        assertThat(result.getShells().get(0).payload().getSubmodelDescriptors()).isNotEmpty();
     }
 
     @Test

diff --git a/.../src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegateTest.java b/.../src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegateTest.java
@@ -68,7 +68,7 @@ class SubmodelDelegateTest {
             jsonValidatorService, new JsonUtil(), connectorEndpointsService);
 
     @Test
-    void shouldFilterSubmodelDescriptorsByAspectTypeFilter() {
+    void shouldNotFilterSubmodelDescriptorsByAspectTypeFilter() {
         // given
         final ItemContainer.ItemContainerBuilder itemContainerShellWithTwoSubmodels = ItemContainer.builder()
                                                                                                    .shell(shell("", shellDescriptor(
@@ -85,7 +85,7 @@ void shouldFilterSubmodelDescriptorsByAspectTypeFilter() {
 
         // then
         assertThat(result).isNotNull();
-        assertThat(result.getShells().get(0).payload().getSubmodelDescriptors()).isEmpty();
+        assertThat(result.getShells().get(0).payload().getSubmodelDescriptors()).isNotEmpty();
     }
 
     @Test

diff --git a/...e/tractusx/irs/component/assetadministrationshell/AssetAdministrationShellDescriptor.java b/...e/tractusx/irs/component/assetadministrationshell/AssetAdministrationShellDescriptor.java
@@ -96,15 +96,6 @@ public Optional<String> findManufacturerId() {
                                .findFirst();
     }
 
-    /**
-     * @param aspectTypes the aspect types which should be filtered by
-     * @return AssetAdministrationShellDescriptor with filtered submodel descriptors
-     */
-    public AssetAdministrationShellDescriptor withFilteredSubmodelDescriptors(final List<String> aspectTypes) {
-        setSubmodelDescriptors(filterDescriptorsByAspectTypes(aspectTypes));
-        return this;
-    }
-
     /**
      * @param relationshipAspect filter for aspect type
      * @return The filtered list of submodel addresses