Merge pull request #7 from IBA-Group-IT/feature-4

Feature 4

Author: vadzim-kazak

docker-compose.yml

@@ -39,7 +39,7 @@ services:
       - 61613:61613
   services:
     build: ./services
-    image: ibagroup/iot-data-simulator-services:1.0.1
+    image: ibagroup/iot-data-simulator-services:1.1.0
     container_name: iot-ds-services
     depends_on:
       - mongodb
@@ -64,7 +64,7 @@ services:
       - 8083:8083
   ui:
     build: ./ui
-    image: ibagroup/iot-data-simulator-ui:1.0.1
+    image: ibagroup/iot-data-simulator-ui:1.1.0
     container_name: iot-ds-ui
     depends_on:
       - services
@@ -79,7 +79,7 @@ services:
     command: ["npm", "start"]
   data-sender:
     build: ./data-sender
-    image: ibagroup/iot-data-simulator-sender:1.0.1
+    image: ibagroup/iot-data-simulator-sender:1.1.0
     container_name: iot-ds-data-sender
     depends_on:
       - rabbitmq

services/src/main/java/com/iba/iot/datasimulator/session/factory/session/SessionFactoryImpl.java

@@ -47,6 +47,7 @@ public Session buildFromCreateUpdateRequest(SessionCreateUpdateRequest sessionCr
         session.setTimer(sessionCreateUpdateRequest.getTimer());
         session.setDatasetFilter(sessionCreateUpdateRequest.getDatasetFilter());
         session.setTicksNumber(sessionCreateUpdateRequest.getTicksNumber());
+        session.setReplayLooped(sessionCreateUpdateRequest.isReplayLooped());
 
         String definitionId = sessionCreateUpdateRequest.getDataDefinitionId();
         if (StringUtils.isNotBlank(definitionId)) {

services/src/main/java/com/iba/iot/datasimulator/session/model/Session.java

@@ -64,6 +64,9 @@ public class Session implements ModelEntity {
     @JsonView(SessionViews.Short.class)
     private int ticksNumber;
 
+    @JsonView(SessionViews.Short.class)
+    private boolean isReplayLooped;
+
     @JsonView(SessionViews.Short.class)
     @Embedded
     @Valid

services/src/main/java/com/iba/iot/datasimulator/session/model/SessionCreateUpdateRequest.java

@@ -1,5 +1,6 @@
 package com.iba.iot.datasimulator.session.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.iba.iot.datasimulator.session.model.active.filter.DatasetFilter;
 import com.iba.iot.datasimulator.session.model.active.generator.Generator;
 import com.iba.iot.datasimulator.session.model.active.injector.DeviceInjector;
@@ -29,6 +30,9 @@ public class SessionCreateUpdateRequest {
     /** **/
     private int ticksNumber;
 
+    @JsonProperty(value="isReplayLooped")
+    private boolean isReplayLooped;
+
     @Valid
     private DatasetFilter datasetFilter;
 

services/src/main/java/com/iba/iot/datasimulator/session/model/active/ActiveSessionState.java

@@ -11,6 +11,8 @@ public enum ActiveSessionState {
 
     COMPLETED("completed"),
 
+    STOPPED("stopped"),
+
     FAILED("failed");
 
     /** **/

services/src/main/java/com/iba/iot/datasimulator/session/model/active/command/ActiveSessionManagementCommand.java

@@ -1,12 +1,16 @@
 package com.iba.iot.datasimulator.session.model.active.command;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 import javax.validation.constraints.NotNull;
 
 @Data
 @ToString
+@AllArgsConstructor
+@NoArgsConstructor
 public class ActiveSessionManagementCommand {
 
     @NotNull

services/src/main/java/com/iba/iot/datasimulator/session/service/active/entity/ActiveSession.java

@@ -2,17 +2,52 @@
 
 import com.iba.iot.datasimulator.session.model.active.ActiveSessionStatus;
 
+/**
+ *
+ */
 public interface ActiveSession {
 
+    /**
+     *
+     */
     void start();
 
+    /**
+     *
+     */
     void pause();
 
+    /**
+     *
+     */
     void resume();
 
+    /**
+     *
+     */
     void stop();
 
+    /**
+     *
+     * @param error
+     */
     void registerError(String error);
 
+    /**
+     *
+     * @return
+     */
     ActiveSessionStatus getStatus();
+
+    /**
+     *
+     * @return
+     */
+    boolean isReplayLooped();
+
+    /**
+     *
+     * @return
+     */
+    boolean isStopped();
 }

services/src/main/java/com/iba/iot/datasimulator/session/service/active/entity/ActiveSessionEntity.java

@@ -61,6 +61,9 @@ public class ActiveSessionEntity implements ActiveSession {
     /** **/
     private Collection<String> errors = new ArrayList<>();
 
+    /** **/
+    private boolean isStopped;
+
     /**
      *
      * @param session
@@ -114,6 +117,7 @@ public void resume() {
     public void stop() {
 
         logger.info(">>> Session {} has been stopped", sessionId);
+        isStopped = true;
         dataProducer.stop();
     }
 
@@ -222,4 +226,14 @@ private void sendSessionFailedPayload() {
     private void sendSessionCompletedPayload() {
         payloadSender.send(sessionId, new ActiveSessionPayload(ActiveSessionState.COMPLETED), session.getTargetSystem());
     }
+
+    @Override
+    public boolean isReplayLooped() {
+        return session.isReplayLooped();
+    }
+
+    @Override
+    public boolean isStopped() {
+        return isStopped;
+    }
 }

services/src/main/java/com/iba/iot/datasimulator/session/service/active/entity/DummyActiveSession.java

@@ -141,4 +141,14 @@ private void sendAnalyticsMessage(ActiveSessionAnalyticTag tag, String messagePo
 
         messagingTemplate.convertAndSend(StompUtil.getSessionAnalyticsTopic(sessionId), activeSessionAnalyticsMessage);
     }
+
+    @Override
+    public boolean isReplayLooped() {
+        return false;
+    }
+
+    @Override
+    public boolean isStopped() {
+        return false;
+    }
 }

services/src/main/java/com/iba/iot/datasimulator/session/service/active/processing/timer/IntervalTimerProcessor.java

@@ -37,7 +37,7 @@ public IntervalTimerProcessor(Timer timer) {
     public long getWaitInterval(String previousEntry, String nextEntry) {
 
         if (StringUtils.isEmpty(previousEntry) && StringUtils.isNotEmpty(nextEntry)) {
-            return 0;
+            return 500;
         }
 
         Long value = this.timer.getValue();