Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 10 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-mail'
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'

//Querydsl 추가
implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
annotationProcessor "jakarta.annotation:jakarta.annotation-api"
annotationProcessor "jakarta.persistence:jakarta.persistence-api"
// OAuth2
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'

Expand All @@ -84,4 +89,8 @@ tasks.named('test') {

jar {
enabled = false
}
}

clean {
delete file('src/main/generated')
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
package org.withtime.be.withtimebe.domain.date.controller.command;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import lombok.RequiredArgsConstructor;
import org.namul.api.payload.response.DefaultResponse;
import org.springframework.web.bind.annotation.*;
import org.withtime.be.withtimebe.domain.date.converter.DateConverter;
import org.withtime.be.withtimebe.domain.date.dto.request.DateRequestDTO;
import org.withtime.be.withtimebe.domain.date.dto.response.DateResponseDTO;
import org.withtime.be.withtimebe.domain.date.entity.DateCourseBookmark;
import org.withtime.be.withtimebe.domain.date.entity.DatePlace;
import org.withtime.be.withtimebe.domain.date.service.command.DateCommandService;
import org.withtime.be.withtimebe.domain.member.entity.Member;
import org.withtime.be.withtimebe.global.security.annotation.AuthenticatedMember;

import java.util.List;


@RestController
@RequiredArgsConstructor
@RequestMapping("/api/v1/date-courses")
public class DateCommandController {

private final DateCommandService dateCommandService;

@Operation(summary = "사용자 맞춤형 데이트 코스 생성 API by 제인", description = "데이트 코스 생성 API입니다")
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "성공입니다")
})
@PostMapping("/")
public DefaultResponse<DateResponseDTO.DateCourse> createDateCourse(
@RequestBody DateRequestDTO.CreateDateCourse request
// @AuthenticatedMember Member member
){
List<DatePlace> datePlaces = dateCommandService.createDateCourse(request);
DateResponseDTO.DateCourse dateCourse = DateConverter.createDateCourseInfo(datePlaces);
return DefaultResponse.created(dateCourse);
}

@Operation(summary = "데이트 코스 북마크 생성 API by 제인",
description = "직접 데이트 코스를 찾을 때 사용하는 데이트 코스 북마크 API입니다")
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "성공입니다"),
@ApiResponse(responseCode = "DATE_COURSE404_1",
description = "해당 코스를 찾을 수 없습니다")
})
@PostMapping("/{dateCourseId}/bookmarks")
public DefaultResponse<DateResponseDTO.DateCourseBookmark> createDateCourseBookmark(
@PathVariable Long dateCourseId,
@AuthenticatedMember Member member
){
DateCourseBookmark dateCourseBookmark = dateCommandService.createDateCourseBookmark(dateCourseId, member);
DateResponseDTO.DateCourseBookmark responseDTO = DateConverter.createDateCourseBookmarkResponseDTO(dateCourseBookmark);
return DefaultResponse.created(responseDTO);
}

@Operation(summary = "데이트 코스 북마크 삭제 API by 제인",
description = "데이트 코스 북마크 API입니다")
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "성공입니다"),
@ApiResponse(responseCode = "DATE_COURSE404_1",
description = "해당 코스를 찾을 수 없습니다")
})
@DeleteMapping("/{dateCourseId}/bookmarks")
public DefaultResponse<String> deleteDateCourseBookmark(
@PathVariable Long dateCourseId,
@AuthenticatedMember Member member
){
dateCommandService.deleteDateCourseBookmark(dateCourseId, member);
return DefaultResponse.noContent();
}

