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.

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

Jump to bottom

[FIX] stream 통일 #65

Merged
merged 4 commits into from
Jan 11, 2024
Merged

[FIX] stream 통일 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3431ed
[FIX] stream 활용
thguss Jan 11, 2024
9f46237
[FIX] 메소드명 변경
thguss Jan 11, 2024
499646b
[CHORE] 병합 충돌 대응
thguss Jan 11, 2024
586af0f
[CHORE] 병합
thguss Jan 11, 2024
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
10 changes: 1 addition & 9 deletions src/test/java/com/soptie/server/memberRoutine/fixture/MemberDailyRoutineFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
import com.soptie.server.memberRoutine.dto.MemberDailyRoutineResponse;
import com.soptie.server.memberRoutine.dto.MemberDailyRoutinesResponse;
import com.soptie.server.memberRoutine.entity.daily.MemberDailyRoutine;
import com.soptie.server.routine.entity.daily.DailyRoutine;
import com.soptie.server.routine.entity.daily.DailyTheme;
import com.soptie.server.routine.fixture.DailyRoutineFixture;

public class MemberDailyRoutineFixture {
Expand All @@ -29,12 +27,6 @@ private static List<MemberDailyRoutine> createMemberDailyRoutines() {
}

private static MemberDailyRoutine createMemberDailyRoutine(int i) {
return new MemberDailyRoutine((long)i, i, i % 2 == 0, MEMBER, createDailyRoutine(i));
}

private static DailyRoutine createDailyRoutine(int i) {
DailyTheme theme = DailyRoutineFixture.createDailyTheme(
(long)i, "name-test", "image-url", "image-url");
return DailyRoutineFixture.createDailyRoutine((long)i, "content-test", theme);
return new MemberDailyRoutine((long)i, i, i % 2 == 0, MEMBER, DailyRoutineFixture.createDailyRoutine(i));
}
}
42 changes: 17 additions & 25 deletions src/test/java/com/soptie/server/routine/fixture/DailyRoutineFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Stream;

import com.soptie.server.memberRoutine.fixture.MemberDailyRoutineFixture;
import com.soptie.server.routine.dto.DailyRoutinesResponse;
import com.soptie.server.routine.dto.DailyThemesResponse;
import com.soptie.server.routine.entity.daily.DailyRoutine;
Expand All @@ -12,47 +14,37 @@
public class DailyRoutineFixture {

private static final String NAME = "Daily routine Theme";

private static final String ICON_IMAGE_URL = "icon_image_url";
private static final String BACKGROUND_IMAGE_URL = "background_image_url";
private static final String CONTENT = "Daily routine Content";

public static DailyThemesResponse createDailyThemesResponseDTO() {
List<DailyTheme> themes = getDailyThemes();
List<DailyTheme> themes = createDailyThemes();
return DailyThemesResponse.of(themes);
}

public static DailyTheme createDailyTheme(Long id, String name, String iconImageUrl, String backgroundImageUrl) {
RoutineImage routineImage = new RoutineImage(iconImageUrl, backgroundImageUrl);
return new DailyTheme(id, name, routineImage);
public static DailyTheme createDailyTheme(int i) {
RoutineImage routineImage = new RoutineImage(ICON_IMAGE_URL + i, BACKGROUND_IMAGE_URL + i);
return new DailyTheme((long)i, NAME + i, routineImage);
}

public static DailyRoutine createDailyRoutine(Long id, String content, DailyTheme theme) {
return new DailyRoutine(id, content, theme);
public static DailyRoutine createDailyRoutine(int i) {
DailyTheme theme = createDailyTheme(i);
return new DailyRoutine((long)i, CONTENT + i, theme);
}

private static List<DailyTheme> getDailyThemes() {
List<DailyTheme> themes = new ArrayList<>();
for (int i = 0; i < 5; i++) {
themes.add(createDailyTheme(
(long)i,
NAME + i,
ICON_IMAGE_URL + i,
BACKGROUND_IMAGE_URL + i));
}
return themes;
private static List<DailyTheme> createDailyThemes() {
return Stream.iterate(1, i -> i + 1).limit(5)
.map(DailyRoutineFixture::createDailyTheme).toList();
}

public static DailyRoutinesResponse createDailyRoutinesResponseDTO() {
List<DailyRoutine> routines = getDailyRoutines();
List<DailyRoutine> routines = createDailyRoutines();
return DailyRoutinesResponse.of(routines);
}

private static List<DailyRoutine> getDailyRoutines() {
List<DailyRoutine> routines = new ArrayList<>();
DailyTheme theme = createDailyTheme(1L, "테스트 테마", "test-icon", "test-background");
for (int i = 0; i < 5; i++) {
routines.add(createDailyRoutine((long)i, "content" + i, theme));
}
return routines;
private static List<DailyRoutine> createDailyRoutines() {
return Stream.iterate(1, i -> i + 1).limit(5)
.map(DailyRoutineFixture::createDailyRoutine).toList();
}
}