Fixes wrong setting of submodel references

- See #18 for original commit

Co-authored-by: Daniel Espen <[email protected]>
Signed-off-by: Frank Schnicke <[email protected]>

Author: FrankSchnicke

basyx.components/basyx.components.docker/basyx.components.AASServer/src/main/java/org/eclipse/basyx/components/aas/mongodb/MongoDBAASAPI.java

@@ -157,6 +157,8 @@ public void removeSubmodel(String id) {
 				break;
 			}
 		}
+		aas.setSubmodelReferences(smReferences);
+
 		// Update db entry
 		mongoOps.findAndReplace(hasId, aas, collection);
 	}

basyx.components/basyx.components.docker/basyx.components.AASServer/src/test/java/org/eclipse/basyx/regression/AASServer/TestMongoDBServer.java

@@ -12,6 +12,7 @@
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Map;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -21,13 +22,15 @@
 import org.eclipse.basyx.components.aas.AASServerComponent;
 import org.eclipse.basyx.components.aas.configuration.AASServerBackend;
 import org.eclipse.basyx.components.aas.configuration.BaSyxAASServerConfiguration;
+import org.eclipse.basyx.components.aas.mongodb.MongoDBAASAPI;
 import org.eclipse.basyx.components.aas.mongodb.MongoDBAASAggregator;
 import org.eclipse.basyx.components.aas.mongodb.MongoDBSubmodelAPI;
 import org.eclipse.basyx.components.configuration.BaSyxContextConfiguration;
 import org.eclipse.basyx.components.configuration.BaSyxMongoDBConfiguration;
 import org.eclipse.basyx.submodel.metamodel.api.ISubmodel;
 import org.eclipse.basyx.submodel.metamodel.api.identifier.IIdentifier;
 import org.eclipse.basyx.submodel.metamodel.api.identifier.IdentifierType;
+import org.eclipse.basyx.submodel.metamodel.api.reference.IReference;
 import org.eclipse.basyx.submodel.metamodel.map.Submodel;
 import org.eclipse.basyx.submodel.metamodel.map.identifier.Identifier;
 import org.eclipse.basyx.vab.modelprovider.api.IModelProvider;
@@ -82,10 +85,8 @@ public void testAddSubmodelPersistency() throws Exception {
 		createAssetAdministrationShell();
 		createSubmodel();
 
-		MongoDBSubmodelAPI api = new MongoDBSubmodelAPI(mongoDBConfig, SM_IDENTIFICATION.getId());
-		ISubmodel persistentSM = api.getSubmodel();
-
-		assertEquals(SM_IDSHORT, persistentSM.getIdShort());
+		checkIfSubmodelHasBeenPersisted(SM_IDENTIFICATION);
+		checkSubmodelReferencesSize(1);
 	}
 
 	@Test
@@ -99,6 +100,27 @@ public void testAggregatorPersistency() throws Exception {
 		assertEquals(SM_IDSHORT, persistentSM.getIdShort());
 	}
 
+	@Test
+	public void testDeleteSubmodelPersistency() {
+		createAssetAdministrationShell();
+		createSubmodel();
+
+		deleteSubmodel();
+		checkSubmodelReferencesSize(0);
+	}
+
+	private void checkIfSubmodelHasBeenPersisted(Identifier smIdentification) {
+		MongoDBSubmodelAPI smAPI = new MongoDBSubmodelAPI(mongoDBConfig, smIdentification.getId());
+		ISubmodel persistentSM = smAPI.getSubmodel();
+		assertEquals(SM_IDSHORT, persistentSM.getIdShort());
+	}
+
+	private void checkSubmodelReferencesSize(int expectedSize) {
+		MongoDBAASAPI aasAPI = new MongoDBAASAPI(mongoDBConfig, aasId);
+		Collection<IReference> submodelReferences = aasAPI.getAAS().getSubmodelReferences();
+		assertEquals(expectedSize, submodelReferences.size());
+	}
+
 	@SuppressWarnings("unchecked")
 	private ISubmodel getSubmodelFromAggregator(MongoDBAASAggregator aggregator) {
 		IModelProvider aasProvider = aggregator.getAASProvider(new ModelUrn(aasId));
@@ -112,6 +134,10 @@ private void createSubmodel() {
 		manager.createSubmodel(new ModelUrn(aasId), sm);
 	}
 
+	private void deleteSubmodel() {
+		manager.deleteSubmodel(new ModelUrn(aasId), SM_IDENTIFICATION);
+	}
+
 	private void createAssetAdministrationShell() {
 		AssetAdministrationShell shell = new AssetAdministrationShell();
 		IIdentifier identifier = new ModelUrn(aasId);