feat: add endpoint for update status at delivery

src/main/java/com/betrybe/controller/DeliveryController.java

@@ -1,8 +1,14 @@
 package com.betrybe.controller;
 
 import com.betrybe.entities.DeliveryRequest;
+import com.betrybe.entities.StatusRequest;
+import com.betrybe.entities.StatusResponse;
+import com.betrybe.enuns.Status;
+import com.betrybe.exceptions.NotFoundException;
 import com.betrybe.models.Delivery;
+import com.betrybe.models.Drone;
 import com.betrybe.service.DeliveryService;
+import com.betrybe.service.DroneService;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
@@ -14,6 +20,8 @@
 public class DeliveryController {
   @Inject
   DeliveryService deliveryService;
+  @Inject
+  DroneService droneService;
 
   @GET
   public Response getAll() {
@@ -24,17 +32,43 @@ public Response getAll() {
   @POST
   @Produces(MediaType.APPLICATION_JSON)
   @Consumes(MediaType.APPLICATION_JSON)
-  public Response create(DeliveryRequest deliveryRequest) {
+  public Response create(DeliveryRequest deliveryRequest) throws NotFoundException {
+    Drone droneSearch = droneService.findById(deliveryRequest.getDroneId());
+    if (droneSearch == null) {
+      throw new NotFoundException("Drone not Found");
+    }
     Delivery delivery = deliveryService.created(deliveryRequest);
     return Response.status(201).entity(delivery).build();
   }
 
+  @PUT
+  @Produces(MediaType.APPLICATION_JSON)
+  @Consumes(MediaType.APPLICATION_JSON)
+  @Path("/status/{id}")
+  public Response updateStatus(@PathParam("id") Integer id, StatusRequest statusRequest) throws NotFoundException {
+    Delivery delivery = deliveryService.findById(id);
+    if(delivery == null){
+      throw new NotFoundException("Delivery not found");
+    }
+    Status newStatus = deliveryService.updateStatus(id, statusRequest);
+    StatusResponse statusResponse = new StatusResponse();
+    statusResponse.setStatus(statusRequest.getStatus());
+    if(newStatus == null){
+      statusResponse.setStatus("status not allowed");
+      return Response.status(400).entity(statusResponse).build();
+    }
+    return Response.status(200).entity(statusResponse).build();
+  }
+
   @PUT
   @Produces(MediaType.APPLICATION_JSON)
   @Consumes(MediaType.APPLICATION_JSON)
   @Path("/{id}")
   public Response update(@PathParam("id") Integer id, DeliveryRequest deliveryRequest) {
-    System.out.println(id);
+    Delivery deliverySearch = deliveryService.findById(id);
+    if(deliverySearch == null){
+      throw new NotFoundException("Delivery not found");
+    }
     Delivery delivery = deliveryService.update(id, deliveryRequest);
     return Response.status(200).entity(delivery).build();
   }

src/main/java/com/betrybe/controller/DroneController.java

@@ -19,9 +19,9 @@ public class DroneController {
 
   @POST
   @Consumes(MediaType.APPLICATION_JSON)
-  public Response create(Drone drone) {
-    String result = droneService.create(drone);
-    return Response.status(201).build();
+  public Response create(Drone droneRequest) {
+    Drone drone = droneService.create(droneRequest);
+    return Response.status(201).entity(drone).build();
   }
 
   @GET
@@ -38,15 +38,15 @@ public Response getAll() {
   public Response update(@PathParam("id") Integer id, Drone drone) throws NotFoundException {
     Drone droneSearch = droneService.findById(id);
     if (droneSearch == null) {
-      throw new NotFoundException("Drone not Found");
+      throw new NotFoundException("Drone not found");
     }
     Drone droneAtt = droneService.update(id, drone);
     return Response.ok(droneAtt).build();
   }
 
   @DELETE
   @Path("/{id}")
-  public Response update(@PathParam("id") Integer id) {
+  public Response delete(@PathParam("id") Integer id) {
     Drone droneSearch = droneService.findById(id);
     if (droneSearch == null) {
       throw new NotFoundException("Drone not Found");

src/main/java/com/betrybe/entities/DeliveryRequest.java

@@ -9,18 +9,18 @@
 import java.time.LocalDateTime;
 
 public class DeliveryRequest {
-  private LocalDateTime schedule_delivery;
+  private String schedule_delivery;
   private LocalDateTime delivery_date;
   private Status status;
   private Integer droneId;
   private Video video;
   private Position position;
 
-  public LocalDateTime getSchedule_delivery() {
+  public String getSchedule_delivery() {
     return schedule_delivery;
   }
 
-  public void setSchedule_delivery(LocalDateTime schedule_delivery) {
+  public void setSchedule_delivery(String schedule_delivery) {
     this.schedule_delivery = schedule_delivery;
   }
 

src/main/java/com/betrybe/entities/StatusRequest.java

@@ -0,0 +1,13 @@
+package com.betrybe.entities;
+
+public class StatusRequest {
+  private String status;
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+}

src/main/java/com/betrybe/entities/StatusResponse.java

@@ -0,0 +1,13 @@
+package com.betrybe.entities;
+
+public class StatusResponse {
+  private String status;
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+}

src/main/java/com/betrybe/enuns/Status.java

@@ -1,8 +1,8 @@
 package com.betrybe.enuns;
 
 public enum Status {
+  CREATED,
   ONROUTE,
   FINISHED,
-  CREATED,
   CANCELED,
 }

src/main/java/com/betrybe/models/Delivery.java

@@ -11,7 +11,6 @@ public class Delivery {
   @Id
   @GeneratedValue(strategy = GenerationType.AUTO)
   private Integer id;
-
   @Column
   private LocalDateTime schedule_delivery;
   @Column

src/main/java/com/betrybe/service/DeliveryService.java

@@ -1,6 +1,8 @@
 package com.betrybe.service;
 
 import com.betrybe.entities.DeliveryRequest;
+import com.betrybe.entities.StatusRequest;
+import com.betrybe.enuns.Status;
 import com.betrybe.models.Delivery;
 import com.betrybe.models.Drone;
 import com.betrybe.models.Position;
@@ -9,6 +11,7 @@
 import com.betrybe.repository.DroneRepository;
 import com.betrybe.repository.PositionRepository;
 import com.betrybe.repository.VideoRepository;
+import com.betrybe.util.FormaterForLocalDateTime;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
@@ -34,22 +37,51 @@ public List<Delivery> getAll() {
     return deliveryRepository.listAll();
   }
 
+  public Delivery findById(Integer id) {
+    return deliveryRepository.findById(id);
+  }
+
   @Transactional
   public Delivery created(DeliveryRequest deliveryRequest) {
     Delivery delivery = new Delivery();
+
     Drone drone = droneRepository.findById(deliveryRequest.getDroneId());
 
+    delivery.setDrone(drone);
+
     Position position = deliveryRequest.getPosition();
+    delivery.setPosition(position);
     positionRepository.persist(position);
 
-    delivery.setSchedule_delivery(LocalDateTime.now());
-    delivery.setDrone(drone);
-    delivery.setPosition(position);
+    LocalDateTime dateTimeSchedule = FormaterForLocalDateTime.conversor(deliveryRequest.getSchedule_delivery());
+    delivery.setSchedule_delivery(dateTimeSchedule);
+
     delivery.setStatus(deliveryRequest.getStatus());
+
     deliveryRepository.persist(delivery);
     return delivery;
   }
 
+  @Transactional
+  public Status updateStatus(Integer id, StatusRequest statusRequest) {
+    Delivery delivery = deliveryRepository.findById(id);
+    Status status = null;
+    switch (statusRequest.getStatus()) {
+      case "ONROUTE":
+        status = Status.ONROUTE;
+        break;
+      case "FINISHED":
+        status = Status.FINISHED;
+        break;
+      case "CANCELED":
+        status = Status.CANCELED;
+        break;
+    }
+    delivery.setStatus(status);
+    deliveryRepository.persist(delivery);
+    return status;
+  }
+
   @Transactional
   public Delivery update(Integer id, DeliveryRequest deliveryRequest) {
     Delivery delivery = deliveryRepository.findById(id);

src/main/java/com/betrybe/service/DroneService.java

@@ -15,12 +15,12 @@ public class DroneService {
   DroneRepository droneRepository;
 
   @Transactional
-  public String create(Drone droneRequest) {
+  public Drone create(Drone droneRequest) {
     Drone drone = new Drone();
     drone.setBrand(droneRequest.getBrand());
     drone.setModel(droneRequest.getModel());
     droneRepository.persist(drone);
-    return "Created";
+    return drone;
   }
 
   @Transactional

src/main/java/com/betrybe/util/formaterForLocalDateTime.java → src/main/java/com/betrybe/util/FormaterForLocalDateTime.java

@@ -3,8 +3,8 @@
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
-public class formaterForLocalDateTime {
-  public static  LocalDateTime conversos(String dataHoraStr){
+public class FormaterForLocalDateTime {
+  public static  LocalDateTime conversor(String dataHoraStr){
     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy-HH:mm");
     LocalDateTime dataHora = LocalDateTime.parse(dataHoraStr, formatter);
     return dataHora;