refactor[WW-67-fix] fix conflict

src/main/java/com/example/codeE/controller/UserController.java

@@ -2,7 +2,7 @@
 
 import com.example.codeE.model.common.Pagination;
 import com.example.codeE.model.user.User;
-import com.example.codeE.request.user.CommonUserRequest;
+// import com.example.codeE.request.user.ExportExcelRequest;
 import com.example.codeE.request.user.GetUsersRequest;
 import com.example.codeE.request.user.UpdateUserRequest;
 import com.example.codeE.service.user.UserService;
@@ -79,6 +79,17 @@ public ResponseEntity<?> importUsersByExcel(@RequestParam("file") MultipartFile
         return ResponseEntity.ok(Map.of("message" , " Users data uploaded and saved to database successfully"));
     }
 
+    //get api export excel 
+    // @GetMapping
+    // @RequestMapping(value = "/export-users",method = RequestMethod.GET)
+    // public ResponseEntity<?> exportUsersByExcel(@RequestBody ExportExcelRequest request) {
+    //     var result = this.userService.exportExcel();
+    //     if(result){
+    //         return ResponseEntity.ok(Map.of("message" , " Users data exported to excel successfully"));
+    //     }
+    //     return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(Map.of("message" , " Users data exported to excel failed"));
+    // }
+
     @DeleteMapping
     @RequestMapping(value = "{userId}",method = RequestMethod.DELETE)
     public ResponseEntity<?> deleteById(@PathVariable String userId){

src/main/java/com/example/codeE/request/user/ExportExcelRequest.java

@@ -0,0 +1,20 @@
+package com.example.codeE.request.user;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ExportExcelRequest {
+    @NotBlank
+    private String fileName;
+    @NotBlank
+    private String courseId;
+}

src/main/java/com/example/codeE/service/user/UserImpl.java

@@ -7,14 +7,17 @@
 import com.example.codeE.request.user.UpdateUserRequest;
 import com.example.codeE.security.BCryptPassword;
 import com.example.codeE.helper.ExcelHelper;
-import jakarta.persistence.EntityNotFoundException;
 import jakarta.validation.constraints.NotBlank;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
 
 @Service
 public class UserImpl implements UserService {
@@ -114,4 +117,14 @@ public boolean saveUserToDatabase(MultipartFile file) {
         }
         return false;
     }
+
+    // @Override
+    // public boolean exportExcel() {
+    //     // List<User> users = (List<User>) this.userRepository.findAll();
+    //     // if (users.size() > 0) {
+    //     //     ExcelHelper.writeExcel(users, "Users", user);
+    //     //     return true;
+    //     // }
+    //     return false;
+    // }
 }

src/main/java/com/example/codeE/service/user/UserService.java

@@ -11,6 +11,7 @@
 public interface UserService extends CommonService<User> {
     List<User> getUsersByRoleAndSearchKeyword(GetUsersRequest getUsersRequest);
     List<User> paginateUsers(GetUsersRequest getUsersRequest);
-    User updateById(String userId, UpdateUserRequest updatedUser);
     boolean saveUserToDatabase(MultipartFile file);
+    // boolean exportExcel();
+    User updateById(String userId, UpdateUserRequest updatedUser);
 }