Skip to content
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.

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

9주차_감자/김지웅 #24

Merged
merged 2 commits into from
Dec 20, 2024
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
2 changes: 2 additions & 0 deletions 감자-김지웅/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ dependencies {
testImplementation 'org.springframework.boot:spring-boot-starter-test'
implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.0'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
implementation 'org.springframework.boot:spring-boot-starter-validation'
//Querydsl 추가
implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class QStore extends EntityPathBase<Store> {

public final QRegion region;

public final ListPath<Review, QReview> reviewList2 = this.<Review, QReview>createList("reviewList2", Review.class, QReview.class, PathInits.DIRECT2);
public final ListPath<Review, QReview> reviewList = this.<Review, QReview>createList("reviewList", Review.class, QReview.class, PathInits.DIRECT2);

public final NumberPath<Float> score = createNumber("score", Float.class);

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package umc.spring.api.controller;


import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import umc.spring.api.dto.MemberMissionDTO;
import umc.spring.api.dto.MissionResponseDTO;
import umc.spring.apiPayload.ApiResponse;
import umc.spring.converter.MemberMissionConverter;
import umc.spring.converter.MissionConverter;
import umc.spring.domain.Mission;
import umc.spring.domain.mapping.MemberMission;
import umc.spring.service.MemberMissionService.MemberMissionService;
import umc.spring.service.MemberMissionService.MemberMissionServiceImpl;
import umc.spring.validation.annotation.ExistMember;

@RestController
@RequiredArgsConstructor
@Validated
@RequestMapping("/member")
public class MemberMissionRestController {

private final MemberMissionService memberMissionService;

@GetMapping("/{memberId}/mission_inprogress")
@Operation(summary = "내가 진행 중인 미션 목록 조회 API",
description = "내가 진행 중인 미션 목록을 조회하는 API이며, 페이징을 포함합니다. query String으로 page 번호를 전달하세요.")
@ApiResponses({
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공"),
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "401", description = "access 토큰을 주세요!",
content = @Content(schema = @Schema(implementation = ApiResponse.class))),
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "access 토큰 만료",
content = @Content(schema = @Schema(implementation = ApiResponse.class))),
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "406", description = "access 토큰 모양이 이상함",
content = @Content(schema = @Schema(implementation = ApiResponse.class)))
})
@Parameters({
@Parameter(name = "memberId", description = "멤버의 아이디, path variable 입니다."),
@Parameter(name = "page", description = "조회할 페이지 번호입니다.")
})
public ApiResponse<MemberMissionDTO.MissionPreviewListDTO> getMissionList(
@ExistMember @PathVariable(name = "memberId") Long memberId,
@RequestParam(name = "page") Integer page) {

// 진행 중인 미션 목록 조회
Page<MemberMission> memberMissions = memberMissionService.getMissionList(memberId, page);

// DTO 변환
MemberMissionDTO.MissionPreviewListDTO response = MemberMissionConverter.toMissionPreviewListDTO(memberMissions);

return ApiResponse.onSuccess(response);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package umc.spring.api.controller;

import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import umc.spring.api.dto.MemberRequestDTO;
import umc.spring.api.dto.MemberResponseDTO;
import umc.spring.apiPayload.ApiResponse;
import umc.spring.converter.MemberConverter;
import umc.spring.domain.Member;
import umc.spring.service.MemberService.MemberCommandService;

@RestController
@RequiredArgsConstructor
@RequestMapping("/members")
public class MemberRestController {

private final MemberCommandService memberCommandService;

@PostMapping("/")
public ApiResponse<MemberResponseDTO.JoinResultDTO> join(@RequestBody @Valid MemberRequestDTO.JoinDto request){
Member member = memberCommandService.joinMember(request);
return ApiResponse.onSuccess(MemberConverter.toJoinResultDTO(member));
}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package umc.spring.api.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import umc.spring.api.dto.ReviewResponseDTO;
import umc.spring.api.dto.StoreResponseDTO;
import umc.spring.apiPayload.ApiResponse;
import umc.spring.converter.StoreConverter;
import umc.spring.domain.Review;
import umc.spring.service.ReviewService.ReviewService;
import umc.spring.service.StoreService.StoreQueryService;
import umc.spring.validation.annotation.CheckPage;
import umc.spring.validation.annotation.ExistStore;

@RestController
@RequiredArgsConstructor
@Validated
@RequestMapping("/reviews")
public class ReviewController {

private final ReviewService reviewService;

@GetMapping("/{memberId}/my-reviews")
@Operation(summary = "내가 작성한 리뷰 목록 조회 API",
description = "내가 작성한 리뷰 목록을 조회하는 API이며, 페이징을 포함합니다. query String 으로 page 번호를 전달하세요.")
@ApiResponses({
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공"),
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "401", description = "access 토큰을 주세요!",
content = @Content(schema = @Schema(implementation = ApiResponse.class))),
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "access 토큰 만료",
content = @Content(schema = @Schema(implementation = ApiResponse.class))),
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "406", description = "access 토큰 모양이 이상함",
content = @Content(schema = @Schema(implementation = ApiResponse.class)))
})
@Parameters({
@Parameter(name = "page", description = "조회할 페이지 번호입니다.")
})
public ApiResponse<StoreResponseDTO.ReviewPreViewListDTO> getMyReviews(
@PathVariable(name = "memberId") Long memberId,
@RequestParam(name = "page") @CheckPage Integer page) {

// 리뷰 목록을 서비스에서 가져옴
Page<Review> reviewPage = reviewService.getMyReviews(memberId, page - 1);

// DTO 변환
StoreResponseDTO.ReviewPreViewListDTO response = StoreConverter.reviewPreViewListDTO(reviewPage);

return ApiResponse.onSuccess(response);
}
}


Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package umc.spring.api.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import umc.spring.api.dto.MissionResponseDTO;
import umc.spring.api.dto.StoreResponseDTO;
import umc.spring.apiPayload.ApiResponse;
import umc.spring.converter.MissionConverter;
import umc.spring.converter.StoreConverter;
import umc.spring.domain.Mission;
import umc.spring.domain.Review;
import umc.spring.service.StoreService.StoreQueryService;
import umc.spring.validation.annotation.ExistStore;

