Skip to content

[Feat] 코스 생성 시 path 값을 List로 받는 v2 controller를 만든다. #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
funnysunny08 merged 2 commits into from
Dec 11, 2023
Merged

[Feat] 코스 생성 시 path 값을 List로 받는 v2 controller를 만든다. #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfa23c7
feat: create course v2
funnysunny08 Dec 11, 2023
e0b20ac
feat: request dto와 request image를 분리한다.
funnysunny08 Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/main/java/org/runnect/server/common/module/convert/CoordinateDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package org.runnect.server.common.module.convert;

import lombok.AllArgsConstructor;
import lombok.Getter;

@Getter
@AllArgsConstructor
public class CoordinateDto {
private double latitude;
private double longitude;
}
27 changes: 13 additions & 14 deletions src/main/java/org/runnect/server/common/module/convert/CoordinatePathConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,28 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.ArrayList;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.LineString;
import org.locationtech.jts.geom.PrecisionModel;
import org.runnect.server.common.constant.ErrorStatus;
import org.runnect.server.common.exception.BadRequestException;
import org.runnect.server.common.exception.BasicException;
import org.runnect.server.common.constant.ErrorStatus;

@Slf4j
public class CoordinatePathConverter {

public static LineString coorConvertPathV2(List<CoordinateDto> path) {
try {
return getLineString(path);
} catch (Exception e) {
log.warn("course 요청 데이터 값 (path) -> " + path);
log.warn("course 요청 데이터 값의 타입 (path) -> " + path.getClass().getName());
throw new BadRequestException(ErrorStatus.VALIDATION_COURSE_PATH_EXCEPTION, ErrorStatus.VALIDATION_COURSE_PATH_EXCEPTION.getMessage());
}
}

public static LineString coorConvertPath(String path) {

List<CoordinateDto> coordinateDtos = new ArrayList<>();
Expand All @@ -34,8 +42,8 @@ public static LineString coorConvertPath(String path) {

return getLineString(coordinateDtos);
} catch (Exception e) {
log.info("course 요청 데이터 값 (path) -> " + path);
log.info("course 요청 데이터 값의 타입 (path) -> " + path.getClass().getName());
log.warn("course 요청 데이터 값 (path) -> " + path);
log.warn("course 요청 데이터 값의 타입 (path) -> " + path.getClass().getName());
throw new BadRequestException(ErrorStatus.VALIDATION_COURSE_PATH_EXCEPTION, ErrorStatus.VALIDATION_COURSE_PATH_EXCEPTION.getMessage());
}
}
Expand Down Expand Up @@ -67,13 +75,4 @@ private static LineString getLineString(List<CoordinateDto> coordinateDtos) {
LineString lineString = geometryFactory.createLineString(coordinates);
return lineString;
}

@Getter
@AllArgsConstructor
private static class CoordinateDto {
private double latitude;
private double longitude;
}

}

22 changes: 22 additions & 0 deletions src/main/java/org/runnect/server/course/controller/CourseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.runnect.server.common.exception.BadRequestException;
import org.runnect.server.common.resolver.userId.UserId;
import org.runnect.server.course.dto.request.CourseCreateRequestDto;
import org.runnect.server.course.dto.request.CourseCreateRequestDtoV2;
import org.runnect.server.course.dto.request.DeleteCoursesRequestDto;
import org.runnect.server.course.dto.request.UpdateCourseRequestDto;
import org.runnect.server.course.dto.response.CourseCreateResponseDto;
Expand All @@ -29,8 +30,10 @@
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

@Slf4j
@RestController
Expand Down Expand Up @@ -63,6 +66,25 @@ public ApiResponseDto<CourseCreateResponseDto> createCourse(
courseService.createCourse(userId, courseCreateRequestDto, imageUrl));
}

