Merge remote-tracking branch 'origin/main'

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

@@ -8,6 +8,7 @@ import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import site.easystartup.easystartupcore.project.domain.model.Project;
+import site.easystartup.easystartupcore.project.domain.payload.response.ResponseMessage;
 import site.easystartup.easystartupcore.project.domain.validation.ResponseErrorValidation;
 import site.easystartup.easystartupcore.project.dto.ProjectDto;
 import site.easystartup.easystartupcore.project.service.ProjectService;
@@ -23,69 +24,124 @@ public class ProjectController {
     private final ResponseErrorValidation responseErrorValidation;
     private final ModelMapper modelMapper;
 
-//    @PostMapping("/create")
+    @PostMapping("/create")
-//    public ModelAndView createProject(@ModelAttribute("project") ProjectDto projectDto,
+    public ModelAndView createProject(@ModelAttribute("project") ProjectDto projectDto,
-//                                      BindingResult bindingResult,
+                                      BindingResult bindingResult,
-//                                      Principal principal) {
+                                      Principal principal) {
-//        ModelAndView modelAndView = new ModelAndView();
+        ModelAndView modelAndView = new ModelAndView();
-//
+
-//        if (bindingResult.hasErrors()) {
+        if (bindingResult.hasErrors()) {
-//            Map<String, String> errors = responseErrorValidation.mapValidationService(bindingResult);
+            Map<String, String> errors = responseErrorValidation.mapValidationService(bindingResult);
-//            return modelAndView.addObject("errors", errors);
+            return modelAndView.addObject("errors", errors);
-//        }
+        }
-//
+
-//        Project project = projectService.createProject(modelMapper.map(projectDto, Project.class), principal);
+        Project project = projectService.createProject(modelMapper.map(projectDto, Project.class), principal);
-//        modelAndView.addObject("project", project);
+        modelAndView.addObject("project", project);
-//        modelAndView.setViewName("project");
+        modelAndView.setViewName("project");
-//        return modelAndView;
+        return modelAndView;
-//    }
+    }
-//
+
-//    @PatchMapping("/{projectId}/update")
+    @PatchMapping("/{projectId}/update")
-//    public ModelAndView updateProject() {
+    public ModelAndView updateProject(@ModelAttribute("projectUpdate") ProjectDto projectDto,
-//        ModelAndView modelAndView = new ModelAndView();
+                                      @PathVariable("projectId") Long projectId,
-//
+                                      BindingResult bindingResult,
-//        return modelAndView;
+                                      Principal principal) {
-//    }
+        ModelAndView modelAndView = new ModelAndView();
-//
+
-//    @DeleteMapping("/{projectId}/delete")
+        if (bindingResult.hasErrors()) {
-//    public ModelAndView deleteProject() {
+            Map<String, String> errors = responseErrorValidation.mapValidationService(bindingResult);
-//        ModelAndView modelAndView = new ModelAndView();
+            return modelAndView.addObject("errors", errors);
-//
+        }
-//        return modelAndView;
+
-//    }
+        Project projectUpdated = projectService
-//
+                .updateProject(modelMapper.map(projectDto, Project.class), projectId, principal);
-//    @GetMapping("/{projectId}")
+        modelAndView.addObject(projectUpdated);
-//    public ModelAndView getProject() {
+        modelAndView.setViewName("project");
-//        ModelAndView modelAndView = new ModelAndView();
+        return modelAndView;
-//
+    }
-//        return modelAndView;
+
-//    }
+    @DeleteMapping("/{projectId}/delete")
-//
+    public ModelAndView deleteProject(@PathVariable("projectId") Long projectId,
-//    @GetMapping("/{userId}")
+                                      Principal principal) {
-//    public ModelAndView getAllProjectsForUser() {
+        ModelAndView modelAndView = new ModelAndView();
-//    }
+        projectService.deleteProject(projectId, principal);
-//
+        modelAndView.setViewName("redirect:/my");                                                           // some ?
-//    @GetMapping("/{technology}")
+        return modelAndView;
-//    public ModelAndView getAllProjectsWithTechnology() {
+    }
-//    }
+
-//
+    @GetMapping("/{projectId}")
-//    @GetMapping("/my")
+    public ModelAndView getProject(@PathVariable("projectId") Long projectId) {
-//    public ModelAndView getAllProjectsForCurrentUser() {
+        ModelAndView modelAndView = new ModelAndView();
-//    }
+
-//
+        modelAndView.addObject("project", projectService.getProjectById(projectId));
-//    @PostMapping("/{projectId}/applay")
+        modelAndView.setViewName("project");
-//    public ModelAndView applayOnProject() {
+
-//        ModelAndView modelAndView = new ModelAndView();
+        return modelAndView;
-//
+    }
-//        return modelAndView;
+
-//    }
+    @GetMapping("/{userId}")
-//
+    public ModelAndView getAllProjectsForUser(@PathVariable("userId") Long userId) {
-//    @PostMapping("/{projectId}/{participantId}")
+        ModelAndView modelAndView = new ModelAndView();
-//    public ModelAndView confirmParticipant() {
+
-//        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.addObject("projects", projectService.getAllProjectsForUser(userId));
-//
+        modelAndView.setViewName("all-projects");
-//        return modelAndView;
+        return modelAndView;
-//    }
+    }
+
+    @GetMapping("/{technology}")
+    public ModelAndView getAllProjectsWithTechnology(@PathVariable("technology") String technology) {
+        ModelAndView modelAndView = new ModelAndView();
+
+        modelAndView.addObject("projects", projectService.getAllProjectsWithTechnology(technology));
+        modelAndView.setViewName("all-projects");
+        return modelAndView;
+    }
+
+    @GetMapping("/my")
+    public ModelAndView getAllProjectsForCurrentUser(Principal principal) {
+        ModelAndView modelAndView = new ModelAndView();
+
+        modelAndView.addObject(projectService.getAllProjectsForCurrentUser(principal));
+        modelAndView.setViewName("all-projects");
+        return modelAndView;
+    }
+
+
+    @GetMapping("/{nameOfPosition}")
+    public ModelAndView getAllProjectsWithPosition(@PathVariable("nameOfPosition") String nameOfPosition) {
+        ModelAndView modelAndView = new ModelAndView();
+
+        modelAndView.addObject("projects", projectService.getAllProjectsWithPosition(nameOfPosition));
+        modelAndView.setViewName("all-projects");
+
+
+        return modelAndView;
+    }
+
+    @PostMapping("/{projectId}/applay")
+    public ModelAndView applayOnProject(@PathVariable("projectId") Long projectId,
+                                        Principal principal) {
+        ModelAndView modelAndView = new ModelAndView();
+
+        modelAndView.addObject("message", projectService.applayOnProject(projectId, principal));
+        modelAndView.addObject("project", modelMapper.map(projectService.getProjectById(projectId), ProjectDto.class));
+        modelAndView.setViewName("project");
+
+        return modelAndView;
+    }
+
+    @PostMapping("/{projectId}/{participantId}")
+    public ModelAndView confirmParticipant(@PathVariable("projectId") Long projectId,
+                                           @PathVariable("participantId") Long participantId,
+                                           Principal principal) {
+        ModelAndView modelAndView = new ModelAndView();
+
+        modelAndView.addObject("message", projectService.confirmParticipant(projectId, participantId, principal));
+        modelAndView.addObject("project", projectService.getProjectById(projectId));
+        modelAndView.setViewName("project");
+
+        return modelAndView;
+    }
 
 
 }

