Final fix

Author: FriedJannik

basyx.aasregistry/basyx.aasregistry-service-mongodb-storage/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/storage/mongodb/MongoDbAasRegistryStorage.java

@@ -90,24 +90,6 @@ public CursorResult<List<AssetAdministrationShellDescriptor>> getAllAasDescripto
 		AggregationResults<AssetAdministrationShellDescriptor> results = template.aggregate(Aggregation.newAggregation(allAggregations),  collectionName, AssetAdministrationShellDescriptor.class);
 		List<AssetAdministrationShellDescriptor> foundDescriptors = results.getMappedResults();
 		String cursor = resolveCursor(pRequest, foundDescriptors, AssetAdministrationShellDescriptor::getId);
-
-		for(int i = 0; i<foundDescriptors.size(); i++) {
-			AssetAdministrationShellDescriptor desc = foundDescriptors.get(i);
-				if (desc.getSpecificAssetIds() != null || !desc.getSpecificAssetIds().isEmpty()) {
-					List<SpecificAssetId> newIdsWithoutExternalSubjectID = new ArrayList<>();
-					for(SpecificAssetId sId : desc.getSpecificAssetIds()) {
-						SpecificAssetId newId = new SpecificAssetId(sId.getName(), sId.getValue());
-						if (sId.getSupplementalSemanticIds() != null) {
-							newId.setSupplementalSemanticIds(sId.getSupplementalSemanticIds());
-						}
-						if (sId.getSemanticId() != null) {
-							newId.setSemanticId(sId.getSemanticId());
-						}
-						newIdsWithoutExternalSubjectID.add(newId);
-					}
-					desc.setSpecificAssetIds(newIdsWithoutExternalSubjectID);
-				}
-		}
 		return new CursorResult<>(cursor, foundDescriptors);
 	}
 
@@ -166,22 +148,6 @@ public AssetAdministrationShellDescriptor getAasDescriptor(@NonNull String aasDe
 		if (descriptor == null) {
 			throw new AasDescriptorNotFoundException(aasDescriptorId);
 		}
-		if (descriptor.getSpecificAssetIds() != null || !descriptor.getSpecificAssetIds().isEmpty()) {
-			List<SpecificAssetId> newIdsWithoutExternalSubjectID = new ArrayList<>();
-			for(SpecificAssetId sId : descriptor.getSpecificAssetIds()) {
-				SpecificAssetId newId = new SpecificAssetId(sId.getName(), sId.getValue());
-				if (sId.getSupplementalSemanticIds() != null) {
-					newId.setSupplementalSemanticIds(sId.getSupplementalSemanticIds());
-				}
-				if (sId.getSemanticId() != null) {
-					newId.setSemanticId(sId.getSemanticId());
-				}
-				newIdsWithoutExternalSubjectID.add(newId);
-			}
-			descriptor.setSpecificAssetIds(newIdsWithoutExternalSubjectID);
-		}
-
-
 		return descriptor;
 	}
 

basyx.aasregistry/basyx.aasregistry-service/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/api/BasyxRegistryApiDelegate.java

@@ -26,13 +26,10 @@
 
 import jakarta.validation.Valid;
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.List;
-import org.eclipse.digitaltwin.basyx.aasregistry.model.AssetAdministrationShellDescriptor;
-import org.eclipse.digitaltwin.basyx.aasregistry.model.AssetKind;
-import org.eclipse.digitaltwin.basyx.aasregistry.model.GetAssetAdministrationShellDescriptorsResult;
-import org.eclipse.digitaltwin.basyx.aasregistry.model.GetSubmodelDescriptorsResult;
-import org.eclipse.digitaltwin.basyx.aasregistry.model.PagedResultPagingMetadata;
-import org.eclipse.digitaltwin.basyx.aasregistry.model.SubmodelDescriptor;
+
+import org.eclipse.digitaltwin.basyx.aasregistry.model.*;
 import org.eclipse.digitaltwin.basyx.aasregistry.service.events.RegistryEventSink;
 import org.eclipse.digitaltwin.basyx.aasregistry.service.storage.AasRegistryStorage;
 import org.eclipse.digitaltwin.basyx.aasregistry.service.storage.DescriptorFilter;
@@ -76,7 +73,23 @@ public ResponseEntity<GetAssetAdministrationShellDescriptorsResult> getAllAssetA
 		GetAssetAdministrationShellDescriptorsResult result = new GetAssetAdministrationShellDescriptorsResult();
 		result.setPagingMetadata(resolvePagingMeta(allDescriptors));
 		result.setResult(allDescriptors.getResult());
-
+		for(int i = 0; i<allDescriptors.getResult().size(); i++) {
+			AssetAdministrationShellDescriptor desc = allDescriptors.getResult().get(i);
+			if (desc.getSpecificAssetIds() != null || !desc.getSpecificAssetIds().isEmpty()) {
+				List<SpecificAssetId> newIdsWithoutExternalSubjectID = new ArrayList<>();
+				for(SpecificAssetId sId : desc.getSpecificAssetIds()) {
+					SpecificAssetId newId = new SpecificAssetId(sId.getName(), sId.getValue());
+					if (sId.getSupplementalSemanticIds() != null) {
+						newId.setSupplementalSemanticIds(sId.getSupplementalSemanticIds());
+					}
+					if (sId.getSemanticId() != null) {
+						newId.setSemanticId(sId.getSemanticId());
+					}
+					newIdsWithoutExternalSubjectID.add(newId);
+				}
+				desc.setSpecificAssetIds(newIdsWithoutExternalSubjectID);
+			}
+		}
 		return new ResponseEntity<>(result, HttpStatus.OK);
 	}
 
@@ -94,8 +107,23 @@ public ResponseEntity<GetSubmodelDescriptorsResult> getAllSubmodelDescriptorsThr
 
 	@Override
 	public ResponseEntity<AssetAdministrationShellDescriptor> getAssetAdministrationShellDescriptorById(String aasIdentifier) {
-		AssetAdministrationShellDescriptor result = storage.getAasDescriptor(aasIdentifier);
-		return new ResponseEntity<>(result, HttpStatus.OK);
+		AssetAdministrationShellDescriptor desc = storage.getAasDescriptor(aasIdentifier);
+
+		if (desc.getSpecificAssetIds() != null || !desc.getSpecificAssetIds().isEmpty()) {
+			List<SpecificAssetId> newIdsWithoutExternalSubjectID = new ArrayList<>();
+			for(SpecificAssetId sId : desc.getSpecificAssetIds()) {
+				SpecificAssetId newId = new SpecificAssetId(sId.getName(), sId.getValue());
+				if (sId.getSupplementalSemanticIds() != null) {
+					newId.setSupplementalSemanticIds(sId.getSupplementalSemanticIds());
+				}
+				if (sId.getSemanticId() != null) {
+					newId.setSemanticId(sId.getSemanticId());
+				}
+				newIdsWithoutExternalSubjectID.add(newId);
+			}
+			desc.setSpecificAssetIds(newIdsWithoutExternalSubjectID);
+		}
+		return new ResponseEntity<>(desc, HttpStatus.OK);
 	}
 
 	@Override