Fixes /shells Endpoint Query Param

Author: FriedJannik

basyx.aasrepository/basyx.aasrepository-http/src/test/java/org/eclipse/digitaltwin/basyx/aasrepository/http/AasRepositoryHTTPSuite.java

@@ -192,6 +192,16 @@ public void getAllAasWithIdShort() throws IOException, ParseException {
 		BaSyxHttpTestUtils.assertSameJSONContent(getPaginatedAas1JSONString(), getJSONWithoutCursorInfo(actualJsonFromServer));
 	}
 
+	@Test
+	public void getAllAasWithMultipleAssetIds() throws IOException, ParseException {
+		createMultipleAasOnServer();
+		CloseableHttpResponse retrievalResponse = getAllAasMultipleGlobalAssetIdsParam();
+		assertEquals(HttpStatus.OK.value(), retrievalResponse.getCode());
+
+		String actualJsonFromServer = BaSyxHttpTestUtils.getResponseAsString(retrievalResponse);
+		BaSyxHttpTestUtils.assertSameJSONContent(getEmptyResultJSONString(), getJSONWithoutCursorInfo(actualJsonFromServer));
+	}
+
 	@Test
 	public void deleteAas() throws IOException {
 		createDummyAasOnServer(getAas1JSONString());
@@ -423,6 +433,10 @@ public void deleteNonExistingThumbnail() throws FileNotFoundException, Unsupport
 	private String getPaginatedAas1JSONString() throws FileNotFoundException, IOException {
 		return BaSyxHttpTestUtils.readJSONStringFromClasspath("PaginatedAasSimple_1.json");
 	}
+
+	private String getEmptyResultJSONString() throws FileNotFoundException, IOException {
+		return BaSyxHttpTestUtils.readJSONStringFromClasspath("EmptyResponse.json");
+	}
 
 	private String getJSONWithoutCursorInfo(String response) throws JsonMappingException, JsonProcessingException {
 		return BaSyxHttpTestUtils.removeCursorFromJSON(response);
@@ -489,6 +503,10 @@ protected CloseableHttpResponse getAllAasGlobalAssetIdsParam() throws IOExceptio
 		return BaSyxHttpTestUtils.executeGetOnURL(getURL()+"?assetIds=ew0KIm5hbWUiOiJnbG9iYWxBc3NldElkIiwNCiJ2YWx1ZSI6Imdsb2JhbEFzc2V0SWQiDQp9");
 	}
 
+	protected CloseableHttpResponse getAllAasMultipleGlobalAssetIdsParam() throws IOException {
+		return BaSyxHttpTestUtils.executeGetOnURL(getURL()+"?assetIds=ew0KIm5hbWUiOiJnbG9iYWxBc3NldElkIiwNCiJ2YWx1ZSI6Imdsb2JhbEFzc2V0SWQiDQp9&assetIds=ew0KIm5hbWUiOiJnbG9iYWxBc3NldElkIiwNCiJ2YWx1ZSI6ImR1bW15QWFzQXNzZXRJZCINCn0");
+	}
+
 	protected CloseableHttpResponse getAllAasIdShortParam() throws IOException {
 		return BaSyxHttpTestUtils.executeGetOnURL(getURL()+"?idShort=ExampleMotor");
 	}

basyx.aasrepository/basyx.aasrepository-http/src/test/resources/EmptyResponse.json

@@ -0,0 +1,5 @@
+{
+  "paging_metadata": {},
+  "result": [
+  ]
+}

basyx.aasservice/basyx.aasservice-backend-inmemory/src/main/java/org/eclipse/digitaltwin/basyx/aasservice/backend/InMemoryAasBackend.java

@@ -104,6 +104,9 @@ public Iterable<AssetAdministrationShell> getAllAas(List<SpecificAssetId> assetI
 		List<AssetAdministrationShell> filteredAas = new java.util.ArrayList<>();
 		String globalAssetId = null;
 		try {
+			if(assetIds.stream().filter(assetId -> assetId.getName().equals("globalAssetId")).count() > 1){
+				return filteredAas;
+			}
 			globalAssetId = assetIds.stream().filter(assetId -> assetId.getName().equals("globalAssetId")).findFirst().get().getValue();
 			assetIds = assetIds.stream().filter(assetId -> !assetId.getName().equals("globalAssetId")).collect(Collectors.toList());
 		} catch (Exception e) {}

basyx.aasservice/basyx.aasservice-backend-mongodb/src/main/java/org/eclipse/digitaltwin/basyx/aasservice/backend/MongoDBAasOperations.java

@@ -176,12 +176,10 @@ public Iterable<AssetAdministrationShell> getAllAas(List<SpecificAssetId> assetI
         Query query = new Query();
         Criteria criteria = new Criteria();
 
-        String globalAssetId = null;
-        try {
-            globalAssetId = assetIds.stream().filter(assetId -> assetId.getName().equals("globalAssetId")).findFirst().get().getValue();
-            assetIds = assetIds.stream().filter(assetId -> !assetId.getName().equals("globalAssetId")).collect(Collectors.toList());
-        } catch (Exception ignored) {}
-
+        List<String> globalAssetId = assetIds.stream()
+                .filter(assetId -> "globalAssetId".equals(assetId.getName()))
+                .map(SpecificAssetId::getValue)
+                .collect(Collectors.toList());
         if (assetIds != null && !assetIds.isEmpty()) {
             List<Criteria> assetIdCriteria = new ArrayList<>();
             for (SpecificAssetId assetId : assetIds) {
@@ -195,8 +193,8 @@ public Iterable<AssetAdministrationShell> getAllAas(List<SpecificAssetId> assetI
         }
         query.addCriteria(criteria);
 
-        if (globalAssetId != null && !globalAssetId.isEmpty()) {
-            query.addCriteria(Criteria.where("assetInformation.globalAssetId").is(globalAssetId));
+        for (String id : globalAssetId) {
+            query.addCriteria(Criteria.where("assetInformation.globalAssetId").is(id));
         }
 
         return mongoOperations.find(query, AssetAdministrationShell.class, collectionName);