Handle lack of labeled owner in FetchLabeledOwnerController

PawelPacholek · PawelPacholek · commit 868e59a8fb88 · 2025-02-21T11:46:19.000+01:00
diff --git a/main-owner-service/api/src/main/java/com/main_owner_service/api/controllers/FetchLabeledOwnerController.java b/main-owner-service/api/src/main/java/com/main_owner_service/api/controllers/FetchLabeledOwnerController.java
@@ -5,10 +5,14 @@
 import com.main_owner_service.domain.models.LabeledOwner;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
+import static org.springframework.http.HttpStatus.BAD_REQUEST;
+
 @RestController
 public class FetchLabeledOwnerController {
 
@@ -21,6 +25,14 @@ public class FetchLabeledOwnerController {
   @GetMapping(value = "/fetch-labeled-owner/{id}")
   public ResponseEntity<String> fetchOwner(@PathVariable("id") Long ownerId) {
     LabeledOwner labeledOwner = fetchOwnerUseCase.fetchLabeledOwner(ownerId);
+    if (labeledOwner == null)
+      throw new IllegalArgumentException("LabeledOwner not found");
     return new ResponseEntity<>(DataClassSerialization.serialize(labeledOwner), HttpStatus.OK);
   }
+
+  @ExceptionHandler(IllegalArgumentException.class)
+  static ResponseEntity<String> handleMalformedBody(IllegalArgumentException exception) {
+    return new ResponseEntity<>(exception.getMessage(), HttpStatus.BAD_REQUEST);
+  }
+
 }
