Fixes MongoDB Implementation

Signed-off-by: FriedJannik <[email protected]>

Author: FriedJannik

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

@@ -115,12 +115,10 @@ public void addSubmodelReference(@NonNull String aasId, @NonNull Reference submo
         String newKeyValue = submodelReference.getKeys().get(0).getValue();
         Query query = new Query(new Criteria().andOperator(Criteria.where("_id").is(aasId), Criteria.where(KEY_SMREF).not().elemMatch(Criteria.where("keys.0.value").is(newKeyValue))));
         Update update = new Update().push(KEY_SMREF, submodelReference);
-        UpdateResult result = mongoOperations.updateFirst(query, update, collectionName);
-
-        if (result.getMatchedCount() != 0)
+        UpdateResult result = mongoOperations.updateFirst(query, update, collectionName);        if (result.getMatchedCount() != 0)
             return;
 
-        if (existsAas(aasId))
+        if (!existsAas(aasId))
             throw new ElementDoesNotExistException(aasId);
 
         throw new CollidingSubmodelReferenceException(newKeyValue);
@@ -130,30 +128,25 @@ public void addSubmodelReference(@NonNull String aasId, @NonNull Reference submo
     public void removeSubmodelReference(@NonNull String aasId, @NonNull String submodelId) throws ElementDoesNotExistException {
         Query query = new Query(Criteria.where("_id").is(aasId));
         Update update = new Update().pull(KEY_SMREF, Query.query(Criteria.where("keys.value").is(submodelId)).getQueryObject());
-        UpdateResult result = mongoOperations.updateFirst(query, update, collectionName);
-
-        if (result.getModifiedCount() != 0)
+        UpdateResult result = mongoOperations.updateFirst(query, update, collectionName);        if (result.getModifiedCount() != 0)
             return;
 
-        if (existsAas(aasId))
+        if (!existsAas(aasId))
             throw new ElementDoesNotExistException(aasId);
 
         throw new ElementDoesNotExistException(submodelId);
-    }
-
-    @Override
+    }    @Override
     public void setAssetInformation(@NonNull String aasId, @NonNull AssetInformation aasInfo) {
         Query query = new Query(Criteria.where("_id").is(aasId));
 
         Update update = new Update().set(KEY_ASSETINFORMATION, aasInfo);
 
         UpdateResult result = mongoOperations.updateFirst(query, update, collectionName);
 
-        // Second check for the case where the update was not performed because the
-        // aasInfo is the
-        // same as the existing one
-        if (result.getModifiedCount() == 0 && existsAas(aasId))
+        // Check if the AAS exists when no modification was made
+        if (result.getModifiedCount() == 0 && !existsAas(aasId)) {
             throw new ElementDoesNotExistException(aasId);
+        }
     }
 
     @Override
@@ -169,39 +162,52 @@ public AssetInformation getAssetInformation(@NonNull String aasId) {
             throw new ElementDoesNotExistException(aasId);
 
         return aasInfo;
-    }
-
-    @Override
+    }    @Override
     public Iterable<AssetAdministrationShell> getAllAas(List<SpecificAssetId> assetIds, String idShort) {
         Query query = new Query();
-        Criteria criteria = new Criteria();
+        List<Criteria> allCriteria = new ArrayList<>();
 
-        List<String> globalAssetId = assetIds.stream()
-                .filter(assetId -> "globalAssetId".equals(assetId.getName()))
-                .map(SpecificAssetId::getValue)
-                .collect(Collectors.toList());
+        // Handle asset ID filtering
         if (assetIds != null && !assetIds.isEmpty()) {
             List<Criteria> assetIdCriteria = new ArrayList<>();
+            
             for (SpecificAssetId assetId : assetIds) {
-                assetIdCriteria.add(Criteria.where("assetInformation.specificAssetIds.name").is(assetId.getName()));
-                assetIdCriteria.add(Criteria.where("assetInformation.specificAssetIds.value").is(assetId.getValue()));
+                if ("globalAssetId".equals(assetId.getName())) {
+                    // Handle globalAssetId
+                    assetIdCriteria.add(Criteria.where("assetInformation.globalAssetId").is(assetId.getValue()));
+                } else {
+                    // Handle specific asset IDs with elemMatch for proper array matching
+                    assetIdCriteria.add(Criteria.where("assetInformation.specificAssetIds").elemMatch(
+                        Criteria.where("name").is(assetId.getName()).and("value").is(assetId.getValue())
+                    ));
+                }
+            }
+            
+            // If we have multiple asset IDs, any one of them should match (OR operation)
+            if (assetIdCriteria.size() == 1) {
+                allCriteria.add(assetIdCriteria.get(0));
+            } else if (assetIdCriteria.size() > 1) {
+                allCriteria.add(new Criteria().orOperator(assetIdCriteria.toArray(new Criteria[0])));
             }
-            criteria.andOperator(assetIdCriteria);
         }
+        
+        // Handle idShort filtering
         if (idShort != null && !idShort.isEmpty()) {
-            criteria.and("idShort").is(idShort);
+            allCriteria.add(Criteria.where("idShort").is(idShort));
         }
-        query.addCriteria(criteria);
-
-        for (String id : globalAssetId) {
-            query.addCriteria(Criteria.where("assetInformation.globalAssetId").is(id));
+        
+        // Combine all criteria with AND operation
+        if (!allCriteria.isEmpty()) {
+            if (allCriteria.size() == 1) {
+                query.addCriteria(allCriteria.get(0));
+            } else {
+                query.addCriteria(new Criteria().andOperator(allCriteria.toArray(new Criteria[0])));
+            }
         }
 
         return mongoOperations.find(query, AssetAdministrationShell.class, collectionName);
-    }
-
-    private boolean existsAas(String aasId) {
-        return !mongoOperations.exists(new Query(Criteria.where("_id").is(aasId)), AssetAdministrationShell.class, collectionName);
+    }    private boolean existsAas(String aasId) {
+        return mongoOperations.exists(new Query(Criteria.where("_id").is(aasId)), AssetAdministrationShell.class, collectionName);
     }
 
     private static String extractSubmodelId(Reference reference) {