From b2fa690dc8128c3d0b16ad69c8c510aa863689fa Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Tue, 26 Mar 2024 16:16:26 +0100 Subject: [PATCH 1/2] feature: #736 add contractAgreementId as searchable field for /contracts --- CHANGELOG.md | 1 + .../contracts/application/mapper/ContractFieldMapper.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 372d7a9145..e98462ce59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha - Added overview of the scheduler tasks in documentation - #706 Created notification classes to support both alert and investigations - #706 Notification controller having the same endpoints as alerts and investigations controllers +- #736 add contractAgreementId as searchable field for /contracts ### Changed - #709 Bumped spring-core from 6.0.17 to 6.1.5 diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/application/mapper/ContractFieldMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/application/mapper/ContractFieldMapper.java index b71f93e9cb..2e9aee79f7 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/application/mapper/ContractFieldMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/application/mapper/ContractFieldMapper.java @@ -27,7 +27,8 @@ public class ContractFieldMapper extends BaseRequestFieldMapper { private static final Map SUPPORTED_CONTRACT_FILTER_FIELDS = Map.ofEntries( Map.entry("created", "created"), - Map.entry("id", "id") + Map.entry("id", "id"), + Map.entry("contractAgreementId", "contractAgreementId") ); @Override From 91829847dbb72b3060ff84bf4a53a049d21f18fe Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Tue, 26 Mar 2024 16:27:35 +0100 Subject: [PATCH 2/2] feature: #736 add contractAgreementId as searchable field for /contracts --- .../contracts/application/mapper/ContractFieldMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/application/mapper/ContractFieldMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/application/mapper/ContractFieldMapper.java index 2e9aee79f7..25bb7b6509 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/application/mapper/ContractFieldMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/application/mapper/ContractFieldMapper.java @@ -28,7 +28,7 @@ public class ContractFieldMapper extends BaseRequestFieldMapper { private static final Map SUPPORTED_CONTRACT_FILTER_FIELDS = Map.ofEntries( Map.entry("created", "created"), Map.entry("id", "id"), - Map.entry("contractAgreementId", "contractAgreementId") + Map.entry("contractId", "contractAgreementId") ); @Override