Change sandboxIds to String, SankeySimulatorFacade and InstanceSimulatorService not changed

src/main/java/cz/muni/ics/kypo/training/adaptive/domain/simulator/OverallPhaseStatistics.java

@@ -24,7 +24,7 @@ public class OverallPhaseStatistics {
     private Long taskId;
     @JsonProperty()
     @ApiModelProperty(value = "ID of a sandbox", example = "1")
-    private Long sandboxId;
+    private String sandboxId;
     @JsonProperty()
     @ApiModelProperty(value = "Order of a phase", example = "0")
     private Long phaseOrder;

src/main/java/cz/muni/ics/kypo/training/adaptive/domain/simulator/PhaseEvent.java

@@ -31,7 +31,7 @@ public class PhaseEvent {
     private Long phaseOrder;
     @ApiModelProperty(value = "Identifier of sandbox associated with trainee in phase.", required = true, example = "2")
     @NotNull(message = "{phaseEvent.sandboxId.NotNull.message}")
-    private Long sandboxId;
+    private String sandboxId;
     private Long trainingInstanceId;
     private Long userRefId;
     private Long trainingDefinitionId;

src/main/java/cz/muni/ics/kypo/training/adaptive/domain/training/TrainingRun.java

@@ -129,14 +129,14 @@ public class TrainingRun implements Serializable {
     @JoinColumn(name = "training_instance_id")
     private TrainingInstance trainingInstance;
     @Column(name = "sandbox_instance_ref_id")
-    private Long sandboxInstanceRefId;
+    private String sandboxInstanceRefId;
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id", nullable = false)
     private User participantRef;
     @Column(name = "phase_answered")
     private boolean phaseAnswered;
     @Column(name = "previous_sandbox_instance_ref_id")
-    private Long previousSandboxInstanceRefId;
+    private String previousSandboxInstanceRefId;
     @ElementCollection(targetClass = SolutionInfo.class, fetch = FetchType.LAZY)
     @CollectionTable(name = "solution_info", joinColumns = @JoinColumn(name = "training_run_id"))
     private Set<SolutionInfo> solutionInfoList = new HashSet<>();
@@ -267,7 +267,7 @@ public class TrainingRun implements Serializable {
      *
      * @return the sandbox instance ref id
      */
-    public Long getSandboxInstanceRefId() {
+    public String getSandboxInstanceRefId() {
         return sandboxInstanceRefId;
     }
 
@@ -276,7 +276,7 @@ public class TrainingRun implements Serializable {
      *
      * @param sandboxInstanceRefId the sandbox instance ref id
      */
-    public void setSandboxInstanceRefId(Long sandboxInstanceRefId) {
+    public void setSandboxInstanceRefId(String sandboxInstanceRefId) {
         this.sandboxInstanceRefId = sandboxInstanceRefId;
     }
 
@@ -357,7 +357,7 @@ public class TrainingRun implements Serializable {
      *
      * @return the id of previous sandbox instance ref
      */
-    public Long getPreviousSandboxInstanceRefId() {
+    public String getPreviousSandboxInstanceRefId() {
         return previousSandboxInstanceRefId;
     }
 
@@ -366,7 +366,7 @@ public class TrainingRun implements Serializable {
      *
      * @param previousSandboxInstanceRefId the id of previous sandbox instance ref
      */
-    public void setPreviousSandboxInstanceRefId(Long previousSandboxInstanceRefId) {
+    public void setPreviousSandboxInstanceRefId(String previousSandboxInstanceRefId) {
         this.previousSandboxInstanceRefId = previousSandboxInstanceRefId;
     }
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AuditInfoDTO.java

@@ -15,7 +15,7 @@ public class AuditInfoDTO {
     @ApiModelProperty(value = "Main identifier of the user in user managements service.", example = "1")
     private long userRefId;
     @ApiModelProperty(value = "Main identifier of the sandbox.", example = "1")
-    private long sandboxId;
+    private String sandboxId;
     @ApiModelProperty(value = "Main identifier of the pool.", example = "1")
     private long poolId;
     @ApiModelProperty(value = "Main identifier of the training run.", example = "1")
@@ -58,7 +58,7 @@ public class AuditInfoDTO {
      *
      * @return the sandbox id
      */
-    public long getSandboxId() {
+    public String getSandboxId() {
         return sandboxId;
     }
 
@@ -67,7 +67,7 @@ public class AuditInfoDTO {
      *
      * @param sandboxId the sandbox id
      */
-    public void setSandboxId(long sandboxId) {
+    public void setSandboxId(String sandboxId) {
         this.sandboxId = sandboxId;
     }
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/responses/SandboxInfo.java

@@ -10,17 +10,17 @@ import javax.validation.constraints.NotNull;
 public class SandboxInfo {
 
     @NotNull(message = "{sandbox.id.NotNull.message}")
-    private Long id;
+    private String id;
     @JsonProperty(value = "lock_id")
     private Integer lockId;
     @JsonProperty(value = "allocation_unit_id")
     private Integer allocationUnitId;
 
-    public Long getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Long id) {
+    public void setId(String id) {
         this.id = id;
     }
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/trainingrun/AccessTrainingRunDTO.java

@@ -24,7 +24,7 @@ public class AccessTrainingRunDTO {
     @ApiModelProperty(value = "Sign if stepper bar should be displayed.", example = "false")
     private boolean showStepperBar;
     @ApiModelProperty(value = "Main identifier of sandbox which is assigned to training run.", example = "2")
-    private Long sandboxInstanceRefId;
+    private String sandboxInstanceRefId;
     @ApiModelProperty(value = "Current phase in the training run.")
     private AbstractPhaseDTO currentPhase;
     @ApiModelProperty(value = "Information about all phase in training instance.")
@@ -86,7 +86,7 @@ public class AccessTrainingRunDTO {
      *
      * @return the sandbox instance id
      */
-    public Long getSandboxInstanceRefId() {
+    public String getSandboxInstanceRefId() {
         return sandboxInstanceRefId;
     }
 
@@ -95,7 +95,7 @@ public class AccessTrainingRunDTO {
      *
      * @param sandboxInstanceRefId the sandbox instance id
      */
-    public void setSandboxInstanceRefId(Long sandboxInstanceRefId) {
+    public void setSandboxInstanceRefId(String sandboxInstanceRefId) {
         this.sandboxInstanceRefId = sandboxInstanceRefId;
     }
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/trainingrun/TrainingRunByIdDTO.java

@@ -29,7 +29,7 @@ public class TrainingRunByIdDTO {
     @ApiModelProperty(value = "Current state of training run.", example = "ALLOCATED")
     private TRState state;
     @ApiModelProperty(value = "Reference to the received sandbox.")
-    private Long sandboxInstanceRefId;
+    private String sandboxInstanceRefId;
     @ApiModelProperty(value = "Reference to participant of training run.")
     private UserRefDTO participantRef;
     @ApiModelProperty(value = "Id of associated training definition")
@@ -117,7 +117,7 @@ public class TrainingRunByIdDTO {
      *
      * @return the sandbox instance id
      */
-    public Long getSandboxInstanceRefId() {
+    public String getSandboxInstanceRefId() {
         return sandboxInstanceRefId;
     }
 
@@ -126,7 +126,7 @@ public class TrainingRunByIdDTO {
      *
      * @param sandboxInstanceRefId the sandbox instance id
      */
-    public void setSandboxInstanceRefId(Long sandboxInstanceRefId) {
+    public void setSandboxInstanceRefId(String sandboxInstanceRefId) {
         this.sandboxInstanceRefId = sandboxInstanceRefId;
     }
 

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/trainingrun/TrainingRunDTO.java

@@ -30,7 +30,7 @@ public class TrainingRunDTO {
     @ApiModelProperty(value = "Current state of training run.", example = "ALLOCATED")
     private TRState state;
     @ApiModelProperty(value = "Reference to the received sandbox.")
-    private Long sandboxInstanceRefId;
+    private String sandboxInstanceRefId;
     @ApiModelProperty(value = "Reference to participant of training run.")
     private UserRefDTO participantRef;
 
@@ -111,7 +111,7 @@ public class TrainingRunDTO {
      *
      * @return the sandbox instance ref id
      */
-    public Long getSandboxInstanceRefId() {
+    public String getSandboxInstanceRefId() {
         return sandboxInstanceRefId;
     }
 
@@ -120,7 +120,7 @@ public class TrainingRunDTO {
      *
      * @param sandboxInstanceRefId the sandbox instance ref id
      */
-    public void setSandboxInstanceRefId(Long sandboxInstanceRefId) {
+    public void setSandboxInstanceRefId(String sandboxInstanceRefId) {
         this.sandboxInstanceRefId = sandboxInstanceRefId;
     }
 

src/main/java/cz/muni/ics/kypo/training/adaptive/facade/ExportImportFacade.java

@@ -284,7 +284,7 @@ public class ExportImportFacade {
         if (instance.isLocalEnvironment()) {
             return elasticsearchServiceApi.findAllConsoleCommandsByAccessTokenAndUserId(instance.getAccessToken(), run.getParticipantRef().getUserRefId());
         }
-        Long sandboxId = run.getSandboxInstanceRefId() == null ? run.getPreviousSandboxInstanceRefId() : run.getSandboxInstanceRefId();
+        String sandboxId = run.getSandboxInstanceRefId() == null ? run.getPreviousSandboxInstanceRefId() : run.getSandboxInstanceRefId();
         return elasticsearchServiceApi.findAllConsoleCommandsBySandbox(sandboxId);
     }
 

src/main/java/cz/muni/ics/kypo/training/adaptive/service/api/ElasticsearchServiceApi.java

@@ -93,7 +93,7 @@ public class ElasticsearchServiceApi {
         }
     }
 
-    public List<Map<String, Object>> findAllConsoleCommandsBySandbox(Long sandboxId){
+    public List<Map<String, Object>> findAllConsoleCommandsBySandbox(String sandboxId){
         try {
             return elasticsearchServiceWebClient
                     .get()
@@ -183,7 +183,7 @@ public class ElasticsearchServiceApi {
         }
     }
 
-    public void deleteCommandsBySandbox(Long sandboxId){
+    public void deleteCommandsBySandbox(String sandboxId){
         try{
             elasticsearchServiceWebClient
                     .delete()

src/main/java/cz/muni/ics/kypo/training/adaptive/service/api/SandboxServiceApi.java

@@ -36,7 +36,7 @@ public class SandboxServiceApi {
     }
 
 
-    public Long getAndLockSandboxForTrainingRun(Long poolId) {
+    public String getAndLockSandboxForTrainingRun(Long poolId) {
         try {
             SandboxInfo sandboxInfo = sandboxServiceWebClient
                     .get()

src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingRunService.java

@@ -183,7 +183,7 @@ public class TrainingRunService {
             Long userId = trainingRun.getParticipantRef().getUserRefId();
             elasticsearchServiceApi.deleteCommandsByAccessTokenAndUserId(accessToken, userId);
         } else {
-            Long sandboxId = trainingRun.getSandboxInstanceRefId() == null ? trainingRun.getPreviousSandboxInstanceRefId() : trainingRun.getSandboxInstanceRefId();
+            String sandboxId = trainingRun.getSandboxInstanceRefId() == null ? trainingRun.getPreviousSandboxInstanceRefId() : trainingRun.getSandboxInstanceRefId();
             elasticsearchServiceApi.deleteCommandsBySandbox(sandboxId);
         }
         elasticsearchServiceApi.deleteEventsFromTrainingRun(trainingRun.getTrainingInstance().getId(), trainingRun.getId());
@@ -574,7 +574,7 @@ public class TrainingRunService {
      * @throws MicroserviceApiException error calling OpenStack Sandbox Service API
      */
     public TrainingRun assignSandbox(TrainingRun trainingRun, long poolId) {
-        Long sandboxInstanceRef = this.sandboxServiceApi.getAndLockSandboxForTrainingRun(poolId);
+        String sandboxInstanceRef = this.sandboxServiceApi.getAndLockSandboxForTrainingRun(poolId);
         trainingRun.setSandboxInstanceRefId(sandboxInstanceRef);
         return trainingRunRepository.save(trainingRun);
     }
@@ -782,7 +782,7 @@ public class TrainingRunService {
                     run.getTrainingInstance().getAccessToken(),
                     run.getParticipantRef().getUserRefId());
         }
-        Long sandboxId = run.getSandboxInstanceRefId() == null ? run.getPreviousSandboxInstanceRefId() : run.getSandboxInstanceRefId();
+        String sandboxId = run.getSandboxInstanceRefId() == null ? run.getPreviousSandboxInstanceRefId() : run.getSandboxInstanceRefId();
         return elasticsearchServiceApi.findAllConsoleCommandsBySandbox(sandboxId);
     }
 

src/main/java/cz/muni/ics/kypo/training/adaptive/utils/ElasticSearchCommand.java

@@ -13,7 +13,7 @@ public class ElasticSearchCommand {
     @JsonProperty("timestamp_str")
     private String timestampStr;
     @JsonProperty("sandbox_id")
-    private Long sandboxId;
+    private String sandboxId;
     private String cmd;
     @JsonProperty("pool_id")
     private Long poolId;
@@ -46,11 +46,11 @@ public class ElasticSearchCommand {
         this.timestampStr = timestampStr;
     }
 
-    public Long getSandboxId() {
+    public String getSandboxId() {
         return sandboxId;
     }
 
-    public void setSandboxId(Long sandboxId) {
+    public void setSandboxId(String sandboxId) {
         this.sandboxId = sandboxId;
     }
 

src/test/java/cz/muni/ics/kypo/training/adaptive/util/TestDataFactory.java

@@ -177,21 +177,21 @@ public class TestDataFactory {
             LocalDateTime.now(Clock.systemUTC()).minusHours(10), "Archived instance", "archived-6666");
 
     private TrainingRun runningRun = generateTrainingRun(LocalDateTime.now(Clock.systemUTC()).minusHours(2), LocalDateTime.now(Clock.systemUTC()).plusHours(2),
-            TRState.RUNNING, 2, true, 1L, true,
-            20L);
+            TRState.RUNNING, 2, true, "1L", true,
+            "20L");
     private TrainingRun finishedRun = generateTrainingRun(LocalDateTime.now(Clock.systemUTC()).minusHours(10), LocalDateTime.now(Clock.systemUTC()).minusHours(5),
-            TRState.FINISHED, 4, false, 3L, true, 30L);
+            TRState.FINISHED, 4, false, "3L", true, "30L");
     private TrainingRun archivedRun = generateTrainingRun(LocalDateTime.now(Clock.systemUTC()).minusHours(20), LocalDateTime.now(Clock.systemUTC()).minusHours(10),
-            TRState.ARCHIVED, 0, false, 5L, false, 60L);
+            TRState.ARCHIVED, 0, false, "5L", false, "60L");
     private TrainingRunByIdDTO trainingRunByIdDTO = generateTrainingRunByIdDTO(LocalDateTime.now(Clock.systemUTC()).minusHours(2), LocalDateTime.now(Clock.systemUTC()).plusHours(2),
-             TRState.RUNNING, 5L);
+             TRState.RUNNING, "5L");
     private TrainingRunDTO trainingRunDTO = generateTrainingRunDTO(LocalDateTime.now(Clock.systemUTC()).minusHours(9), LocalDateTime.now(Clock.systemUTC()).minusHours(5),
-             TRState.FINISHED, 7L);
+             TRState.FINISHED, "7L");
 //    private AccessedTrainingRunDTO accessedTrainingRunDTO = generateAccessedTrainingRunDTO("Accessed run", LocalDateTime.now(Clock.systemUTC()).minusHours(8), LocalDateTime.now(Clock.systemUTC()).minusHours(4), 5,
 //            6, Actions.RESUME);
 
     private PoolInfoDTO poolInfoDTO = generatePoolInfoDTO(1L, 1L, 5L, 10L, 5L, "sha", "revSha");
-    private SandboxInfo sandboxInfo = generateSandboxInfo(1L, 1, 4);
+    private SandboxInfo sandboxInfo = generateSandboxInfo("1L", 1, 4);
     private SandboxPoolInfo sandboxPoolInfo = generateSandboxPoolInfo(1L, 1L, 10L, 5L);
     private LockedPoolInfo lockedPoolInfo = generateLockedPoolInfo(1L, 1L);
 
@@ -691,7 +691,7 @@ public class TestDataFactory {
     }
 
     private TrainingRun generateTrainingRun(LocalDateTime startTime, LocalDateTime endTime, TRState state,
-                                            int incorrectAnswerCount, boolean solutionTaken, Long SBIRefId, boolean phaseAnswered, Long previousSBIRefId){
+                                            int incorrectAnswerCount, boolean solutionTaken, String SBIRefId, boolean phaseAnswered, String previousSBIRefId){
         TrainingRun newTrainingRun = new TrainingRun();
         newTrainingRun.setStartTime(startTime);
         newTrainingRun.setEndTime(endTime);
@@ -792,7 +792,7 @@ public class TestDataFactory {
         return trainingInstanceDTO;
     }
 
-    private TrainingRunByIdDTO generateTrainingRunByIdDTO(LocalDateTime start, LocalDateTime end, TRState state, Long SBIId){
+    private TrainingRunByIdDTO generateTrainingRunByIdDTO(LocalDateTime start, LocalDateTime end, TRState state, String SBIId){
         TrainingRunByIdDTO trainingRunByIdDTO = new TrainingRunByIdDTO();
         trainingRunByIdDTO.setStartTime(start);
         trainingRunByIdDTO.setEndTime(end);
@@ -801,7 +801,7 @@ public class TestDataFactory {
         return trainingRunByIdDTO;
     }
 
-    private TrainingRunDTO generateTrainingRunDTO(LocalDateTime start, LocalDateTime end, TRState state, Long SBIId){
+    private TrainingRunDTO generateTrainingRunDTO(LocalDateTime start, LocalDateTime end, TRState state, String SBIId){
         TrainingRunDTO trainingRunDTO = new TrainingRunDTO();
         trainingRunDTO.setStartTime(start);
         trainingRunDTO.setEndTime(end);
@@ -843,7 +843,7 @@ public class TestDataFactory {
         return poolInfoDTO;
     }
 
-    private SandboxInfo generateSandboxInfo(Long id, Integer lockId, Integer allocationUnit){
+    private SandboxInfo generateSandboxInfo(String id, Integer lockId, Integer allocationUnit){
         SandboxInfo sandboxInfo = new SandboxInfo();
         sandboxInfo.setId(id);
         sandboxInfo.setAllocationUnitId(allocationUnit);