Skip to content

[Feat] 홈 티칭맵 출처 extraCount 추가 #139

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
EH-OI merged 1 commit into from
Aug 11, 2026
Merged

[Feat] 홈 티칭맵 출처 extraCount 추가 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/main/java/com/teaching/backend/domain/home/dto/HomeTeachingMapResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ public record HomeTeachingMapResponse(
String type,
String status,
List<SourcePlatform> sourcePlatforms,
int extraCount,
LocalDateTime createdAt
) {

public static HomeTeachingMapResponse from(
TeachingMap teachingMap,
List<SourcePlatform> sourcePlatforms
List<SourcePlatform> sourcePlatforms,
int extraCount
) {
TeachingMapType type = teachingMap.getType();
TeachingMapStatus status = teachingMap.getStatus();
Expand All @@ -32,6 +34,7 @@ public static HomeTeachingMapResponse from(
type == null ? null : type.name(),
status == null ? null : status.name(),
sourcePlatforms == null ? List.of() : sourcePlatforms,
extraCount,
teachingMap.getCreatedAt()
);
}
Expand Down
24 changes: 21 additions & 3 deletions src/main/java/com/teaching/backend/domain/home/service/HomeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,31 @@ private List<HomeTeachingMapResponse> createTeachingMapResponses(Long userId, Li
));

