chore: Remove files that shouldn't have been there (duplicates)

mthmulders · Dec 31, 2024 · 929e2df · 929e2df
1 parent f97d207
commit 929e2df
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 134 deletions.
diff --git a/...s/api/src/main/java/it/mulders/traqqr/api/measurements/InMemoryMeasurementRepository.java b/...s/api/src/main/java/it/mulders/traqqr/api/measurements/InMemoryMeasurementRepository.java
diff --git a/app/adapters/api/src/main/java/it/mulders/traqqr/api/measurements/MeasurementDto.java b/app/adapters/api/src/main/java/it/mulders/traqqr/api/measurements/MeasurementDto.java
diff --git a/app/adapters/api/src/main/java/it/mulders/traqqr/api/measurements/MeasurementMapper.java b/app/adapters/api/src/main/java/it/mulders/traqqr/api/measurements/MeasurementMapper.java
@@ -1,5 +1,6 @@
 package it.mulders.traqqr.api.measurements;
 
+import it.mulders.traqqr.api.measurements.dto.MeasurementDto;
 import it.mulders.traqqr.domain.measurements.Measurement;
 import it.mulders.traqqr.domain.vehicles.Vehicle;
 

diff --git a/app/adapters/api/src/main/java/it/mulders/traqqr/api/measurements/MeasurementResource.java b/app/adapters/api/src/main/java/it/mulders/traqqr/api/measurements/MeasurementResource.java
@@ -1,5 +1,6 @@
 package it.mulders.traqqr.api.measurements;
 
+import it.mulders.traqqr.api.measurements.dto.MeasurementDto;
 import it.mulders.traqqr.domain.measurements.MeasurementRepository;
 import it.mulders.traqqr.domain.vehicles.Authorisation;
 import it.mulders.traqqr.domain.vehicles.VehicleRepository;

diff --git a/...dapters/api/src/test/java/it/mulders/traqqr/api/measurements/MeasurementResourceTest.java b/...dapters/api/src/test/java/it/mulders/traqqr/api/measurements/MeasurementResourceTest.java
@@ -1,5 +1,6 @@
 package it.mulders.traqqr.api.measurements;
 
+import it.mulders.traqqr.api.measurements.dto.MeasurementDto;
 import it.mulders.traqqr.domain.vehicles.Authorisation;
 import it.mulders.traqqr.domain.vehicles.Vehicle;
 import it.mulders.traqqr.mem.measurements.InMemoryMeasurementRepository;
@@ -34,16 +35,12 @@ public void testRegisterMeasurement_Success() {
         var vehicle = new Vehicle("code123", "description", "ownerId", Set.of(Authorisation.fromInput("hashedKey123")));
         vehicleRepository.save(vehicle);
 
-        var measurementDto = new MeasurementDto();
-        measurementDto.setTimestamp(OffsetDateTime.now());
-        measurementDto.setOdometer(1000);
-        var batteryDto = new MeasurementDto.BatteryDto();
-        batteryDto.setSoc((byte) 80);
-        measurementDto.setBattery(batteryDto);
-        var locationDto = new MeasurementDto.LocationDto();
-        locationDto.setLat(52.0);
-        locationDto.setLon(4.0);
-        measurementDto.setLocation(locationDto);
+        var measurementDto = new MeasurementDto(
+                OffsetDateTime.now(),
+                1000,
+                new MeasurementDto.BatteryDto((byte) 80),
+                new MeasurementDto.LocationDto(52.0, 4.0)
+        );
 
         var headers = new ResteasyHttpHeaders(
             new MultivaluedHashMap<>(Map.of("X-VEHICLE-API-KEY", "hashedKey123"))
@@ -56,16 +53,12 @@ public void testRegisterMeasurement_Success() {
 
     @Test
     public void testRegisterMeasurement_VehicleNotFound() {
-        var measurementDto = new MeasurementDto();
-        measurementDto.setTimestamp(OffsetDateTime.now());
-        measurementDto.setOdometer(1000);
-        var batteryDto = new MeasurementDto.BatteryDto();
-        batteryDto.setSoc((byte) 80);
-        measurementDto.setBattery(batteryDto);
-        var locationDto = new MeasurementDto.LocationDto();
-        locationDto.setLat(52.0);
-        locationDto.setLon(4.0);
-        measurementDto.setLocation(locationDto);
+        var measurementDto = new MeasurementDto(
+                OffsetDateTime.now(),
+                1000,
+                new MeasurementDto.BatteryDto((byte) 80),
+                new MeasurementDto.LocationDto(52.0, 4.0)
+        );
 
         var headers = new ResteasyHttpHeaders(
             new MultivaluedHashMap<>(Map.of("X-VEHICLE-API-KEY", "hashedKey123"))
@@ -80,16 +73,12 @@ public void testRegisterMeasurement_Unauthorized() {
         var vehicle = new Vehicle("code123", "description", "ownerId", null);
         vehicleRepository.save(vehicle);
 
-        var measurementDto = new MeasurementDto();
-        measurementDto.setTimestamp(OffsetDateTime.now());
-        measurementDto.setOdometer(1000);
-        var batteryDto = new MeasurementDto.BatteryDto();
-        batteryDto.setSoc((byte) 80);
-        measurementDto.setBattery(batteryDto);
-        var locationDto = new MeasurementDto.LocationDto();
-        locationDto.setLat(52.0);
-        locationDto.setLon(4.0);
-        measurementDto.setLocation(locationDto);
+        var measurementDto = new MeasurementDto(
+                OffsetDateTime.now(),
+                1000,
+                new MeasurementDto.BatteryDto((byte) 80),
+                new MeasurementDto.LocationDto(52.0, 4.0)
+        );
 
         var headers = new ResteasyHttpHeaders(
             new MultivaluedHashMap<>(Map.of("X-VEHICLE-API-KEY", "invalidKey"))