-
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
…ines [FEAT] 테마별 데일리 루틴 목록 조회(public, 온보딩) 기능 구현
- Loading branch information
Showing
8 changed files
with
239 additions
and
56 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
36 changes: 36 additions & 0 deletions
36
src/main/java/com/soptie/server/routine/controller/v2/DailyRoutineControllerV2.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.routine.controller.v2; | ||
|
||
import java.util.LinkedHashSet; | ||
|
||
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.RequestParam; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
import com.soptie.server.common.dto.SuccessResponse; | ||
import com.soptie.server.routine.controller.v2.docs.DailyRoutineControllerV2Docs; | ||
import com.soptie.server.routine.controller.v2.dto.response.DailyRoutineListAcquireResponseV2; | ||
import com.soptie.server.routine.message.RoutineSuccessMessage; | ||
import com.soptie.server.routine.service.RoutineService; | ||
|
||
import lombok.RequiredArgsConstructor; | ||
import lombok.val; | ||
|
||
@RestController | ||
@RequiredArgsConstructor | ||
@RequestMapping("/api/v2/routines/daily") | ||
public class DailyRoutineControllerV2 implements DailyRoutineControllerV2Docs { | ||
|
||
private final RoutineService routineService; | ||
|
||
@GetMapping | ||
public ResponseEntity<SuccessResponse<DailyRoutineListAcquireResponseV2>> acquireAllByThemes( | ||
@RequestParam LinkedHashSet<Long> themeIds | ||
) { | ||
val response = routineService.acquireAllInDailyWithThemeId(themeIds); | ||
return ResponseEntity.ok(SuccessResponse.success( | ||
RoutineSuccessMessage.SUCCESS_GET_ROUTINE.getMessage(), | ||
DailyRoutineListAcquireResponseV2.from(response))); | ||
} | ||
} |
17 changes: 17 additions & 0 deletions
17
src/main/java/com/soptie/server/routine/controller/v2/docs/DailyRoutineControllerV2Docs.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,17 @@ | ||
package com.soptie.server.routine.controller.v2.docs; | ||
|
||
import java.util.LinkedHashSet; | ||
|
||
import org.springframework.http.ResponseEntity; | ||
|
||
import com.soptie.server.common.dto.SuccessResponse; | ||
import com.soptie.server.routine.controller.v2.dto.response.DailyRoutineListAcquireResponseV2; | ||
|
||
import io.swagger.v3.oas.annotations.Parameter; | ||
|
||
public interface DailyRoutineControllerV2Docs { | ||
|
||
ResponseEntity<SuccessResponse<DailyRoutineListAcquireResponseV2>> acquireAllByThemes( | ||
@Parameter(name = "list of themes id", description = "조회할 테마 id 목록") LinkedHashSet<Long> themeIds | ||
); | ||
} |
50 changes: 50 additions & 0 deletions
50
...m/soptie/server/routine/controller/v2/dto/response/DailyRoutineListAcquireResponseV2.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,50 @@ | ||
package com.soptie.server.routine.controller.v2.dto.response; | ||
|
||
import java.util.List; | ||
import java.util.Map; | ||
|
||
import com.soptie.server.routine.service.vo.RoutineVO; | ||
|
||
import jakarta.validation.constraints.NotNull; | ||
import lombok.AccessLevel; | ||
import lombok.Builder; | ||
|
||
@Builder(access = AccessLevel.PRIVATE) | ||
public record DailyRoutineListAcquireResponseV2( | ||
List<ThemeResponse> themes | ||
) { | ||
|
||
public static DailyRoutineListAcquireResponseV2 from(Map<Long, List<RoutineVO>> routinesMap) { | ||
return DailyRoutineListAcquireResponseV2.builder() | ||
.themes(routinesMap.keySet().stream().map(key -> ThemeResponse.from(key, routinesMap.get(key))).toList()) | ||
.build(); | ||
} | ||
|
||
@Builder(access = AccessLevel.PRIVATE) | ||
private record ThemeResponse( | ||
long themeId, | ||
List<RoutineResponse> routines | ||
) { | ||
|
||
private static ThemeResponse from(long themeId, List<RoutineVO> routines) { | ||
return ThemeResponse.builder() | ||
.themeId(themeId) | ||
.routines(routines.stream().map(RoutineResponse::from).toList()) | ||
.build(); | ||
} | ||
} | ||
|
||
@Builder(access = AccessLevel.PRIVATE) | ||
private record RoutineResponse( | ||
long routineId, | ||
@NotNull String content | ||
) { | ||
|
||
private static RoutineResponse from(RoutineVO routine) { | ||
return RoutineResponse.builder() | ||
.routineId(routine.routineId()) | ||
.content(routine.content()) | ||
.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
24 changes: 24 additions & 0 deletions
24
src/main/java/com/soptie/server/routine/service/vo/RoutineVO.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,24 @@ | ||
package com.soptie.server.routine.service.vo; | ||
|
||
import com.soptie.server.routine.entity.Routine; | ||
import com.soptie.server.routine.entity.RoutineType; | ||
|
||
import jakarta.validation.constraints.NotNull; | ||
import lombok.AccessLevel; | ||
import lombok.Builder; | ||
|
||
@Builder(access = AccessLevel.PRIVATE) | ||
public record RoutineVO( | ||
long routineId, | ||
@NotNull String content, | ||
@NotNull RoutineType routineType | ||
) { | ||
|
||
public static RoutineVO from(Routine routine) { | ||
return RoutineVO.builder() | ||
.routineId(routine.getId()) | ||
.content(routine.getContent()) | ||
.routineType(routine.getType()) | ||
.build(); | ||
} | ||
} |
Oops, something went wrong.