Change mapping to Rest

This commit is contained in:
redtea committed 2022-08-30 23:26:56 +03:00
1 parent 10a8502491
commit e46e304975
43 files changed
+597 -206

No files matched your search

@@ -6,12 +6,11 @@ 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.domain.requst.ParticipantRequest;
import site.easystartup.web.project.domain.requst.ProjectRequest;
import site.easystartup.web.domain.response.ResponseMessage;
import site.easystartup.web.domain.validation.ResponseErrorValidation;
import site.easystartup.web.project.dto.ParticipantDto;
import site.easystartup.web.project.dto.ProjectDto;
import site.easystartup.web.project.service.ProjectService;
@@ -2,7 +2,7 @@ package site.easystartup.web.project.domain.model;
import lombok.*;
import org.hibernate.Hibernate;
import site.easystartup.web.domain.User;
import site.easystartup.web.domain.model.User;
import javax.persistence.*;
import java.util.List;
@@ -3,7 +3,7 @@ package site.easystartup.web.project.domain.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.*;
import org.hibernate.Hibernate;
import site.easystartup.web.domain.User;
import site.easystartup.web.domain.model.User;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
@@ -1,12 +0,0 @@
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;
}
}
@@ -1,4 +1,4 @@
package site.easystartup.web.project.domain.payload.requst;
package site.easystartup.web.project.domain.requst;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -1,4 +1,4 @@
package site.easystartup.web.project.domain.payload.requst;
package site.easystartup.web.project.domain.requst;
import lombok.Data;
import lombok.RequiredArgsConstructor;
@@ -1,35 +0,0 @@
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;
import org.springframework.validation.FieldError;
import org.springframework.validation.ObjectError;
import java.util.HashMap;
import java.util.Map;
@Service
public class ResponseErrorValidation {
public ResponseEntity<Object> 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 new ResponseEntity<>(errorMap, HttpStatus.BAD_REQUEST);
}
return null;
}
}
@@ -1,7 +1,7 @@
package site.easystartup.web.project.dto;
import lombok.Data;
import site.easystartup.web.domain.Role;
import site.easystartup.web.domain.model.Role;
import java.io.Serializable;
import java.util.Set;
@@ -12,5 +12,5 @@ import java.util.LinkedHashSet;
@Repository
public interface ParticipantRepo extends JpaRepository<Participant, Long> {
@Query ("SELECT Project FROM Participant WHERE nameOfPosition = :nameOfPosition")
LinkedHashSet<Project> findAllByNameOfPosition(@Param("nameOfPosition") String nameOfPosition);
LinkedHashSet<Project> findAllByNameOfPosition(@Param("nameOfPosition") String name);
}
@@ -4,11 +4,10 @@ import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import site.easystartup.web.domain.User;
import site.easystartup.web.domain.model.User;
import site.easystartup.web.project.domain.model.Project;
import java.util.List;
import java.util.Set;
@Repository
public interface ProjectRepo extends JpaRepository<Project, Long> {
@@ -3,12 +3,11 @@ package site.easystartup.web.project.service;
import lombok.RequiredArgsConstructor;
import org.modelmapper.ModelMapper;
import org.springframework.stereotype.Service;
import site.easystartup.web.domain.User;
import site.easystartup.web.domain.model.User;
import site.easystartup.web.project.domain.exception.ProjectNotFoundException;
import site.easystartup.web.project.domain.model.Participant;
import site.easystartup.web.project.domain.model.Project;
import site.easystartup.web.project.domain.payload.requst.ProjectRequest;
import site.easystartup.web.project.domain.payload.response.ResponseMessage;
import site.easystartup.web.project.domain.requst.ProjectRequest;
import site.easystartup.web.project.repo.ParticipantRepo;
import site.easystartup.web.project.repo.ProjectRepo;
import site.easystartup.web.service.UserService;