refactor v2

src/main/java/com/iconplus/smartproc/controller/UsersController.java

@@ -2,8 +2,15 @@ package com.iconplus.smartproc.controller;
 
 import com.iconplus.smartproc.model.entity.Users;
 import com.iconplus.smartproc.exception.ResourceNotFoundException;
+import com.iconplus.smartproc.model.request.RolesRequest;
+import com.iconplus.smartproc.model.request.UsersRequest;
+import com.iconplus.smartproc.model.response.GetRolesResponse;
+import com.iconplus.smartproc.model.response.GetUsersResponse;
 import com.iconplus.smartproc.repository.UsersRepository;
+import com.iconplus.smartproc.service.manajemenuser.GetListUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,10 +25,36 @@ public class UsersController {
 	@Autowired
 	private UsersRepository usersRepository;
 
-	//get all data
+	private final GetListUserService getListUserService;
+	public UsersController(GetListUserService getListUserService) {
+		this.getListUserService = getListUserService;
+	}
+
+
 	@GetMapping
-	public List<Users> getAllUserss(){
-		return usersRepository.findAll();
+	public GetUsersResponse getUsers(@RequestParam(name = "search", required = false) String search,
+									 @RequestParam(name = "instansi", required = false) String instansi,
+									 @RequestParam(name = "bidang", required = false) String bidang,
+									 @RequestParam(name = "nama", required = false) String nama,
+									 @RequestParam(name = "jabatan", required = false) String jabatan,
+									 @RequestParam(name = "role", required = false) String role,
+									 @RequestParam(name = "email", required = false) String email,
+									 @RequestParam(name = "page", defaultValue = "1") Integer page,
+									 @RequestParam(name = "size", defaultValue = "5") Integer size){
+
+		Pageable pageable = PageRequest.of((page - 1), size);
+		UsersRequest usersRequest = UsersRequest.builder()
+				.search(search)
+				.instansi(instansi)
+				.bidang(bidang)
+				.nama(nama)
+				.jabatan(jabatan)
+				.role(role)
+				.email(email)
+				.pageable(pageable)
+				.build();
+
+		return getListUserService.execute(usersRequest);
 	}
 
 	// create
@@ -45,7 +78,7 @@ public class UsersController {
 				.orElseThrow(() -> new ResourceNotFoundException("Users not exist with id :" + id));
 
 		users.setUsername(usersDetails.getUsername());
-		users.setFullname(usersDetails.getFullname());
+		users.setNama(usersDetails.getNama());
 		users.setEmail(usersDetails.getEmail());
 		users.setPassword(usersDetails.getPassword());
 //		users.setInstansi(usersDetails.getInstansi());