@PostMapping(value = "/v2", consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE}, produces = MediaType.APPLICATION_JSON_VALUE)
@ResponseStatus(HttpStatus.CREATED)
public ApiResponseDto<CourseCreateResponseDto> createCourseV2(
@UserId Long userId,
@RequestPart @Valid final CourseCreateRequestDtoV2 courseCreateRequestDto,
@RequestPart final MultipartFile image
) {
log.info("create course 요청 값");
log.info("departureAddress : " + courseCreateRequestDto.getDepartureAddress());
log.info("departureName : " + courseCreateRequestDto.getDepartureName());
log.info("path : " + courseCreateRequestDto.getPath());
log.info("distance : " + courseCreateRequestDto.getDistance().toString());

String imageUrl = s3Service.uploadImage(image, "course");
return ApiResponseDto.success(SuccessStatus.CREATE_COURSE_SUCCESS,
courseService.createCourseV2(userId, courseCreateRequestDto, imageUrl));
}


@GetMapping("/user")
@ResponseStatus(HttpStatus.OK)
public ApiResponseDto<CourseGetByUserResponseDto> getCourseByUser(@UserId Long userId) {
Expand Down
31 changes: 31 additions & 0 deletions src/main/java/org/runnect/server/course/dto/request/CourseCreateRequestDtoV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package org.runnect.server.course.dto.request;

import java.io.Serializable;
import java.util.List;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.runnect.server.common.module.convert.CoordinateDto;

@Getter
@AllArgsConstructor
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class CourseCreateRequestDtoV2 implements Serializable {

@NotNull(message = "path는 필수 입력 항목입니다.")
private List<CoordinateDto> path;

@NotBlank(message = "title은 필수 입력 항목입니다.")
private String title;

@NotNull(message = "distance는 필수 입력 항목입니다.")
private Float distance;

private String departureName;

@NotBlank(message = "departureAddress는 필수 입력 항목입니다.")
private String departureAddress;
}
32 changes: 32 additions & 0 deletions src/main/java/org/runnect/server/course/service/CourseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.runnect.server.common.module.convert.CoordinatePathConverter;
import org.runnect.server.common.module.convert.DepartureConverter;
import org.runnect.server.course.dto.request.CourseCreateRequestDto;
import org.runnect.server.course.dto.request.CourseCreateRequestDtoV2;
import org.runnect.server.course.dto.response.CourseCreateResponseDto;
import org.runnect.server.course.dto.response.CourseGetByUserResponseDto;
import org.runnect.server.course.dto.response.CourseResponse;
Expand Down Expand Up @@ -70,6 +71,37 @@ public CourseCreateResponseDto createCourse(Long userId, CourseCreateRequestDto
return CourseCreateResponseDto.of(saved.getId(), saved.getCreatedAt());
}

@Transactional
public CourseCreateResponseDto createCourseV2(Long userId, CourseCreateRequestDtoV2 requestDto,
String image) {
RunnectUser user = userRepository.findById(userId)
.orElseThrow(() -> new NotFoundUserException(NOT_FOUND_USER_EXCEPTION,
NOT_FOUND_USER_EXCEPTION.getMessage()));

LineString path = CoordinatePathConverter.coorConvertPathV2(requestDto.getPath());
DepartureResponse departureResponse = DepartureConverter.requestConvertDeparture(
requestDto.getDepartureAddress(), requestDto.getDepartureName());

Course course = Course.builder()
.runnectUser(user)
.title(requestDto.getTitle())
.departureRegion(departureResponse.getRegion())
.departureCity(departureResponse.getCity())
.departureTown(departureResponse.getTown())
.departureDetail(departureResponse.getDetail())
.departureName(departureResponse.getName())
.distance(requestDto.getDistance())
.image(image)
.path(path)
.build();

Course saved = courseRepository.save(course);
user.updateCreatedCourse();
userStampService.createStampByUser(user, StampType.c);

return CourseCreateResponseDto.of(saved.getId(), saved.getCreatedAt());
}

@Transactional(readOnly = true)
public CourseGetByUserResponseDto getCourseByUser(Long userId) {
RunnectUser user = userRepository.findById(userId)
Expand Down