return teachingMaps.stream()
.map(teachingMap -> HomeTeachingMapResponse.from(
.map(teachingMap -> toTeachingMapResponse(
teachingMap,
toSourcePlatforms(platformTypesByTeachingMapId.getOrDefault(teachingMap.getId(), List.of()))
platformTypesByTeachingMapId.getOrDefault(teachingMap.getId(), List.of())
))
.toList();
}

private List<SourcePlatform> toSourcePlatforms(List<PlatformType> platformTypes) {
private HomeTeachingMapResponse toTeachingMapResponse(TeachingMap teachingMap, List<PlatformType> platformTypes) {
List<PlatformType> displayablePlatformTypes = toDisplayablePlatformTypes(platformTypes);
return HomeTeachingMapResponse.from(
teachingMap,
toSourcePlatforms(displayablePlatformTypes),
extraCount(displayablePlatformTypes)
);
}

private List<PlatformType> toDisplayablePlatformTypes(List<PlatformType> platformTypes) {
return platformTypes.stream()
.filter(platformType -> platformType != null && platformType.getIconPath() != null)
.distinct()
.toList();
}

private List<SourcePlatform> toSourcePlatforms(List<PlatformType> platformTypes) {
return platformTypes.stream()
.limit(SOURCE_PLATFORM_LIMIT)
.map(platformType -> new SourcePlatform(
platformType.name(),
Expand All @@ -105,6 +119,10 @@ private List<SourcePlatform> toSourcePlatforms(List<PlatformType> platformTypes)
.toList();
}

private int extraCount(List<PlatformType> platformTypes) {
return Math.max(0, platformTypes.size() - SOURCE_PLATFORM_LIMIT);
}

private String buildIconUrl(String iconPath) {
return iconPath;
}
Expand Down
84 changes: 84 additions & 0 deletions src/test/java/com/teaching/backend/domain/home/service/HomeServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ void getDashboardMapsMaterialAndTeachingMapFields() {
assertThat(result.activeTeachingMaps().get(0).type()).isEqualTo("DEEPDIVE");
assertThat(result.activeTeachingMaps().get(0).status()).isEqualTo("IN_PROGRESS");
assertThat(result.activeTeachingMaps().get(0).sourcePlatforms()).hasSize(3);
assertThat(result.activeTeachingMaps().get(0).extraCount()).isEqualTo(1);
assertThat(result.activeTeachingMaps().get(0).sourcePlatforms())
.extracting("imageUrl")
.containsExactly(
Expand All @@ -241,6 +242,89 @@ void getDashboardMapsMaterialAndTeachingMapFields() {
);
}

@Test
void getDashboardMapsSourcePlatformsAndExtraCountLikeTeachingMapList() {
List<TeachingMap> teachingMaps = List.of(
teachingMap(201L, USER_ID, "Map 1", TeachingMapType.SHORTCUT, createdAt(1)),
teachingMap(202L, USER_ID, "Map 2", TeachingMapType.DEEPDIVE, createdAt(2)),
teachingMap(203L, USER_ID, "Map 3", TeachingMapType.SHORTCUT, createdAt(3))
);
when(materialRepository.findHomeRecentMaterials(eq(USER_ID), eq(AiStatus.COMPLETED), any(Pageable.class)))
.thenReturn(new PageImpl<>(List.of()));
when(teachingMapRepository.findAllByUser_IdAndStatusAndIsDraftFalseAndDeletedAtIsNull(
eq(USER_ID),
eq(TeachingMapStatus.IN_PROGRESS),
any(Pageable.class)
)).thenReturn(new PageImpl<>(teachingMaps));
when(teachingMapStepRepository.findActivePlatformTypesByTeachingMapIdIn(List.of(201L, 202L, 203L), USER_ID))
.thenReturn(List.of(
platformProjection(201L, PlatformType.YOUTUBE),
platformProjection(201L, PlatformType.VELOG),
platformProjection(201L, PlatformType.BLOG),
platformProjection(202L, PlatformType.YOUTUBE),
platformProjection(202L, PlatformType.VELOG),
platformProjection(202L, PlatformType.BLOG),
platformProjection(202L, PlatformType.NOTION),
platformProjection(203L, PlatformType.YOUTUBE),
platformProjection(203L, PlatformType.VELOG),
platformProjection(203L, PlatformType.YOUTUBE),
platformProjection(203L, PlatformType.BLOG),
platformProjection(203L, PlatformType.NOTION),
platformProjection(203L, PlatformType.TISTORY)
));

HomeDashboardResponse result = homeService.getDashboard(USER_ID);

assertThat(result.activeTeachingMaps().get(0).sourcePlatforms()).hasSize(3);
assertThat(result.activeTeachingMaps().get(0).extraCount()).isZero();
assertThat(result.activeTeachingMaps().get(1).sourcePlatforms()).hasSize(3);
assertThat(result.activeTeachingMaps().get(1).extraCount()).isEqualTo(1);
assertThat(result.activeTeachingMaps().get(2).sourcePlatforms()).hasSize(3);
assertThat(result.activeTeachingMaps().get(2).extraCount()).isEqualTo(2);
assertThat(result.activeTeachingMaps().get(2).sourcePlatforms())
.extracting("type")
.containsExactly("YOUTUBE", "VELOG", "BLOG");
}

@Test
void getDashboardDoesNotCountDuplicatePlatformsAsExtra() {
List<TeachingMap> teachingMaps = List.of(
teachingMap(201L, USER_ID, "Map 1", TeachingMapType.SHORTCUT, createdAt(1)),
teachingMap(202L, USER_ID, "Map 2", TeachingMapType.DEEPDIVE, createdAt(2))
);
when(materialRepository.findHomeRecentMaterials(eq(USER_ID), eq(AiStatus.COMPLETED), any(Pageable.class)))
.thenReturn(new PageImpl<>(List.of()));
when(teachingMapRepository.findAllByUser_IdAndStatusAndIsDraftFalseAndDeletedAtIsNull(
eq(USER_ID),
eq(TeachingMapStatus.IN_PROGRESS),
any(Pageable.class)
)).thenReturn(new PageImpl<>(teachingMaps));
when(teachingMapStepRepository.findActivePlatformTypesByTeachingMapIdIn(List.of(201L, 202L), USER_ID))
.thenReturn(List.of(
platformProjection(201L, PlatformType.VELOG),
platformProjection(201L, PlatformType.VELOG),
platformProjection(201L, PlatformType.VELOG),
platformProjection(201L, PlatformType.VELOG),
platformProjection(202L, PlatformType.VELOG),
platformProjection(202L, PlatformType.VELOG),
platformProjection(202L, PlatformType.NOTION),
platformProjection(202L, PlatformType.TISTORY)
));

HomeDashboardResponse result = homeService.getDashboard(USER_ID);

assertThat(result.activeTeachingMaps().get(0).sourcePlatforms()).hasSize(1);
assertThat(result.activeTeachingMaps().get(0).sourcePlatforms())
.extracting("type")
.containsExactly("VELOG");
assertThat(result.activeTeachingMaps().get(0).extraCount()).isZero();
assertThat(result.activeTeachingMaps().get(1).sourcePlatforms()).hasSize(3);
assertThat(result.activeTeachingMaps().get(1).sourcePlatforms())
.extracting("type")
.containsExactly("VELOG", "NOTION", "TISTORY");
assertThat(result.activeTeachingMaps().get(1).extraCount()).isZero();
}

@Test
void getDashboardDoesNotThrowWhenMaterialAiStatusIsNull() {
Material material = material(101L, USER_ID, "Material", PlatformType.WEB, AiStatus.COMPLETED, createdAt(1));
Expand Down
Loading