ViSnezh

src/main/java/site/easystartup/web/project/controller/ProjectController.java

@@ -2,21 +2,26 @@ package site.easystartup.web.project.controller;
 
 import lombok.RequiredArgsConstructor;
 import org.modelmapper.ModelMapper;
-import org.springframework.stereotype.Controller;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import site.easystartup.web.project.domain.model.Project;
+import site.easystartup.web.project.domain.payload.requst.ParticipantRequest;
 import site.easystartup.web.project.domain.payload.requst.ProjectRequest;
+import site.easystartup.web.project.domain.payload.response.ResponseMessage;
 import site.easystartup.web.project.domain.validation.ResponseErrorValidation;
+import site.easystartup.web.project.dto.ParticipantDto;
 import site.easystartup.web.project.dto.ProjectDto;
 import site.easystartup.web.project.service.ProjectService;
 
 import javax.validation.Valid;
 import java.security.Principal;
-import java.util.Map;
+import java.util.List;
+import java.util.stream.Collectors;
 
-@Controller
+@RestController
 @RequiredArgsConstructor
 @RequestMapping("/project")
 public class ProjectController {
@@ -24,147 +29,101 @@ public class ProjectController {
     private final ResponseErrorValidation responseErrorValidation;
     private final ModelMapper modelMapper;
 
-    @PostMapping("/create")
+    @PostMapping("/")
-    public ModelAndView createProject(@Valid @ModelAttribute("project") ProjectRequest projectRequest,
+    public ResponseEntity<Object> createProject(@Valid @RequestBody ProjectRequest projectRequest,
                                                 BindingResult bindingResult,
                                                 Principal principal) {
-        ModelAndView modelAndView = new ModelAndView();
+        ResponseEntity<Object> errors = responseErrorValidation.mapValidationService(bindingResult);
-
+        if (!ObjectUtils.isEmpty(errors)) return errors;
-        if (bindingResult.hasErrors()) {
-            Map<String, String> errors = responseErrorValidation.mapValidationService(bindingResult);
-            return modelAndView.addObject("errors", errors);
-        }
 
         Project project = projectService.createProject(projectRequest, principal);
-        modelAndView.addObject("project", project);
+        return ResponseEntity.ok().body(modelMapper.map(project, ProjectDto.class));
-        modelAndView.setViewName("project");
-        return modelAndView;
     }
 
-    @PatchMapping("/{projectId}/edit")
+    @PatchMapping("/{projectId}")
-    public ModelAndView editProject(@Valid @ModelAttribute("projectUpdate") ProjectRequest projectRequest,
+    public ResponseEntity<Object> editProject(@Valid @RequestBody ProjectRequest projectRequest,
                                               @PathVariable("projectId") Long projectId,
                                               BindingResult bindingResult,
                                               Principal principal) {
-        ModelAndView modelAndView = new ModelAndView();
+        ResponseEntity<Object> errors = responseErrorValidation.mapValidationService(bindingResult);
+        if (!ObjectUtils.isEmpty(errors)) return errors;
 
-        if (bindingResult.hasErrors()) {
+        Project projectUpdated = projectService.editProject(projectRequest, projectId, principal);
-            Map<String, String> errors = responseErrorValidation.mapValidationService(bindingResult);
+        return ResponseEntity.ok().body(modelMapper.map(projectUpdated, ProjectDto.class));
-            return modelAndView.addObject("errors", errors);
     }
 
-        Project projectUpdated = projectService
+    @DeleteMapping("/{projectId}")
-                .editProject(projectRequest, projectId, principal);
+    public ResponseEntity<Object> deleteProject(@PathVariable("projectId") Long projectId,
-        modelAndView.addObject(projectUpdated);
-        modelAndView.setViewName("project");
-        return modelAndView;
-    }
-
-    @DeleteMapping("/{projectId}/delete")
-    public ModelAndView deleteProject(@PathVariable("projectId") Long projectId,
                                                 Principal principal) {
-        ModelAndView modelAndView = new ModelAndView();
         projectService.deleteProject(projectId, principal);
-        modelAndView.setViewName("redirect:/my");                                                           // some ?
+        return ResponseEntity.ok(new ResponseMessage("Project was deleted!"));
-        return modelAndView;
     }
 
     @GetMapping("/{projectId}")
-    public ModelAndView getProject(@PathVariable("projectId") Long projectId) {
+    public ResponseEntity<ProjectDto> getProject(@PathVariable("projectId") Long projectId) {
-        ModelAndView modelAndView = new ModelAndView();
+        return ResponseEntity.ok().body(modelMapper.map(projectService.getProjectById(projectId), ProjectDto.class));
-
-        modelAndView.addObject("project", projectService.getProjectById(projectId));
-        modelAndView.setViewName("project");
-
-        return modelAndView;
     }
 
+    //
     @GetMapping("/{userId}")
-    public ModelAndView getAllProjectsForUser(@PathVariable("userId") Long userId) {
+    public ResponseEntity<List<ProjectDto>> getAllProjectsForUser(@PathVariable("userId") Long userId) {
-        ModelAndView modelAndView = new ModelAndView();
+        List<ProjectDto> projects = projectService.getAllProjectsForUser(userId)
-
+                .stream().map(project -> modelMapper.map(project, ProjectDto.class)).collect(Collectors.toList());
-        modelAndView.addObject("projects", projectService.getAllProjectsForUser(userId));
+        return ResponseEntity.ok().body(projects);
-        modelAndView.setViewName("all-projects");
-        return modelAndView;
     }
 
     @GetMapping("/{technology}")
-    public ModelAndView getAllProjectsWithTechnology(@PathVariable("technology") String technology) {
+    public ResponseEntity<List<ProjectDto>> getAllProjectsWithTechnology(@PathVariable("technology") String technology) {
-        ModelAndView modelAndView = new ModelAndView();
+        List<ProjectDto> projects = projectService.getAllProjectsWithTechnology(technology)
-
+                .stream().map(project -> modelMapper.map(project, ProjectDto.class)).collect(Collectors.toList());
-        modelAndView.addObject("projects", projectService.getAllProjectsWithTechnology(technology));
+        return ResponseEntity.ok().body(projects);
-        modelAndView.setViewName("all-projects");
-        return modelAndView;
     }
 
     @GetMapping("/my")
-    public ModelAndView getAllProjectsForCurrentUser(Principal principal) {
+    public ResponseEntity<List<ProjectDto>> getAllProjectsForCurrentUser(Principal principal) {
-        ModelAndView modelAndView = new ModelAndView();
+        List<ProjectDto> projects = projectService.getAllProjectsForCurrentUser(principal)
-
+                .stream().map(project -> modelMapper.map(project, ProjectDto.class)).collect(Collectors.toList());
-        modelAndView.addObject(projectService.getAllProjectsForCurrentUser(principal));
+        return ResponseEntity.ok().body(projects);
-        modelAndView.setViewName("all-projects");
-        return modelAndView;
     }
 
 
-    @GetMapping("/{nameOfPosition}")
+    @GetMapping("/positions")
-    public ModelAndView getAllProjectsWithPosition(@PathVariable("nameOfPosition") String nameOfPosition) {
+    public ResponseEntity<List<ProjectDto>> getAllProjectsWithPosition(@RequestBody String nameOfPosition) {
-        ModelAndView modelAndView = new ModelAndView();
+        List<ProjectDto> projects = projectService.getAllProjectsWithPosition(nameOfPosition)
-
+                .stream().map(project -> modelMapper.map(project, ProjectDto.class)).collect(Collectors.toList());
-        modelAndView.addObject("projects", projectService.getAllProjectsWithPosition(nameOfPosition));
+        return ResponseEntity.ok().body(projects);
-        modelAndView.setViewName("all-projects");
-
-
-        return modelAndView;
     }
 
-    @GetMapping("/{commercialStatus}/commercialStatus")
+    @GetMapping("/commercial_status")
-    public ModelAndView getAllProjectsWithCommercialStatus(@PathVariable("commercialStatus") int commercialStatus) {
+    public ResponseEntity<List<ProjectDto>> getAllProjectsWithCommercialStatus(@RequestBody int commercialStatus) {
-        ModelAndView modelAndView = new ModelAndView();
+        List<ProjectDto> projects = projectService.getAllProjectsWithCommercialStatus(commercialStatus)
-
+                .stream().map(project -> modelMapper.map(project, ProjectDto.class)).collect(Collectors.toList());
-        modelAndView.addObject("projects", projectService.getAllProjectsWithCommercialStatus(commercialStatus));
+        return ResponseEntity.ok().body(projects);
-        modelAndView.setViewName("all-projects");
-
-
-        return modelAndView;
     }
 
-    @GetMapping("/{projectId}/requests")
+    @GetMapping("/requests")
-    public ModelAndView getAllRequestsForProject(@PathVariable("projectId") Long projectId) {
+    public ResponseEntity<List<ParticipantDto>> getAllRequestsForProject(@RequestBody Long projectId) {
-        ModelAndView modelAndView = new ModelAndView();
+        List<ParticipantDto> requests = projectService.getAllRequestsForProject(projectId)
-
+                .stream().map(project -> modelMapper.map(project, ParticipantDto.class)).collect(Collectors.toList());
-        modelAndView.addObject("participants", projectService.getAllRequestsForProject(projectId));
+        return ResponseEntity.ok().body(requests);
-        modelAndView.setViewName("project");
-
-        return modelAndView;
     }
 
-    @PostMapping("/{projectId}/{nameOfPosition}/apply")
+    @PostMapping("/apply")
-    public ModelAndView applyOnProject(@PathVariable("projectId") Long projectId,
+    public ResponseEntity<ProjectDto> applyOnProject(@RequestBody ParticipantRequest participantRequest,
-                                        @PathVariable("nameOfPosition") String nameOfPosition,
                                                      Principal principal) {
-        ModelAndView modelAndView = new ModelAndView();
+        Project project = projectService
-
+                .applyOnProject(participantRequest.getProjectId(), participantRequest.getNameOfPosition(), principal);
-        modelAndView.addObject("message", projectService.applyOnProject(projectId, nameOfPosition, principal));
+        return ResponseEntity.ok().body(modelMapper.map(project, ProjectDto.class));
-        modelAndView.addObject("project", modelMapper.map(projectService.getProjectById(projectId), ProjectDto.class));
-        modelAndView.setViewName("project");
-
-        return modelAndView;
     }
 
-    @PostMapping("/{projectId}/{participantId}/{nameOfPosition}")
+    @PostMapping("/participant")
-    public ModelAndView confirmParticipant(@PathVariable("projectId") Long projectId,
+    public ResponseEntity<ProjectDto> confirmParticipant(@RequestBody ParticipantRequest participantRequest,
-                                           @PathVariable("participantId") Long participantId,
-                                           @PathVariable("nameOfPosition") String nameOfPosition,
                                                          Principal principal) {
-        ModelAndView modelAndView = new ModelAndView();
+        Project project = projectService.confirmParticipant(participantRequest.getProjectId(),
+                participantRequest.getNameOfPosition(),
+                participantRequest.getParticipantId(),
+                principal);
 
-        modelAndView.addObject("message", projectService.confirmParticipant(projectId, nameOfPosition, participantId, principal));
+        return ResponseEntity.ok().body(modelMapper.map(project, ProjectDto.class));
-        modelAndView.addObject("project", projectService.getProjectById(projectId));
-        modelAndView.setViewName("project");
-
-        return modelAndView;
     }
-
-
 }

src/main/java/site/easystartup/web/project/domain/payload/requst/ParticipantRequest.java

@@ -0,0 +1,12 @@
+package site.easystartup.web.project.domain.payload.requst;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class ParticipantRequest {
+    private Long projectId;
+    private Long participantId;
+    private String nameOfPosition;
+}

src/main/java/site/easystartup/web/project/domain/validation/ResponseErrorValidation.java

@@ -1,5 +1,7 @@
 package site.easystartup.web.project.domain.validation;
 
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -12,7 +14,7 @@ import java.util.Map;
 @Service
 public class ResponseErrorValidation {
 
-    public Map<String, String> mapValidationService(BindingResult result) {
+    public ResponseEntity<Object> mapValidationService(BindingResult result) {
         if (result.hasErrors()) {
             Map<String, String> errorMap = new HashMap<>();
 
@@ -26,7 +28,7 @@ public class ResponseErrorValidation {
                 errorMap.put(error.getCode(), error.getDefaultMessage());
             }
 
-            return errorMap;
+            return new ResponseEntity<>(errorMap, HttpStatus.BAD_REQUEST);
         }
         return null;
     }

src/main/java/site/easystartup/web/project/service/ProjectService.java

@@ -93,7 +93,7 @@ public class ProjectService {
         return project.getParticipants();
     }
 
-    public Object confirmParticipant(Long projectId, String nameOfPosition, Long participantId, Principal principal) {
+    public Project confirmParticipant(Long projectId, String nameOfPosition, Long participantId, Principal principal) {
         Project project = getProjectById(projectId);
 
         if (!projectIsBelongUser(project, principal))
@@ -107,7 +107,7 @@ public class ProjectService {
             }
         });
         projectRepo.save(project);
-        return new ResponseMessage("User was confirm");
+        return projectRepo.save(project);
     }
 
     private Project projectRequestToProject(ProjectRequest projectRequest, Principal principal) {