lastOne Arrive By ID

Author: tsiupa-coder

src/main/java/com/serve/api/controler/ArriveController.java

@@ -1,6 +1,7 @@
 package com.serve.api.controler;
 
 import com.serve.api.dto.ArriveDto;
+import com.serve.api.model.entity.Arrive;
 import com.serve.api.service.ArriveService;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -51,4 +52,12 @@ public void create(@RequestBody ArriveDto arrive) {
     public void remove(@PathVariable Long id) {
         service.remove(id);
     }
+
+
+    @GetMapping("Test/" + ID)
+    public Arrive tstt(@PathVariable Long id) {
+        Arrive worker = service.getLatOne(id);
+
+        return worker;
+    }
 }

src/main/java/com/serve/api/model/entity/Arrive.java

@@ -18,16 +18,16 @@ public class Arrive extends BaseEntity {
 
     Type type;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company_id")
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name = "companyId")
     Company company;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "worker_id")
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name = "workerId")
     Worker worker;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "enter_id", nullable = true)
-    Arrive enter_id;
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name = "enterId", nullable = true)
+    Arrive enterId;
 
 }

src/main/java/com/serve/api/repository/ArriveRepository.java

@@ -1,13 +1,16 @@
 package com.serve.api.repository;
 
 import com.serve.api.model.entity.Arrive;
+import com.serve.api.model.enumeration.Type;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+
 @Repository
 public interface ArriveRepository extends JpaRepository<Arrive, Long> {
 
     //https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.limit-query-result
-    Arrive findTopById(Long id);
+    Optional<Arrive> findTopByWorkerIdAndTypeOrderByCreateDateTimeDesc(Long id, Type type);
 
 }

src/main/java/com/serve/api/service/ArriveService.java

@@ -61,7 +61,7 @@ public void create(ArriveDto dto) {
                     .reduce((first, second) -> second)
                     .orElse(fake);
 
-            arrive.setId(lastEnter.getId());
+            arrive.setEnterId(lastEnter);
         }
 
         repository.save(arrive);
@@ -103,7 +103,7 @@ public int getHours(Long workerId, Date start, Date end) {
     }
 
     public Arrive getLatOne(Long id){
-        return repository.findTopById(id);
+        return repository.findTopByWorkerIdAndTypeOrderByCreateDateTimeDesc(id, Type.Enter).get();
     }
 
     /***
@@ -136,7 +136,7 @@ public long getSeconds(Long workerId, Period period){
                 .findAll()
                 .stream()
                 .filter(arrive -> Objects.equals(arrive.getType(), Type.Exit))
-                .filter(arrive -> Objects.nonNull(arrive.getEnter_id()))
+                .filter(arrive -> Objects.nonNull(arrive.getEnterId()))
                 .collect(Collectors.toList());
 
 //        for (Arrive arrive : exit){