src/main/java/site/easystartup/easystartupcore/project/domain/model/Participant.java

@@ -28,7 +28,7 @@ public class Participant {
     private String nameOfPosition;
     @ManyToOne
     @JoinColumn(name = "user_id")
-    private User userId;
+    private User user;
 
     @OneToMany
     private Set<User> requests;

src/main/java/site/easystartup/easystartupcore/project/domain/payload/response/ResponseMessage.java

@@ -0,0 +1,12 @@
+package site.easystartup.easystartupcore.project.domain.payload.response;
+
+import lombok.Data;
+
+@Data
+public class ResponseMessage {
+    private String message;
+
+    public ResponseMessage(String message) {
+        this.message = message;
+    }
+}

src/main/java/site/easystartup/easystartupcore/project/dto/ParticipantDto.java

@@ -12,6 +12,6 @@ public class ParticipantDto implements Serializable {
     @NotNull
     private final String technology;
     private final String nameOfPosition;
-    private final UserDto userId;
+    private final UserDto user;
     private final Set<UserDto> requests;
 }

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

@@ -6,6 +6,7 @@ import site.easystartup.easystartupcore.project.domain.model.Project;
 import site.easystartup.easystartupcore.project.repo.ProjectRepo;
 
 import java.security.Principal;
+import java.util.Set;
 
 @Service
 @RequiredArgsConstructor
@@ -16,4 +17,33 @@ public class ProjectService {
     public Project createProject(Project project, Principal principal) {
         return null;
     }
+
+    public Project updateProject(Project map, Long projectId, Principal principal) {
+    }
+
+    public void deleteProject(Long projectId, Principal principal) {
+    }
+
+    public Project getProjectById(Long projectId) {
+    }
+
+    public Set<Project> getAllProjectsForUser(Long userId) {
+        
+        
+    }
+
+    public Set<Project> getAllProjectsWithTechnology(String technology) {
+    }
+
+    public Set<Project> getAllProjectsForCurrentUser(Principal principal) {
+    }
+
+    public Set<Project> getAllProjectsWithPosition(String nameOfPosition) {
+    }
+
+    public Object applayOnProject(Long projectId, Principal principal) {
+    }
+
+    public Object confirmParticipant(Long projectId, Long participantId, Principal principal) {
+    }
 }

src/main/resources/templates/all-projects.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>