chore(contracts):1105 Refactored.

eclipse-tractusx · Jul 18, 2024 · 7fd8f0e · 7fd8f0e
1 parent 8b01314
commit 7fd8f0e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/.trivyignore b/.github/workflows/.trivyignore
@@ -1,5 +1,5 @@
-# ref https://github.com/catenax-ng/product-traceability-foss-backend/security/code-scanning/1419
+# ref https://github.com/eclipse-tractusx/traceability-foss-backend/security/code-scanning/1419
 CVE-2022-25857
-# ref https://github.com/catenax-ng/tx-traceability-foss/security/code-scanning/6879
+# ref https://github.com/eclipse-tractusx/traceability-foss/security/code-scanning/6879
 # this is acceptable due to custom environment variable injection script which is executed upon FE container startup
 AVD-KSV-0014
diff --git a/...tractusx/traceability/contracts/infrastructure/repository/ContractRepositoryImplBase.java b/...tractusx/traceability/contracts/infrastructure/repository/ContractRepositoryImplBase.java
@@ -78,7 +78,7 @@ public List<Contract> fetchEdcContractAgreements(List<ContractAgreementBaseEntit
                     try {
 
                         String globalAssetId = contractAgreementEntities.stream()
-                                .filter(contractAgreementViewEntity -> contractAgreementViewEntity.getContractAgreementId().equals(contractAgreement.contractAgreementId()))
+                                .filter(contractAgreementViewEntity -> contractAgreementViewEntity.getContractAgreementId() == null || contractAgreement.contractAgreementId() == null || contractAgreementViewEntity.getContractAgreementId().equals(contractAgreement.contractAgreementId()))
                                 .findFirst()
                                 .map(ContractAgreementBaseEntity::getGlobalAssetId)
                                 .orElse(null);