-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
[FEAT] 회원의 데일리 루틴 목록 조회
- Loading branch information
Showing
18 changed files
with
328 additions
and
113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 8 additions & 9 deletions
17
...se/MemberDailyRoutineListGetResponse.java → ...emberDailyRoutineListAcquireResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
...in/java/com/soptie/server/memberRoutine/controller/v2/MemberDailyRoutineControllerV2.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package com.soptie.server.memberRoutine.controller.v2; | ||
|
|
||
| import com.soptie.server.common.dto.SuccessResponse; | ||
| import com.soptie.server.memberRoutine.controller.v2.api.MemberDailyRoutineApi; | ||
| import com.soptie.server.memberRoutine.controller.v2.dto.response.MemberDailyRoutineListAcquireResponseV2; | ||
| import com.soptie.server.memberRoutine.service.MemberRoutineReadService; | ||
| import com.soptie.server.memberRoutine.service.dto.request.MemberDailyRoutineListAcquireServiceRequest; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.val; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
| import java.security.Principal; | ||
|
|
||
| import static com.soptie.server.common.dto.SuccessResponse.success; | ||
| import static com.soptie.server.memberRoutine.message.SuccessMessage.SUCCESS_GET_ROUTINE; | ||
|
|
||
| @RestController | ||
| @RequiredArgsConstructor | ||
| @RequestMapping("/api/v2/routines/daily/member") | ||
| public class MemberDailyRoutineControllerV2 implements MemberDailyRoutineApi { | ||
|
|
||
| private final MemberRoutineReadService memberRoutineReadService; | ||
|
|
||
| @GetMapping | ||
| public ResponseEntity<SuccessResponse<MemberDailyRoutineListAcquireResponseV2>> acquireAll( | ||
| Principal principal | ||
| ) { | ||
| val memberId = Long.parseLong(principal.getName()); | ||
| val response = MemberDailyRoutineListAcquireResponseV2 | ||
| .of(memberRoutineReadService.acquireAll(MemberDailyRoutineListAcquireServiceRequest.of(memberId))); | ||
| return ResponseEntity.ok(success(SUCCESS_GET_ROUTINE.getMessage(), response)); | ||
| } | ||
| } |
44 changes: 44 additions & 0 deletions
44
src/main/java/com/soptie/server/memberRoutine/controller/v2/api/MemberDailyRoutineApi.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| package com.soptie.server.memberRoutine.controller.v2.api; | ||
|
|
||
| import com.soptie.server.common.dto.ErrorResponse; | ||
| import com.soptie.server.common.dto.SuccessResponse; | ||
| import com.soptie.server.memberRoutine.controller.v2.dto.response.MemberDailyRoutineListAcquireResponseV2; | ||
| import io.swagger.v3.oas.annotations.Operation; | ||
| import io.swagger.v3.oas.annotations.Parameter; | ||
| import io.swagger.v3.oas.annotations.media.Content; | ||
| import io.swagger.v3.oas.annotations.media.Schema; | ||
| import io.swagger.v3.oas.annotations.responses.ApiResponse; | ||
| import io.swagger.v3.oas.annotations.tags.Tag; | ||
| import org.springframework.http.ResponseEntity; | ||
|
|
||
| import java.security.Principal; | ||
|
|
||
| @Tag(name = "member daily routines V2", description = "회원의 데일리 루틴 API Version2") | ||
| public interface MemberDailyRoutineApi { | ||
|
|
||
| @Operation( | ||
| summary = "회원의 데일리 루틴 목록 조회", | ||
| description = "회원의 데일리 루틴을 무지개 순으로 정렬된 테마와 사전순으로 정렬된 루틴 목록으로 조회한다.", | ||
| responses = { | ||
| @ApiResponse(responseCode = "200", description = "성공"), | ||
| @ApiResponse( | ||
| responseCode = "401", | ||
| description = "유효하지 않은 토큰", | ||
| content = @Content(schema = @Schema(implementation = ErrorResponse.class)) | ||
| ), | ||
| @ApiResponse( | ||
| responseCode = "4xx", | ||
| description = "클라이언트(요청) 오류", | ||
| content = @Content(schema = @Schema(implementation = ErrorResponse.class)) | ||
| ), | ||
| @ApiResponse( | ||
| responseCode = "500", | ||
| description = "서버 내부 오류", | ||
| content = @Content(schema = @Schema(implementation = ErrorResponse.class)) | ||
| ) | ||
| } | ||
| ) | ||
| ResponseEntity<SuccessResponse<MemberDailyRoutineListAcquireResponseV2>> acquireAll( | ||
| @Parameter(hidden = true) Principal principal | ||
| ); | ||
| } |
60 changes: 60 additions & 0 deletions
60
...ver/memberRoutine/controller/v2/dto/response/MemberDailyRoutineListAcquireResponseV2.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| package com.soptie.server.memberRoutine.controller.v2.dto.response; | ||
|
|
||
| import com.soptie.server.memberRoutine.service.dto.response.MemberDailyRoutinesAcquireServiceResponse; | ||
| import com.soptie.server.memberRoutine.service.dto.response.MemberDailyRoutineListAcquireServiceResponse; | ||
| import lombok.Builder; | ||
| import lombok.NonNull; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static lombok.AccessLevel.PRIVATE; | ||
|
|
||
| @Builder(access = PRIVATE) | ||
| public record MemberDailyRoutineListAcquireResponseV2( | ||
| @NonNull List<MemberDailyRoutineListResponse> routines | ||
| ) { | ||
|
|
||
| public static MemberDailyRoutineListAcquireResponseV2 of(MemberDailyRoutineListAcquireServiceResponse response) { | ||
| return MemberDailyRoutineListAcquireResponseV2.builder() | ||
| .routines(response.routines().stream() | ||
| .map(MemberDailyRoutineListResponse::of) | ||
| .toList()) | ||
| .build(); | ||
| } | ||
|
|
||
| @Builder(access = PRIVATE) | ||
| public record MemberDailyRoutineListResponse( | ||
| long themeId, | ||
| @NonNull String themeName, | ||
| @NonNull List<MemberDailyRoutineResponse> routines | ||
| ) { | ||
|
|
||
| public static MemberDailyRoutineListResponse of(MemberDailyRoutinesAcquireServiceResponse routines) { | ||
| return MemberDailyRoutineListResponse.builder() | ||
| .themeId(routines.themeId()) | ||
| .themeName(routines.themeName()) | ||
| .routines(routines.routines().stream().map(MemberDailyRoutineResponse::of).toList()) | ||
| .build(); | ||
| } | ||
|
|
||
| @Builder(access = PRIVATE) | ||
| public record MemberDailyRoutineResponse( | ||
| long routineId, | ||
| @NonNull String content, | ||
| int achieveCount, | ||
| boolean isAchieve | ||
| ) { | ||
|
|
||
| private static MemberDailyRoutineResponse of( | ||
| MemberDailyRoutinesAcquireServiceResponse.MemberDailyRoutineServiceResponse routine | ||
| ) { | ||
| return MemberDailyRoutineResponse.builder() | ||
| .routineId(routine.routineId()) | ||
| .content(routine.content()) | ||
| .achieveCount(routine.achieveCount()) | ||
| .isAchieve(routine.isAchieve()) | ||
| .build(); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.