MARP-975 Handle Feedback

axonivy-market · Dec 23, 2024 · 8ab4b1f · 8ab4b1f
1 parent f1f9aee
commit 8ab4b1f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 24 deletions.
diff --git a/marketplace-service/src/main/java/com/axonivy/market/service/impl/ProductServiceImpl.java b/marketplace-service/src/main/java/com/axonivy/market/service/impl/ProductServiceImpl.java
@@ -763,28 +763,19 @@ public boolean syncFirstPublishedDateOfAllProducts() {
   }
 
   private String getCompatibilityRange(String productId) {
-    List<String> versions =
-        versionService.getVersionsForDesigner(productId).stream().map(VersionAndUrlModel::getVersion).toList();
-    if (ObjectUtils.isEmpty(versions)) {
-      return null;
-    }
-
-    if (versions.size() == 1) {
-      return splitVersion(versions.get(0));
-    }
-
-    String currentMaxVersion = versions.get(0);
-    boolean isMoreThan1InMaxVersion = versions.stream()
-        .filter(version -> version.startsWith(
-            currentMaxVersion.substring(0, currentMaxVersion.indexOf(DOT_SEPARATOR)))).toList().size() > 1;
-
-    String maxValue = isMoreThan1InMaxVersion ? splitVersion(currentMaxVersion).concat(PLUS) : splitVersion(
-        currentMaxVersion);
-    String minValue = splitVersion(versions.get(versions.size() - 1));
-
-    return getPrefixOfVersion(minValue).equals(getPrefixOfVersion(maxValue)) ?
-        minValue.concat(PLUS) :
-        minValue.concat(DASH_SEPARATOR).concat(maxValue);
+    return Optional.of(versionService.getVersionsForDesigner(productId))
+        .filter(ObjectUtils::isNotEmpty)
+        .map(versions -> versions.stream().map(VersionAndUrlModel::getVersion).toList())
+        .map(versions -> {
+          if (versions.size() == 1) {
+            return splitVersion(versions.get(0)).concat(PLUS);
+          }
+          String maxValue = splitVersion(versions.get(0)).concat(PLUS);
+          String minValue = splitVersion(versions.get(versions.size() - 1));
+          return getPrefixOfVersion(minValue).equals(getPrefixOfVersion(maxValue)) ?
+              minValue.concat(PLUS) :
+              minValue.concat(DASH_SEPARATOR).concat(maxValue);
+        }).orElse(null);
   }
 
   private String splitVersion(String version) {

diff --git a/...etplace-service/src/test/java/com/axonivy/market/service/impl/ProductServiceImplTest.java b/...etplace-service/src/test/java/com/axonivy/market/service/impl/ProductServiceImplTest.java
@@ -421,13 +421,13 @@ void testGetCompatibilityRangeAfterFetchProductDetail() {
     assertEquals(result.getCompatibilityRange(),"10.0+");
 
     result = productService.fetchProductDetail(MOCK_PRODUCT_ID, true);
-    assertEquals(result.getCompatibilityRange(),"10.0-11.3");
+    assertEquals(result.getCompatibilityRange(),"10.0-11.3+");
 
     result = productService.fetchProductDetail(MOCK_PRODUCT_ID, true);
     assertEquals(result.getCompatibilityRange(),"10.0-11.3+");
 
     result = productService.fetchProductDetail(MOCK_PRODUCT_ID, true);
-    assertEquals(result.getCompatibilityRange(),"10.0-12.0");
+    assertEquals(result.getCompatibilityRange(),"10.0-12.0+");
   }
 
   @Test