Merge pull request #820 from catenax-ng/feature/TRACEFOSS-2834-case-i…

…nsensitive-autocomplete-for-parts feature(tx-backend): TRACEFOSS-2834 case insensitivity to parts autocomplete
catenax-ng · Dec 5, 2023 · 74fd112 · 74fd112
2 parents 1a46242 + 851c961
commit 74fd112
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Changed detailed part view action from clicking on list item to a menu action column
 - Changed FE fieldName mapping to fix bug for properties catenaxSiteId and function
 - Fix of global search field
+- Parts autocomplete API now is case insensitive when using "startWith" parameter
 
 ### Removed
 - removed asset filters ( qualityInvestigationIdsInStatusActive, qualityInvestigationIdsInStatusActive )

diff --git a/...nd/src/main/java/org/eclipse/tractusx/traceability/common/repository/CriteriaUtility.java b/...nd/src/main/java/org/eclipse/tractusx/traceability/common/repository/CriteriaUtility.java
@@ -59,7 +59,11 @@ public List<String> getDistinctAssetFieldValues(
 
         List<Predicate> predicates = new ArrayList<>();
         if (nonNull(startWith)) {
-            predicates.add(builder.like(fieldPath, startWith + "%"));
+            predicates.add(
+                    builder.like(
+                            builder.lower(fieldPath),
+                            startWith.toLowerCase() + "%")
+            );
         }
 
         if (nonNull(owner)) {

diff --git a/...ava/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerAllIT.java b/...ava/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerAllIT.java
@@ -76,7 +76,6 @@ void shouldReturnAssetsWithManufacturerName() throws JoseException {
                 .body("content.manufacturerName", everyItem(not(equalTo(assetsSupport.emptyText()))));
     }
 
-    // Deprecated please remove once controller has been removed
     @Test
     void shoulReturnSupplierAssets() throws JoseException {
         //GIVEN
@@ -94,7 +93,6 @@ void shoulReturnSupplierAssets() throws JoseException {
                 .body("totalItems", equalTo(12));
     }
 
-    // Deprecated please remove once controller has been removed
     @Test
     void shouldReturnOwnAssets() throws JoseException {
         //GIVEN

diff --git a/...clipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerFilterValuesIT.java b/...clipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerFilterValuesIT.java
@@ -22,6 +22,7 @@
 import io.restassured.http.ContentType;
 import org.eclipse.tractusx.traceability.integration.IntegrationTestSpecification;
 import org.eclipse.tractusx.traceability.integration.common.support.AssetsSupport;
+import org.hamcrest.Matchers;
 import org.jose4j.lang.JoseException;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -119,6 +120,68 @@ void givenNotEnumTypeFieldNameAndSizeAndOwnerOwn_whenCallDistinctFilterValues_th
                 .body("size()", is(1));
     }
 
+    @Test
+    void givenBusinessPartnerLowercase_whenCallDistinctFilterValues_thenProperResponse() throws JoseException {
+        // given
+        assetsSupport.defaultAssetsStored();
+        String fieldName = "businessPartner";
+        String resultLimit = "100";
+        String startWith = "bpnl";
+
+        // then
+        given()
+                .header(oAuth2Support.jwtAuthorization(ADMIN))
+                .contentType(ContentType.JSON)
+                .log().all()
+                .when()
+                .param("fieldName", fieldName)
+                .param("size", resultLimit)
+                .param("startWith", startWith)
+                .get("/api/assets/as-built/distinctFilterValues")
+                .then()
+                .log().all()
+                .statusCode(200)
+                .assertThat()
+                .body(".", Matchers.containsInRelativeOrder(
+                        "BPNL00000003AXS3",
+                        "BPNL00000003AYRE",
+                        "BPNL00000003B0Q0",
+                        "BPNL00000003B2OM",
+                        "BPNL00000003B3NX",
+                        "BPNL00000003B5MJ"));
+    }
+
+    @Test
+    void givenBusinessPartnerMixedCase_whenCallDistinctFilterValues_thenProperResponse() throws JoseException {
+        // given
+        assetsSupport.defaultAssetsStored();
+        String fieldName = "businessPartner";
+        String resultLimit = "100";
+        String startWith = "bpNl";
+
+        // then
+        given()
+                .header(oAuth2Support.jwtAuthorization(ADMIN))
+                .contentType(ContentType.JSON)
+                .log().all()
+                .when()
+                .param("fieldName", fieldName)
+                .param("size", resultLimit)
+                .param("startWith", startWith)
+                .get("/api/assets/as-built/distinctFilterValues")
+                .then()
+                .log().all()
+                .statusCode(200)
+                .assertThat()
+                .body(".", Matchers.containsInRelativeOrder(
+                        "BPNL00000003AXS3",
+                        "BPNL00000003AYRE",
+                        "BPNL00000003B0Q0",
+                        "BPNL00000003B2OM",
+                        "BPNL00000003B3NX",
+                        "BPNL00000003B5MJ"));
+    }
+
     @Test
     void givenNotExistentOwnerEnumValue_whenCallDistinctFilterValues_thenProperResponse() throws JoseException {
         // given

diff --git a/...ipse/tractusx/traceability/integration/assets/AssetAsPlannedControllerFilterValuesIT.java b/...ipse/tractusx/traceability/integration/assets/AssetAsPlannedControllerFilterValuesIT.java
@@ -23,6 +23,7 @@
 import org.eclipse.tractusx.traceability.assets.infrastructure.asplanned.repository.JpaAssetAsPlannedRepository;
 import org.eclipse.tractusx.traceability.integration.IntegrationTestSpecification;
 import org.eclipse.tractusx.traceability.integration.common.support.AssetsSupport;
+import org.hamcrest.Matchers;
 import org.jose4j.lang.JoseException;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -118,6 +119,56 @@ void givenNotEnumTypeFieldNameAndOwnerOwn_whenCallDistinctFilterValues_thenPrope
                 .body("size()", is(1));
     }
 
+    @Test
+    void givenIdShortLowerCase_whenCallDistinctFilterValues_thenProperResponse() throws JoseException {
+        // given
+        assetsSupport.defaultAssetsAsPlannedStored();
+        String fieldName = "idShort";
+        String startWith = "vehicle";
+
+        // then
+        given()
+                .header(oAuth2Support.jwtAuthorization(ADMIN))
+                .contentType(ContentType.JSON)
+                .log().all()
+                .when()
+                .param("fieldName", fieldName)
+                .param("startWith", startWith)
+                .get("/api/assets/as-planned/distinctFilterValues")
+                .then()
+                .log().all()
+                .statusCode(200)
+                .assertThat()
+                .body(".", Matchers.containsInRelativeOrder(
+                        "VehicleModelA",
+                        "VehicleModelB"));
+    }
+
+    @Test
+    void givenIdShortMixedCase_whenCallDistinctFilterValues_thenProperResponse() throws JoseException {
+        // given
+        assetsSupport.defaultAssetsAsPlannedStored();
+        String fieldName = "idShort";
+        String startWith = "vehicleMODEL";
+
+        // then
+        given()
+                .header(oAuth2Support.jwtAuthorization(ADMIN))
+                .contentType(ContentType.JSON)
+                .log().all()
+                .when()
+                .param("fieldName", fieldName)
+                .param("startWith", startWith)
+                .get("/api/assets/as-planned/distinctFilterValues")
+                .then()
+                .log().all()
+                .statusCode(200)
+                .assertThat()
+                .body(".", Matchers.containsInRelativeOrder(
+                        "VehicleModelA",
+                        "VehicleModelB"));
+    }
+
     @Test
     void givenWrongOwnerEnum_whenCallDistinctFilterValues_thenProperResponse() throws JoseException {
         // given