From f9d66cf893b481f249bc525bbd7ce911b1e38539 Mon Sep 17 00:00:00 2001
From: "fabio.d.mota" <fabio.d.mota@cgi.com>
Date: Thu, 25 Jan 2024 17:15:59 +0000
Subject: [PATCH] fix(Backend): Fix body implementation with edc disabled

---
 .../service/logic/BusinessPartnersLogicService.java       | 8 +++++---
 .../service/logic/RequestLogicService.java                | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/eclipse/tractusx/valueaddedservice/service/logic/BusinessPartnersLogicService.java b/src/main/java/org/eclipse/tractusx/valueaddedservice/service/logic/BusinessPartnersLogicService.java
index 3384e76..a462eda 100644
--- a/src/main/java/org/eclipse/tractusx/valueaddedservice/service/logic/BusinessPartnersLogicService.java
+++ b/src/main/java/org/eclipse/tractusx/valueaddedservice/service/logic/BusinessPartnersLogicService.java
@@ -51,13 +51,15 @@ private List<BusinessPartnerDTO> filterBusinessPartnersByRole(List<BusinessPartn
         List<BusinessPartnerDTO> filteredBusinessPartnerDTOS;
         log.debug("Roles {}",roles);
         log.debug("Code Roles {} {}",CSV_ROLE_READ_SUPPLIER,CSV_ROLE_READ_CUSTOMER);
-        if (roles.contains(CSV_ROLE_READ_SUPPLIER) && roles.contains(CSV_ROLE_READ_CUSTOMER)) {
+
+        if (roles.stream().anyMatch(role -> role.equalsIgnoreCase(CSV_ROLE_READ_SUPPLIER)) &&
+                roles.stream().anyMatch(role -> role.equalsIgnoreCase(CSV_ROLE_READ_CUSTOMER))) {
             // User has both roles, no need to filter
             filteredBusinessPartnerDTOS = businessPartnerDTOS;
-        } else if (roles.contains(CSV_ROLE_READ_SUPPLIER)) {
+        } else if (roles.stream().anyMatch(role -> role.equalsIgnoreCase(CSV_ROLE_READ_SUPPLIER))) {
             // User can only read suppliers and those who are not customers
             filteredBusinessPartnerDTOS = filterSuppliers(businessPartnerDTOS);
-        } else if (roles.contains(CSV_ROLE_READ_CUSTOMER)) {
+        } else if (roles.stream().anyMatch(role -> role.equalsIgnoreCase(CSV_ROLE_READ_CUSTOMER))) {
             // User can only read customers and those who are not suppliers
             filteredBusinessPartnerDTOS = filterCustomers(businessPartnerDTOS);
         } else {
diff --git a/src/main/java/org/eclipse/tractusx/valueaddedservice/service/logic/RequestLogicService.java b/src/main/java/org/eclipse/tractusx/valueaddedservice/service/logic/RequestLogicService.java
index 2033182..2bb86e9 100644
--- a/src/main/java/org/eclipse/tractusx/valueaddedservice/service/logic/RequestLogicService.java
+++ b/src/main/java/org/eclipse/tractusx/valueaddedservice/service/logic/RequestLogicService.java
@@ -122,7 +122,7 @@ private List<BusinessPartnerDTO> handleSequentialRequests() {
     private List<BusinessPartnerDTO> handleNonSequentialRequests() {
         List<BusinessPartnerDTO> finalDtoList = new ArrayList<>();
 
-        String body = "[\"\"]";
+        String body = "[]";
         HttpEntity<Object> httpEntity = createHttpEntity(body);
 
         log.info("Sequential requests not enabled. Starting process to fetch external business partners from generic.");