Merge pull request #123 from starwit/bugfix/ab#1292-Correct-fill-demo…

…-data-shell-script bugfix: fill demo data
starwit · Nov 29, 2024 · ac43cec · ac43cec
2 parents 6fa3467 + afd5495
commit ac43cec
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 4 deletions.
diff --git a/experiment-setup/fillDatabaseScript.sh b/experiment-setup/fillDatabaseScript.sh
@@ -20,6 +20,7 @@ function main {
         echo "Param for interval exists " $3
         INTERVAL=$3
     fi
+    send_json
 }
 
 send_json() {

diff --git a/persistence/src/main/java/de/starwit/persistence/entity/DecisionEntity.java b/persistence/src/main/java/de/starwit/persistence/entity/DecisionEntity.java
@@ -131,6 +131,7 @@ public void addToAction(ActionEntity action) {
             this.action = new HashSet<>();
         }
         this.action.add(action);
+        this.action.forEach(a -> a.setDecision(this));
     }
 
 }
diff --git a/service/src/main/java/de/starwit/service/impl/DecisionService.java b/service/src/main/java/de/starwit/service/impl/DecisionService.java
@@ -14,10 +14,10 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import de.starwit.persistence.entity.DecisionState;
 import de.starwit.persistence.entity.ActionEntity;
 import de.starwit.persistence.entity.ActionTypeEntity;
 import de.starwit.persistence.entity.DecisionEntity;
+import de.starwit.persistence.entity.DecisionState;
 import de.starwit.persistence.entity.DecisionTypeEntity;
 import de.starwit.persistence.repository.ActionTypeRepository;
 import de.starwit.persistence.repository.DecisionRepository;
@@ -31,6 +31,7 @@
 import io.minio.errors.InvalidResponseException;
 import io.minio.errors.ServerException;
 import io.minio.errors.XmlParserException;
+import jakarta.persistence.EntityManager;
 
 /**
  * 
@@ -52,6 +53,8 @@ public class DecisionService implements ServiceInterface<DecisionEntity, Decisio
     @Value("${minio.endpoint:http://localhost:9000}")
     private String endpoint;
 
+    private final EntityManager entityManager;
+
     @Autowired
     private DecisionRepository decisionRepository;
 
@@ -66,6 +69,10 @@ public DecisionRepository getRepository() {
         return decisionRepository;
     }
 
+    public DecisionService(EntityManager entityManager) {
+        this.entityManager = entityManager;
+    }
+
     public DecisionEntity createNewDecisionBasedOnIncidentMessage(IncidentMessage decisionMessage) {
         DecisionEntity entity = new DecisionEntity();
         entity.setMediaUrl(decisionMessage.getMediaUrl());
@@ -92,7 +99,9 @@ public DecisionEntity createDecisionEntitywithAction(DecisionEntity entity) {
                 }
             }
         }
-        return saveOrUpdate(entity);
+        entity = saveOrUpdate(entity);
+        entityManager.detach(entity);
+        return entity;
     }
 
     public byte[] getFileFromMinio(String bucketName, String objectName)

diff --git a/service/src/test/java/de/starwit/service/DecisionServiceTest.java b/service/src/test/java/de/starwit/service/DecisionServiceTest.java
@@ -57,11 +57,17 @@ void testCreateTypes() {
         actionType.setExecutionPolicy(ExecutionPolicies.AUTOMATIC);
         actionType = actionTypeRepository.save(actionType);
 
+        ActionTypeEntity actionType2 = new ActionTypeEntity();
+        actionType2.setDescription("Notify police");
+        actionType2.setName("notify police");
+        actionType2.setExecutionPolicy(ExecutionPolicies.WITHCHECK);
+        actionType2 = actionTypeRepository.save(actionType2);
+
         Set<ActionTypeEntity> actionTypes = new HashSet<>();
         defaultDecisionType.setActionType(actionTypes);
         actionTypes.add(actionType);
+        actionTypes.add(actionType2);
         defaultDecisionType = decisionTypeService.saveOrUpdate(defaultDecisionType);
-
     }
 
     @Test
@@ -85,7 +91,32 @@ void testCreateNewDecisionWithActionsMessage() {
                 .atZone(ZoneId.systemDefault());
         assertTrue(expectedDateTime.isEqual(result.getAcquisitionTime()));
         assertEquals(expectedDateTime, result.getAcquisitionTime());
-        assertEquals(1, result.getAction().size());
+        assertEquals(2, result.getAction().size());
+        ActionEntity action = result.getAction().iterator().next();
+        assertTrue(expectedDateTime.isEqual(action.getCreationTime()));
+    }
+
+    @Test
+    @Commit
+    @Order(3)
+    void testCreateNewDecisionWithActions() {
+
+        // prepare
+        long timestamp = 1633046400000L;
+        DecisionEntity decision = new DecisionEntity();
+        ZonedDateTime expectedDateTime = Instant.ofEpochMilli(timestamp)
+                .atZone(ZoneId.systemDefault());
+        decision.setMediaUrl("http://testurl.com/media");
+        decision.setAcquisitionTime(expectedDateTime);
+        decision.setDecisionType(decisionTypeService.findAll().iterator().next());
+
+        // Call Methode
+        DecisionEntity result = decisionService
+                .createDecisionEntitywithAction(decision);
+
+        // Assert
+        assertEquals("http://testurl.com/media", result.getMediaUrl());
+        assertEquals(2, result.getAction().size());
         ActionEntity action = result.getAction().iterator().next();
         assertTrue(expectedDateTime.isEqual(action.getCreationTime()));
     }