From 01c7458220a9174ebd6cedddc8b2d869d511ca56 Mon Sep 17 00:00:00 2001
From: Dek Dalier <65068975+ItsDek@users.noreply.github.com>
Date: Mon, 17 Aug 2026 22:01:00 +0200
Subject: [PATCH] refactor: extract measurement logic into service layer

---
 .../controller/MeasurementController.java     | 23 +++++++--------
 .../sensorapi/service/MeasurementService.java | 28 +++++++++++++++++++
 2 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/dev/deklab/sensorapi/service/MeasurementService.java

diff --git a/src/main/java/dev/deklab/sensorapi/controller/MeasurementController.java b/src/main/java/dev/deklab/sensorapi/controller/MeasurementController.java
index 441d076..3e0480e 100644
--- a/src/main/java/dev/deklab/sensorapi/controller/MeasurementController.java
+++ b/src/main/java/dev/deklab/sensorapi/controller/MeasurementController.java
@@ -1,5 +1,6 @@
 package dev.deklab.sensorapi.controller;
 
+import dev.deklab.sensorapi.service.MeasurementService;
 import java.util.List;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -14,34 +15,30 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-
 @RestController
 public class MeasurementController {
-    Measurement m1 = new Measurement(1L, 21.5, 48);
-    Measurement m2 = new Measurement(2L, 25.5, 38);
-    Measurement m3 = new Measurement(3L, 29.5, 58);
 
-    List<Measurement> measurements = List.of(m1, m2, m3);
+    private final MeasurementService measurementService;
+
+    MeasurementController(MeasurementService measurementService) {
+        this.measurementService = measurementService;
+    }
 
     @GetMapping("/measurements")
     public List<Measurement> returnAllMeasurements() {
-        return measurements;
+        return measurementService.returnAllMeasurements();
     }
 
     @GetMapping("/measurements/{id}")
     public Measurement returnMeasurementsById(@PathVariable Long id) {
-        for (int i = 0; i < measurements.size(); i++) {
-            if (id.equals(measurements.get(i).id())) {
-                return measurements.get(i);
-            }
-        }
-        throw new ResponseStatusException(HttpStatus.NOT_FOUND);
+        return measurementService.searchById(id)
+                .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND));
     }
+
     @PostMapping("/measurements")
     @ResponseStatus(HttpStatus.CREATED)
     public Measurement postMeasurement(@RequestBody Measurement measurement) {
         return measurement;
     }
-    
 
 }
diff --git a/src/main/java/dev/deklab/sensorapi/service/MeasurementService.java b/src/main/java/dev/deklab/sensorapi/service/MeasurementService.java
new file mode 100644
index 0000000..a5bf6af
--- /dev/null
+++ b/src/main/java/dev/deklab/sensorapi/service/MeasurementService.java
@@ -0,0 +1,28 @@
+package dev.deklab.sensorapi.service;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.stereotype.Service;
+
+import dev.deklab.model.Measurement;
+
+@Service
+public class MeasurementService {
+    private Measurement m1 = new Measurement(1L, 21.5, 48);
+    private Measurement m2 = new Measurement(2L, 25.5, 38);
+    private Measurement m3 = new Measurement(3L, 29.5, 58);
+
+    private List<Measurement> measurements = List.of(m1, m2, m3);
+    public List<Measurement> returnAllMeasurements(){
+            return measurements;
+    }
+    public Optional<Measurement> searchById(Long id){
+        for (int i = 0; i < measurements.size(); i++) {
+            if (id.equals(measurements.get(i).id())) {
+                return Optional.of(measurements.get(i));
+            }
+        }
+        return Optional.empty();
+    }
+}