Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/java/site/easystartup/web/project/service/ProjectService.java
#	src/main/java/site/easystartup/web/service/UserService.java

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

@@ -0,0 +1,145 @@
+package site.easystartup.web.project.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.modelmapper.ModelMapper;
+import org.springframework.stereotype.Controller;
+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.validation.ResponseErrorValidation;
+import site.easystartup.web.project.dto.ProjectDto;
+import site.easystartup.web.project.service.ProjectService;
+
+import java.security.Principal;
+import java.util.Map;
+
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/project")
+public class ProjectController {
+    private final ProjectService projectService;
+    private final ResponseErrorValidation responseErrorValidation;
+    private final ModelMapper modelMapper;
+
+    @PostMapping("/create")
+    public ModelAndView createProject(@ModelAttribute("project") ProjectDto projectDto,
+                                      BindingResult bindingResult,
+                                      Principal principal) {
+        ModelAndView modelAndView = new ModelAndView();
+
+        if (bindingResult.hasErrors()) {
+            Map<String, String> errors = responseErrorValidation.mapValidationService(bindingResult);
+            return modelAndView.addObject("errors", errors);
+        }
+
+        Project project = projectService.createProject(modelMapper.map(projectDto, Project.class), principal);
+        modelAndView.addObject("project", project);
+        modelAndView.setViewName("project");
+        return modelAndView;
+    }
+
+    @PatchMapping("/{projectId}/update")
+    public ModelAndView updateProject(@ModelAttribute("projectUpdate") ProjectDto projectDto,
+                                      @PathVariable("projectId") Long projectId,
+                                      BindingResult bindingResult,
+                                      Principal principal) {
+        ModelAndView modelAndView = new ModelAndView();
+
+        if (bindingResult.hasErrors()) {
+            Map<String, String> errors = responseErrorValidation.mapValidationService(bindingResult);
+            return modelAndView.addObject("errors", errors);
+        }
+
+        Project projectUpdated = projectService
+                .updateProject(modelMapper.map(projectDto, Project.class), projectId, principal);
+        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 modelAndView;
+    }
+
+    @GetMapping("/{projectId}")
+    public ModelAndView getProject(@PathVariable("projectId") Long projectId) {
+        ModelAndView modelAndView = new ModelAndView();
+
+        modelAndView.addObject("project", projectService.getProjectById(projectId));
+        modelAndView.setViewName("project");
+
+        return modelAndView;
+    }
+
+    @GetMapping("/{userId}")
+    public ModelAndView getAllProjectsForUser(@PathVariable("userId") Long userId) {
+        ModelAndView modelAndView = new ModelAndView();
+
+        modelAndView.addObject("projects", projectService.getAllProjectsForUser(userId));
+        modelAndView.setViewName("all-projects");
+        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/web/project/domain/model/Participant.java

@@ -0,0 +1,35 @@
+package site.easystartup.web.project.domain.model;
+
+import lombok.Data;
+import site.easystartup.web.domain.User;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Set;
+
+@Data
+@Entity
+@Table(name = "participant")
+public class Participant {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "participant_id")
+    private Long participantId;
+
+    @ManyToOne
+    @JoinColumn(name = "project_id", updatable = false)
+    private Project project;
+
+    @Column(name = "technology")
+    @NotNull
+    private String technology;
+
+    @Column(name = "name_of_position")
+    private String nameOfPosition;
+    @ManyToOne
+    @JoinColumn(name = "user_id")
+    private User user;
+
+    @OneToMany
+    private Set<User> requests;
+}

src/main/java/site/easystartup/web/project/domain/model/Project.java

@@ -0,0 +1,57 @@
+package site.easystartup.web.project.domain.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import site.easystartup.web.domain.User;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@Entity
+@Table(name = "project")
+public class Project {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "project_id")
+    private Long projectId;
+
+    @Column(name = "cover_link")
+    private String coverLink;
+
+    @Column(name = "title")
+    @Size(min = 3, max = 100, message = "Title should be no less 3 and no more 100 signs")
+    @NotNull
+    private String title;
+
+    @Column(name = "description")
+    @Size(min = 50, message = "Description should be no less 50 signs")
+    @NotNull
+    private String description;
+
+    @Column(name = "commercial_status") // 1 - commercial, 0 - non-commercial
+    private int commercialStatus;
+
+    @Column(name = "technology")
+    @NotNull
+    private String technology;
+
+    @ManyToOne
+    @JoinColumn(name = "owner_id")
+    private User owner;
+
+    @OneToMany(mappedBy = "project", cascade = {CascadeType.ALL})
+    private List<Participant> participants;
+
+    @Column(name = "created_date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createdDate;
+
+    @PrePersist
+    private void createdDate() {
+        this.createdDate = LocalDateTime.now();
+    }
+}

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

@@ -0,0 +1,12 @@
+package site.easystartup.web.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/web/project/domain/validation/ResponseErrorValidation.java

@@ -0,0 +1,33 @@
+package site.easystartup.web.project.domain.validation;
+
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+import org.springframework.validation.ObjectError;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class ResponseErrorValidation {
+
+    public Map<String, String> mapValidationService(BindingResult result) {
+        if (result.hasErrors()) {
+            Map<String, String> errorMap = new HashMap<>();
+
+            if (!CollectionUtils.isEmpty(result.getAllErrors())) {
+                for (ObjectError error : result.getAllErrors()) {
+                    errorMap.put(error.getCode(), error.getDefaultMessage());
+                }
+            }
+
+            for (FieldError error : result.getFieldErrors()) {
+                errorMap.put(error.getCode(), error.getDefaultMessage());
+            }
+
+            return errorMap;
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,17 @@
+package site.easystartup.web.project.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Set;
+
+@Data
+public class ParticipantDto implements Serializable {
+    private final Long participantId;
+    @NotNull
+    private final String technology;
+    private final String nameOfPosition;
+    private final UserDto user;
+    private final Set<UserDto> requests;
+}

src/main/java/site/easystartup/web/project/dto/ProjectDto.java

@@ -0,0 +1,26 @@
+package site.easystartup.web.project.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class ProjectDto implements Serializable {
+    private final Long projectId;
+    private final String coverLink;
+    @Size(min = 3, max = 100, message = "Title should be no less 3 and no more 100 signs")
+    @NotNull
+    private final String title;
+    @Size(min = 50, message = "Description should be no less 50 signs")
+    @NotNull
+    private final String description;
+    private final int commercialStatus;
+    @NotNull
+    private final String technology;
+    private final List<ParticipantDto> participants;
+    private final LocalDateTime createdDate;
+}

src/main/java/site/easystartup/web/project/dto/UserDto.java

@@ -0,0 +1,23 @@
+package site.easystartup.web.project.dto;
+
+import lombok.Data;
+import site.easystartup.web.domain.Role;
+
+import java.io.Serializable;
+import java.util.Set;
+
+@Data
+public class UserDto implements Serializable {
+    private final long id;
+    private final String username;
+    private final String password;
+    private final boolean active;
+    private final String full_name;
+    private final String status;
+    private final String iconPath;
+    private final String email;
+    private final Set<String> tags;
+    private final Set<String> professions;
+    private final Set<Long> projects;
+    private final Set<Role> roles;
+}

src/main/java/site/easystartup/web/project/repo/ProjectRepo.java

@@ -0,0 +1,9 @@
+package site.easystartup.web.project.repo;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import site.easystartup.web.project.domain.model.Project;
+
+@Repository
+public interface ProjectRepo extends JpaRepository<Project, Long> {
+}

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

@@ -0,0 +1,49 @@
+package site.easystartup.web.project.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import site.easystartup.web.project.domain.model.Project;
+import site.easystartup.web.project.repo.ProjectRepo;
+
+import java.security.Principal;
+import java.util.Set;
+
+@Service
+@RequiredArgsConstructor
+public class ProjectService {
+    private final ProjectRepo projectRepo;
+
+
+    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) {
+    }
+}