Merge remote-tracking branch 'origin/RSJ-84' into dev

PierpaoloSpadafora · Dec 6, 2024 · 346658f · 346658f
2 parents 08631e0 + a0b6295
commit 346658f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/Backend/src/main/java/unical/demacs/rdm/utils/TimeWindow.java b/Backend/src/main/java/unical/demacs/rdm/utils/TimeWindow.java
@@ -3,12 +3,9 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
-/**
- * Represents a time interval with start and end times in epoch seconds
- */
 @Data
 @AllArgsConstructor
 public class TimeWindow {
-    private long startTime;  // Start time in epoch seconds
-    private long endTime;    // End time in epoch seconds
+    private long startTime;
+    private long endTime;
 }
diff --git a/Backend/src/test/java/unical/demacs/rdm/controller/JsonControllerTest.java b/Backend/src/test/java/unical/demacs/rdm/controller/JsonControllerTest.java
@@ -119,7 +119,7 @@ void setUp() {
                 .id(1L)
                 .name("Test Machine")
                 .description("Test Machine Description")
-                .machine_type_id(machineType) // Corretto da .type() a .machine_type_id()
+                .machine_type_id(machineType)
                 .status(MachineStatus.AVAILABLE)
                 .build();
     }

diff --git a/Backend/src/test/java/unical/demacs/rdm/service/MachineServiceImplTest.java b/Backend/src/test/java/unical/demacs/rdm/service/MachineServiceImplTest.java
@@ -57,7 +57,7 @@ void setUp() {
                 .id(TEST_ID)
                 .name(TEST_NAME)
                 .description(TEST_DESCRIPTION)
-                .machine_type_id(testMachineType) // Corretto da .type() a .machine_type_id()
+                .machine_type_id(testMachineType)
                 .build();
 
         testMachineDTO = new MachineDTO();