@RestController
@RequiredArgsConstructor
@Validated
@RequestMapping("/store-misions")
public class StoreMissionRestController {

private final StoreQueryService storeQueryService;

@GetMapping("/{storeId}/missions")
@Operation(summary = "특정 가게의 미션 목록 조회 API", description = "특정 가게의 미션 목록을 조회하는 API이며, 페이징을 포함합니다. query String으로 page 번호를 주세요.")
@ApiResponses({
@io.swagger.v3.oas.annotations.responses.ApiResponse
(responseCode = "COMMON200", description = "OK, 성공"),
@io.swagger.v3.oas.annotations.responses.ApiResponse
(responseCode = "AUTH003", description = "access 토큰을 주세요!", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
@io.swagger.v3.oas.annotations.responses.ApiResponse
(responseCode = "AUTH004", description = "access 토큰 만료", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
@io.swagger.v3.oas.annotations.responses.ApiResponse
(responseCode = "AUTH006", description = "access 토큰 모양이 이상함", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
})
@Parameters({
@Parameter(name = "storeId", description = "가게의 아이디, path variable 입니다!"),
@Parameter(name = "page", description = "조회할 페이지 번호입니다.")
})
public ApiResponse<MissionResponseDTO.MissionPreviewListDTO> getMissionList(
@ExistStore @PathVariable(name = "storeId") Long storeId,
@RequestParam(name = "page") Integer page) {

// StoreQueryService를 통해 특정 가게의 미션 목록 조회
Page<Mission> missionPage = storeQueryService.getMissionList(storeId, page);

// DTO 변환
MissionResponseDTO.MissionPreviewListDTO response = MissionConverter.missionPreviewListDTO(missionPage);

return ApiResponse.onSuccess(response);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package umc.spring.api.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import umc.spring.api.dto.StoreResponseDTO;
import umc.spring.apiPayload.ApiResponse;
import umc.spring.converter.StoreConverter;
import umc.spring.domain.Review;
import umc.spring.service.StoreService.StoreQueryService;
import umc.spring.validation.annotation.ExistStore;

@RestController
@RequiredArgsConstructor
@Validated
@RequestMapping("/stores")
public class StoreRestController {

private final StoreQueryService storeQueryService;

@GetMapping("/{storeId}/reviews")
@Operation(summary = "특정 가게의 리뷰 목록 조회 API",description = "특정 가게의 리뷰들의 목록을 조회하는 API이며, 페이징을 포함합니다. query String 으로 page 번호를 주세요")
@ApiResponses({
@io.swagger.v3.oas.annotations.responses.ApiResponse
(responseCode = "COMMON200",description = "OK, 성공"),
@io.swagger.v3.oas.annotations.responses.ApiResponse
(responseCode = "AUTH003", description = "access 토큰을 주세요!",content = @Content(schema = @Schema(implementation = ApiResponse.class))),
@io.swagger.v3.oas.annotations.responses.ApiResponse
(responseCode = "AUTH004", description = "acess 토큰 만료",content = @Content(schema = @Schema(implementation = ApiResponse.class))),
@io.swagger.v3.oas.annotations.responses.ApiResponse
(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함",content = @Content(schema = @Schema(implementation = ApiResponse.class))),
})
@Parameters({
@Parameter(name = "storeId", description = "가게의 아이디, path variable 입니다!")
})
public ApiResponse<StoreResponseDTO.ReviewPreViewListDTO> getReviewList(
@ExistStore @PathVariable(name = "storeId") Long storeId,
@RequestParam(name = "page") Integer page){
Page<Review> reviewList = storeQueryService.getReviewList(storeId, page);
return ApiResponse.onSuccess(StoreConverter.reviewPreViewListDTO(reviewList));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package umc.spring.api.dto;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.time.LocalDate;
import java.util.List;

public class MemberMissionDTO {

@Builder
@Getter
@NoArgsConstructor
@AllArgsConstructor
public static class MissionPreviewListDTO {
private List<MissionPreviewDTO> missions;
private boolean isFirst;
private boolean isLast;
private long totalElements;
private int totalPages;
}

@Builder
@Getter
@NoArgsConstructor
@AllArgsConstructor
public static class MissionPreviewDTO {
private Long missionId;
private String status; // MemberMission 상태
private Integer reward;
private LocalDate deadline;
private String missionSpec;
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package umc.spring.api.dto;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.Getter;
import umc.spring.validation.annotation.ExistCategories;

import java.util.List;

public class MemberRequestDTO {

@Getter
public static class JoinDto{
@NotBlank
String name;
@NotNull
Integer gender;
@NotNull
Integer birthYear;
@NotNull
Integer birthMonth;
@NotNull
Integer birthDay;
@Size(min = 5, max = 12)
String address;
@Size(min = 5, max = 12)
String specAddress;
@ExistCategories
List<Long> preferCategory;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package umc.spring.api.dto;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.time.LocalDateTime;

public class MemberResponseDTO {

@Builder
@Getter
@NoArgsConstructor
@AllArgsConstructor
public static class JoinResultDTO{
Long memberId;
LocalDateTime createdAt;
}
}
Loading