no message

src/main/java/com/itsol/quantrivanphong/manage/leaveform/business/LeaveFormBusiness.java

@@ -26,18 +26,18 @@ public class LeaveFormBusiness {
         return leaveFormRepository.findAll();
     }
 
-    public String insertLeaveForm(int employee_Id, LeaveFormDTO leaveFormDTO) {
+    public String insertLeaveForm(int employee_Id, LeaveFormDTO leaveFormDTO, int leavetype_Id) {
         String message;
 
         Employee employee = employeeRepository.findEmployeeById(employee_Id);
-        LeaveType leaveType = leaveTypeRepository.findLeaveTypeById(leaveFormDTO.getLeave_type_id());
+        LeaveType leaveType = leaveTypeRepository.findLeaveTypeById(leavetype_Id);
 
         if (employee != null) {
             if (leaveType != null) {
                 LeaveForm leaveForm = leaveFormRepository.save(LeaveForm.builder()
                         .title(leaveFormDTO.getTitle())
                         .content(leaveFormDTO.getContent())
-                        .status(leaveFormDTO.isStatus())
+                        .status(false)
                         .employee(employee)
                         .leaveType(leaveType).build());
 
@@ -56,14 +56,14 @@ public class LeaveFormBusiness {
     }
 
     @Transactional
-    public String deleteLeaveForm(int idemp, int idleave) {
+    public String deleteLeaveForm(int emloyee_Id, int leaveform_Id) {
         String message;
-        Employee employee = employeeRepository.findEmployeeById(idemp);
-        LeaveForm leaveForm = leaveFormRepository.findLeaveFormByEmployeeAndId(employee, idleave);
+        Employee employee = employeeRepository.findEmployeeById(emloyee_Id);
+        LeaveForm leaveForm = leaveFormRepository.findLeaveFormByEmployeeAndId(employee, leaveform_Id);
         if (employee != null) {
             if (leaveForm != null) {
                 leaveFormRepository.delete(leaveForm);
-                if (leaveFormRepository.findLeaveFormByEmployeeAndId(employee, idleave) != null) {
+                if (leaveFormRepository.findLeaveFormByEmployeeAndId(employee, leaveform_Id) != null) {
                     message = "Delete failed!";
                 } else {
                     message = "Delete success!";
@@ -78,13 +78,14 @@ public class LeaveFormBusiness {
     }
 
     @Transactional
-    public String updateLeaveForm(LeaveFormDTO leaveFormDTO) {
+    public String updateLeaveForm(int employee_Id, int leavetype_Id, int leaveform_Id, LeaveFormDTO leaveFormDTO) {
         String message;
-        LeaveType leaveType = leaveTypeRepository.findLeaveTypeById(leaveFormDTO.getLeave_type_id());
-        LeaveForm leaveForm = leaveFormRepository.findLeaveFormById(leaveFormDTO.getId());
-        if (leaveForm != null) {
+        Employee employee = employeeRepository.findEmployeeById(employee_Id);
+        LeaveType leaveType = leaveTypeRepository.findLeaveTypeById(leavetype_Id);
+        LeaveForm leaveForm = leaveFormRepository.findLeaveFormByEmployeeAndLeaveTypeAndId(employee, leaveType, leaveform_Id);
         if (leaveType != null) {
-                int i = leaveFormRepository.updateLeaveForm(leaveFormDTO.getTitle(), leaveFormDTO.getContent(), leaveType, leaveFormDTO.getId());
+            if (leaveForm != null) {
+                int i = leaveFormRepository.updateLeaveForm(leaveFormDTO.getTitle(), leaveFormDTO.getContent(), leaveform_Id);
                 if (i == 1) {
                     message = "Update success";
                 } else {
@@ -101,11 +102,13 @@ public class LeaveFormBusiness {
     }
 
     @Transactional
-    public String updateLeaveFormStatus(LeaveFormDTO leaveFormDTO) {
+    public String updateLeaveFormStatus(int employee_Id, int leavetype_Id, int leaveform_Id) {
         String message;
-        LeaveForm leaveForm = leaveFormRepository.findLeaveFormById(leaveFormDTO.getEmployee_id());
+        Employee employee = employeeRepository.findEmployeeById(employee_Id);
+        LeaveType leaveType = leaveTypeRepository.findLeaveTypeById(leavetype_Id);
+        LeaveForm leaveForm = leaveFormRepository.findLeaveFormByEmployeeAndLeaveTypeAndId(employee, leaveType, leaveform_Id);
         if (leaveForm != null) {
-            int i = leaveFormRepository.updateLeaveFormStatus(leaveFormDTO.isStatus(), leaveFormDTO.getId());
+            int i = leaveFormRepository.updateLeaveFormStatus(leaveform_Id);
             if (i == 1) {
                 message = "Update status success";
             } else {
@@ -118,11 +121,11 @@ public class LeaveFormBusiness {
         return message;
     }
 
-    public List<LeaveForm> leaveFormById(int id) {
-        Employee employee = employeeRepository.findEmployeeById(id);
+    public List<LeaveForm> leaveFormById(int employee_Id) {
+        Employee employee = employeeRepository.findEmployeeById(employee_Id);
         if (employee != null) {
-            if (leaveFormRepository.leaveFormListById(employee) != null) {
-                return leaveFormRepository.leaveFormListById(employee);
+            if (leaveFormRepository.showLeaveFormById(employee) != null) {
+                return leaveFormRepository.showLeaveFormById(employee);
             } else {
                 return null;
             }

src/main/java/com/itsol/quantrivanphong/manage/leaveform/controller/LeaveFormController.java

@@ -37,19 +37,19 @@ public class LeaveFormController {
         return ResponseEntity.ok(message);
     }
 
-    @DeleteMapping("/delete/{idemp}/{idleave}")
-    public ResponseEntity<String> deleteLeaveForm(@PathVariable int idemp, @Valid @PathVariable int idleave) {
-        return ResponseEntity.ok(leaveFormBusiness.deleteLeaveForm(idemp, idleave));
+    @DeleteMapping("/{employee_Id}/leaveform/{leaveform_Id}")
+    public ResponseEntity<String> deleteLeaveForm(@PathVariable int employee_Id, @Valid @PathVariable int leaveform_Id) {
+        return ResponseEntity.ok(leaveFormBusiness.deleteLeaveForm(employee_Id, leaveform_Id));
     }
 
-    @PostMapping(path = "/update", consumes = "application/json", produces = "application/json")
-    public ResponseEntity<String> updateLeaveForm(@RequestBody LeaveFormDTO leaveFormDTO) {
+    @PostMapping(path = "/{employee_Id}/leavetype/{leavetype_Id}/leaveform/{leaveform_Id}", consumes = "application/json", produces = "application/json")
+    public ResponseEntity<String> updateLeaveForm(@PathVariable int employee_Id, @PathVariable int leavetype_Id, @PathVariable int leaveform_Id, @Valid @RequestBody LeaveFormDTO leaveFormDTO) {
         String message;
 
         try {
             if (leaveFormDTO.getTitle().trim().equals("")) throw new InputException("Tiêu đề không được để trống");
             if (leaveFormDTO.getContent().trim().equals("")) throw new InputException("Nội dung không được để trống");
-            message = leaveFormBusiness.updateLeaveForm(leaveFormDTO);
+            message = leaveFormBusiness.updateLeaveForm(employee_Id, leavetype_Id, leaveform_Id, leaveFormDTO);
         } catch (InputException e) {
             message = e.getMessage();
         }
@@ -64,10 +64,10 @@ public class LeaveFormController {
         return ResponseEntity.ok(message);
     }
 
-    @GetMapping("/index/{id}")
-    public ResponseEntity<List<LeaveForm>> showLeaveFormById(@PathVariable int id) {
-        if (leaveFormBusiness.leaveFormById(id) != null) {
-            return ResponseEntity.ok(leaveFormBusiness.leaveFormById(id));
+    @GetMapping("/{employee_Id}/leaveform")
+    public ResponseEntity<List<LeaveForm>> showLeaveFormById(@PathVariable int employee_Id) {
+        if (leaveFormBusiness.leaveFormById(employee_Id) != null) {
+            return ResponseEntity.ok(leaveFormBusiness.leaveFormById(employee_Id));
         } else {
             return null;
         }

src/main/java/com/itsol/quantrivanphong/manage/leaveform/repository/LeaveFormRepository.java

@@ -17,14 +17,16 @@ public interface LeaveFormRepository extends JpaRepository<LeaveForm, Integer> {
 
     LeaveForm findLeaveFormById(int i);
 
+    LeaveForm findLeaveFormByEmployeeAndLeaveTypeAndId(Employee employee, LeaveType leaveType, int id);
+
     @Modifying
-    @Query("update LeaveForm lf set lf.title = ?1, lf.content = ?2, lf.leaveType = ?3 where lf.id = ?4")
-    int updateLeaveForm(String title, String content, LeaveType leaveType, int id);
+    @Query("update LeaveForm lf set lf.title = ?1, lf.content = ?2 where lf.id = ?3")
+    int updateLeaveForm(String title, String content, int id);
 
     @Modifying
-    @Query("update LeaveForm lf set lf.status = ?1 where lf.id = ?2")
-    int updateLeaveFormStatus(boolean status, int id);
+    @Query("update LeaveForm lf set lf.status = true where lf.id = ?1")
+    int updateLeaveFormStatus(int id);
 
     @Query("select lf from LeaveForm lf where lf.employee = ?1")
-    List<LeaveForm> leaveFormListById(Employee employee);
+    List<LeaveForm> showLeaveFormById(Employee employee);
 }