no message

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

@@ -26,10 +26,10 @@ public class LeaveFormBusiness {
         return leaveFormRepository.findAll();
     }
 
-    public String insertLeaveForm(LeaveFormDTO leaveFormDTO) {
+    public String insertLeaveForm(int employee_Id, LeaveFormDTO leaveFormDTO) {
         String message;
 
-        Employee employee = employeeRepository.findEmployeeById(leaveFormDTO.getEmployee_id());
+        Employee employee = employeeRepository.findEmployeeById(employee_Id);
         LeaveType leaveType = leaveTypeRepository.findLeaveTypeById(leaveFormDTO.getLeave_type_id());
 
         if (employee != null) {

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

@@ -22,14 +22,14 @@ public class LeaveFormController {
         return ResponseEntity.ok(leaveFormBusiness.findAll());
     }
 
-    @PostMapping(path = "/insert", consumes = "application/json", produces = "application/json")
-    public ResponseEntity<String> insertLeaveForm(@RequestBody LeaveFormDTO leaveFormDTO) {
+    @PostMapping(path = "/{employee_Id}/leavetype/{leavetype_Id}/leaveform", consumes = "application/json", produces = "application/json")
+    public ResponseEntity<String> insertLeaveForm(@PathVariable int employee_Id, @Valid @RequestBody LeaveFormDTO leaveFormDTO, @PathVariable int leavetype_Id) {
         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.insertLeaveForm(leaveFormDTO);
+            message = leaveFormBusiness.insertLeaveForm(employee_Id, leaveFormDTO, leavetype_Id);
         } catch (InputException e) {
             message = e.getMessage();
         }

src/main/java/com/itsol/quantrivanphong/manage/timesheet/controller/TimeSheetController.java

@@ -35,7 +35,7 @@ public class TimeSheetController {
         return ResponseEntity.ok(timeSheetBusiness.deleteTimeSheet(employee_Id, timesheet_Id));
     }
 
-    @GetMapping(path = "/eproject/leaveform")
+    @GetMapping(path = "/timesheet")
     public List<TimeSheet> showAllTimeSheet() {
         return timeSheetBusiness.findAll();
     }
@@ -62,7 +62,7 @@ public class TimeSheetController {
 //        return ResponseEntity.ok(message);
 //    }
 
-    @GetMapping("/{employee_Id}/show")
+    @GetMapping("/{employee_Id}/timesheet")
     public ResponseEntity<List<TimeSheet>> showTimeSheetById(@PathVariable int employee_Id) {
         return ResponseEntity.ok(timeSheetBusiness.findTimeSheetById(employee_Id));
     }