ViSnezh
This commit is contained in:
Viktoria committed
1 parent
b54329977d
commit
00b019bb82
4 files changed
+82
-109
No files matched your search
@@ -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")
|
||||
public ModelAndView createProject(@Valid @ModelAttribute("project") ProjectRequest projectRequest,
|
||||
@PostMapping("/")
|
||||
public ResponseEntity<Object> createProject(@Valid @RequestBody ProjectRequest projectRequest,
|
||||
BindingResult bindingResult,
|
||||
Principal principal) {
|
||||
ModelAndView modelAndView = new ModelAndView();
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
Map<String, String> errors = responseErrorValidation.mapValidationService(bindingResult);
|
||||
return modelAndView.addObject("errors", errors);
|
||||
}
|
||||
ResponseEntity<Object> errors = responseErrorValidation.mapValidationService(bindingResult);
|
||||
if (!ObjectUtils.isEmpty(errors)) return errors;
|
||||
|
||||
Project project = projectService.createProject(projectRequest, principal);
|
||||
modelAndView.addObject("project", project);
|
||||
modelAndView.setViewName("project");
|
||||
return modelAndView;
|
||||
return ResponseEntity.ok().body(modelMapper.map(project, ProjectDto.class));
|
||||
}
|
||||
|
||||
@PatchMapping("/{projectId}/edit")
|
||||
public ModelAndView editProject(@Valid @ModelAttribute("projectUpdate") ProjectRequest projectRequest,
|
||||
@PatchMapping("/{projectId}")
|
||||
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()) {
|
||||
Map<String, String> errors = responseErrorValidation.mapValidationService(bindingResult);
|
||||
return modelAndView.addObject("errors", errors);
|
||||
Project projectUpdated = projectService.editProject(projectRequest, projectId, principal);
|
||||
return ResponseEntity.ok().body(modelMapper.map(projectUpdated, ProjectDto.class));
|
||||
}
|
||||
|
||||
Project projectUpdated = projectService
|
||||
.editProject(projectRequest, projectId, principal);
|
||||
modelAndView.addObject(projectUpdated);
|
||||
modelAndView.setViewName("project");
|
||||
return modelAndView;
|
||||
}
|
||||
|
||||
@DeleteMapping("/{projectId}/delete")
|
||||
public ModelAndView deleteProject(@PathVariable("projectId") Long projectId,
|
||||
@DeleteMapping("/{projectId}")
|
||||
public ResponseEntity<Object> deleteProject(@PathVariable("projectId") Long projectId,
|
||||
Principal principal) {
|
||||
ModelAndView modelAndView = new ModelAndView();
|
||||
projectService.deleteProject(projectId, principal);
|
||||
modelAndView.setViewName("redirect:/my"); // some ?
|
||||
return modelAndView;
|
||||
return ResponseEntity.ok(new ResponseMessage("Project was deleted!"));
|
||||
}
|
||||
|
||||
@GetMapping("/{projectId}")
|
||||
public ModelAndView getProject(@PathVariable("projectId") Long projectId) {
|
||||
ModelAndView modelAndView = new ModelAndView();
|
||||
|
||||
modelAndView.addObject("project", projectService.getProjectById(projectId));
|
||||
modelAndView.setViewName("project");
|
||||
|
||||
return modelAndView;
|
||||
public ResponseEntity<ProjectDto> getProject(@PathVariable("projectId") Long projectId) {
|
||||
return ResponseEntity.ok().body(modelMapper.map(projectService.getProjectById(projectId), ProjectDto.class));
|
||||
}
|
||||
|
||||
//
|
||||
@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;
|
||||
public ResponseEntity<List<ProjectDto>> getAllProjectsForUser(@PathVariable("userId") Long userId) {
|
||||
List<ProjectDto> projects = projectService.getAllProjectsForUser(userId)
|
||||
.stream().map(project -> modelMapper.map(project, ProjectDto.class)).collect(Collectors.toList());
|
||||
return ResponseEntity.ok().body(projects);
|
||||
}
|
||||
|
||||
@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;
|
||||
public ResponseEntity<List<ProjectDto>> getAllProjectsWithTechnology(@PathVariable("technology") String technology) {
|
||||
List<ProjectDto> projects = projectService.getAllProjectsWithTechnology(technology)
|
||||
.stream().map(project -> modelMapper.map(project, ProjectDto.class)).collect(Collectors.toList());
|
||||
return ResponseEntity.ok().body(projects);
|
||||
}
|
||||
|
||||
@GetMapping("/my")
|
||||
public ModelAndView getAllProjectsForCurrentUser(Principal principal) {
|
||||
ModelAndView modelAndView = new ModelAndView();
|
||||
|
||||
modelAndView.addObject(projectService.getAllProjectsForCurrentUser(principal));
|
||||
modelAndView.setViewName("all-projects");
|
||||
return modelAndView;
|
||||
public ResponseEntity<List<ProjectDto>> getAllProjectsForCurrentUser(Principal principal) {
|
||||
List<ProjectDto> projects = projectService.getAllProjectsForCurrentUser(principal)
|
||||
.stream().map(project -> modelMapper.map(project, ProjectDto.class)).collect(Collectors.toList());
|
||||
return ResponseEntity.ok().body(projects);
|
||||
}
|
||||
|
||||
|
||||
@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;
|
||||
@GetMapping("/positions")
|
||||
public ResponseEntity<List<ProjectDto>> getAllProjectsWithPosition(@RequestBody String nameOfPosition) {
|
||||
List<ProjectDto> projects = projectService.getAllProjectsWithPosition(nameOfPosition)
|
||||
.stream().map(project -> modelMapper.map(project, ProjectDto.class)).collect(Collectors.toList());
|
||||
return ResponseEntity.ok().body(projects);
|
||||
}
|
||||
|
||||
@GetMapping("/{commercialStatus}/commercialStatus")
|
||||
public ModelAndView getAllProjectsWithCommercialStatus(@PathVariable("commercialStatus") int commercialStatus) {
|
||||
ModelAndView modelAndView = new ModelAndView();
|
||||
|
||||
modelAndView.addObject("projects", projectService.getAllProjectsWithCommercialStatus(commercialStatus));
|
||||
modelAndView.setViewName("all-projects");
|
||||
|
||||
|
||||
return modelAndView;
|
||||
@GetMapping("/commercial_status")
|
||||
public ResponseEntity<List<ProjectDto>> getAllProjectsWithCommercialStatus(@RequestBody int commercialStatus) {
|
||||
List<ProjectDto> projects = projectService.getAllProjectsWithCommercialStatus(commercialStatus)
|
||||
.stream().map(project -> modelMapper.map(project, ProjectDto.class)).collect(Collectors.toList());
|
||||
return ResponseEntity.ok().body(projects);
|
||||
}
|
||||
|
||||
@GetMapping("/{projectId}/requests")
|
||||
public ModelAndView getAllRequestsForProject(@PathVariable("projectId") Long projectId) {
|
||||
ModelAndView modelAndView = new ModelAndView();
|
||||
|
||||
modelAndView.addObject("participants", projectService.getAllRequestsForProject(projectId));
|
||||
modelAndView.setViewName("project");
|
||||
|
||||
return modelAndView;
|
||||
@GetMapping("/requests")
|
||||
public ResponseEntity<List<ParticipantDto>> getAllRequestsForProject(@RequestBody Long projectId) {
|
||||
List<ParticipantDto> requests = projectService.getAllRequestsForProject(projectId)
|
||||
.stream().map(project -> modelMapper.map(project, ParticipantDto.class)).collect(Collectors.toList());
|
||||
return ResponseEntity.ok().body(requests);
|
||||
}
|
||||
|
||||
@PostMapping("/{projectId}/{nameOfPosition}/apply")
|
||||
public ModelAndView applyOnProject(@PathVariable("projectId") Long projectId,
|
||||
@PathVariable("nameOfPosition") String nameOfPosition,
|
||||
@PostMapping("/apply")
|
||||
public ResponseEntity<ProjectDto> applyOnProject(@RequestBody ParticipantRequest participantRequest,
|
||||
Principal principal) {
|
||||
ModelAndView modelAndView = new ModelAndView();
|
||||
|
||||
modelAndView.addObject("message", projectService.applyOnProject(projectId, nameOfPosition, principal));
|
||||
modelAndView.addObject("project", modelMapper.map(projectService.getProjectById(projectId), ProjectDto.class));
|
||||
modelAndView.setViewName("project");
|
||||
|
||||
return modelAndView;
|
||||
Project project = projectService
|
||||
.applyOnProject(participantRequest.getProjectId(), participantRequest.getNameOfPosition(), principal);
|
||||
return ResponseEntity.ok().body(modelMapper.map(project, ProjectDto.class));
|
||||
}
|
||||
|
||||
@PostMapping("/{projectId}/{participantId}/{nameOfPosition}")
|
||||
public ModelAndView confirmParticipant(@PathVariable("projectId") Long projectId,
|
||||
@PathVariable("participantId") Long participantId,
|
||||
@PathVariable("nameOfPosition") String nameOfPosition,
|
||||
@PostMapping("/participant")
|
||||
public ResponseEntity<ProjectDto> confirmParticipant(@RequestBody ParticipantRequest participantRequest,
|
||||
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));
|
||||
modelAndView.addObject("project", projectService.getProjectById(projectId));
|
||||
modelAndView.setViewName("project");
|
||||
|
||||
return modelAndView;
|
||||
return ResponseEntity.ok().body(modelMapper.map(project, ProjectDto.class));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
+12
@@ -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;
|
||||
}
|
||||
+4
-2
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in new issue
Block a user