@Operation(summary = "데이트 코스 북마크 생성 API by 제인",
description = "데이트 코스를 생성할 때 사용하는 데이트 코스 북마크 API입니다")
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "성공입니다"),
@ApiResponse(responseCode = "DATE_COURSE404_1",
description = "해당 코스를 찾을 수 없습니다")
})
@PostMapping("/bookmarks")
public DefaultResponse<DateResponseDTO.DateCourseBookmark> createDateCourseBookmarkWithGeneratedCourse(
@RequestBody DateRequestDTO.SaveDateCourse request,
@AuthenticatedMember Member member
){
DateCourseBookmark dateCourseBookmarkWithGeneratedCourse = dateCommandService.createDateCourseBookmarkWithGeneratedCourse(request, member);
DateResponseDTO.DateCourseBookmark dateCourseBookmarkResponseDTO = DateConverter.createDateCourseBookmarkResponseDTO(dateCourseBookmarkWithGeneratedCourse);
return DefaultResponse.created(dateCourseBookmarkResponseDTO);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package org.withtime.be.withtimebe.domain.date.controller.query;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import lombok.RequiredArgsConstructor;
import org.namul.api.payload.response.DefaultResponse;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableDefault;
import org.springframework.web.bind.annotation.*;
import org.withtime.be.withtimebe.domain.date.converter.DateConverter;
import org.withtime.be.withtimebe.domain.date.dto.request.DateRequestDTO;
import org.withtime.be.withtimebe.domain.date.dto.response.DateResponseDTO;
import org.withtime.be.withtimebe.domain.date.entity.DateCourse;
import org.withtime.be.withtimebe.domain.date.service.query.DateQueryService;
import org.withtime.be.withtimebe.domain.member.entity.Member;
import org.withtime.be.withtimebe.global.annotation.SwaggerPageable;
import org.withtime.be.withtimebe.global.security.annotation.AuthenticatedMember;

@RestController
@RequiredArgsConstructor
@RequestMapping("/api/v1/date-courses")
public class DateQueryController {

private final DateQueryService dateQueryService;

@Operation(summary = "데이트 코스 리스트 조회 API by 제인", description = "데이트 코스 전체 조회 API입니다.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "성공입니다."),
@ApiResponse(responseCode = "404", description = "DATE_COURSE404_1 : 해당하는 데이트 코스를 찾을 수 없습니다.")
})
@SwaggerPageable
@PostMapping("/")
public DefaultResponse<DateResponseDTO.DateCourseList> findDateCourses(
@PageableDefault(page = 0, size = 10) Pageable pageable,
@RequestBody DateRequestDTO.DateCourseSearchCond dateCourseSearchCond
) {
Page<DateCourse> dateCourses = dateQueryService.findDateCourses(dateCourseSearchCond, pageable);
DateResponseDTO.DateCourseList response = DateConverter.createDateCourseList(dateCourses);
return DefaultResponse.ok(response);
}

@Operation(summary = "데이트 코스 북마크 리스트 조회 API by 제인", description = "데이트 코스 북마크 리스트 조회 API입니다")
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "성공입니다"),
@ApiResponse(responseCode = "DATE_COURSE_BOOKMARK404_1",
description = "해당 코스를 찾을 수 없습니다")
})
@SwaggerPageable
@PostMapping("/bookmarks")
public DefaultResponse<DateResponseDTO.DateCourseList> findDateCourseBookmark(
@PageableDefault(page = 0, size = 10) Pageable pageable,
@RequestBody DateRequestDTO.DateCourseSearchCond dateCourseSearchCond,
@AuthenticatedMember Member member
){
Page<DateCourse> bookmarkedDateCourses = dateQueryService.findDateCourseBookmarks(dateCourseSearchCond, pageable, member);
DateResponseDTO.DateCourseList response = DateConverter.createDateCourseList(bookmarkedDateCourses);
return DefaultResponse.ok(response);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
package org.withtime.be.withtimebe.domain.date.converter;

import org.springframework.data.domain.Page;
import org.withtime.be.withtimebe.domain.date.dto.request.DateRequestDTO;
import org.withtime.be.withtimebe.domain.date.dto.response.DateResponseDTO;
import org.withtime.be.withtimebe.domain.date.entity.DateCourse;
import org.withtime.be.withtimebe.domain.date.entity.DateCourseBookmark;
import org.withtime.be.withtimebe.domain.date.entity.DatePlace;
import org.withtime.be.withtimebe.domain.date.entity.DatePlaceDateCourse;
import org.withtime.be.withtimebe.domain.member.entity.Member;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;

public class DateConverter {

// DateCourse, Member -> DateCourseBookmark 엔티티 생성
public static DateCourseBookmark createDateCourseBookmark(DateCourse dateCourse, Member member) {
return DateCourseBookmark.builder()
.member(member)
.dateCourse(dateCourse)
.build();
}

// DateCourseBookmark -> DateCourseBookmark ResponseDTO 생성
public static DateResponseDTO.DateCourseBookmark createDateCourseBookmarkResponseDTO(DateCourseBookmark dateCourseBookmark) {
return DateResponseDTO.DateCourseBookmark.builder()
.dateCourseId(dateCourseBookmark.getId())
.build();
}

// DateRequestDTO.SaveDateCourse -> DateCourse
public static DateCourse createDateCourse(DateRequestDTO.SaveDateCourse dateCourse){
return DateCourse.builder()
.name(dateCourse.name())
.build();
}

// 나중에 생성한 정보를 리턴하는 데 사용,,? 근데 애초에 그 뭐야
// builder()로 만들 때 잘 만들어주면 안되냐
// List<DatePlace> -> DateResponseDTO.DateCourseInfo
public static DateResponseDTO.DateCourse createDateCourseInfo(List<DatePlace> datePlaces){
List<DateResponseDTO.DatePlace> datePlaceDtos = datePlaces.stream()
.map(DateConverter::createDatePlace)
.toList();

return DateResponseDTO.DateCourse.builder()
.name(LocalDateTime.now().toLocalDate().toString())
.build();
}

// DatePlace -> DateResponseDTO.DatePlace
public static DateResponseDTO.DatePlace createDatePlace(DatePlace datePlace) {
return DateResponseDTO.DatePlace.builder()
.name(datePlace.getName())
.image(datePlace.getImage())
.tel(datePlace.getTel())
.averagePrice(datePlace.getAveragePrice())
.information(datePlace.getInformation())
.latitude(datePlace.getLatitude())
.longitude(datePlace.getLongitude())
.roadNameAddress(datePlace.getRoadNameAddress())
.lotNumberAddress(datePlace.getLotNumberAddress())
.placeType(datePlace.getPlaceType())
.build();
}

// DateResponseDTO.DateCourse -> DateResponseDTO.DateCourse
public static DateResponseDTO.DateCourse createDateCourse(DateCourse dateCourse){

List<DateResponseDTO.DatePlace> datePlaces = dateCourse.getDatePlaceDateCourses().stream()
.map(DatePlaceDateCourse::getDatePlace)
.map(DateConverter::createDatePlace)
.toList();

return DateResponseDTO.DateCourse.builder()
.dateCourseId(dateCourse.getId())
.name(dateCourse.getName())
.datePlaces(datePlaces)
.build();
}

// Page<DateCourse> -> DateRequestDTO.DateCourseList
public static DateResponseDTO.DateCourseList createDateCourseList(Page<DateCourse> dateCourses){
List<DateResponseDTO.DateCourse> dateCourseList = dateCourses.stream()
.map(DateConverter::createDateCourse)
.toList();

return DateResponseDTO.DateCourseList.builder()
.dateCourseList(dateCourseList)
.totalPages(dateCourses.getTotalPages())
.currentPage(dateCourses.getNumber())
.currentSize(dateCourses.getSize())
.hasNextPage(dateCourses.hasNext())
.build();
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package org.withtime.be.withtimebe.domain.date.dto.request;

import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import org.withtime.be.withtimebe.domain.date.entity.enums.DatePriceRange;
import org.withtime.be.withtimebe.domain.date.entity.enums.DateTime;
import org.withtime.be.withtimebe.domain.date.entity.enums.MealType;
import org.withtime.be.withtimebe.domain.date.entity.enums.Transportation;

import java.time.LocalDateTime;
import java.util.List;

public record DateRequestDTO() {


public record CreateDateCourse(
@NotNull(message = "예산을 선택해주세요")
DatePriceRange budget,

@Size(min = 1, message = "최소 하나 이상의 값을 선택해주세요")
@NotNull(message = "값이 비어있을 수 없습니다")
List<String> datePlaces,

@NotNull(message = "데이트 시간을 선택해주세요")
DateTime dateDurationTime,

List<MealType> mealPlan,

@NotBlank(message = "이동 수단을 선택해주세요")
Transportation transportation,

@Size(min = 1, max = 3)
@NotNull(message = "사용자 취향을 선택해주세요")
List<String> userPreferredKeywords,

@JsonFormat(shape = JsonFormat.Shape.STRING,
pattern = "yyyy-MM-dd'T'HH:mm:ss"
)
LocalDateTime startTime,

int attemptCount
){}

public record SaveDateCourse(
List<Long> datePlaceIds,
String name
){}

public record DateCourseSearchCond(
DatePriceRange budget,
List<String> datePlaces,
DateTime dateDurationTime,
List<MealType> mealTypes,
Transportation transportation,
List<String> userPreferredKeywords
){}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package org.withtime.be.withtimebe.domain.date.dto.response;

import lombok.Builder;
import org.withtime.be.withtimebe.domain.date.entity.enums.PlaceType;

import java.util.List;

public record DateResponseDTO() {

@Builder
public record DateCourseBookmark(
Long dateCourseId
){}

@Builder
public record DatePlace(
String name,
String image,
String tel,
Integer averagePrice,
String information,
double latitude,
double longitude,
String roadNameAddress,
String lotNumberAddress,
PlaceType placeType
){}

@Builder
public record DateCourse(
Long dateCourseId,
String name,
List<DateResponseDTO.DatePlace> datePlaces
){}

@Builder
public record DateCourseList(
List<DateResponseDTO.DateCourse> dateCourseList,
Integer totalPages,
Integer currentPage,
Integer currentSize,
Boolean hasNextPage
){}
}
Loading