Skip to content

Commit fd4d0ae

Browse files
authored
[FIX] #703: 솝탬프 미션 정렬 일관성 보장 (#704)
2 parents d58937d + b6f64e3 commit fd4d0ae

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/main/java/org/sopt/app/application/mission/MissionService.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.sopt.app.application.mission;
22

3-
import java.util.Comparator;
43
import java.util.List;
54
import java.util.function.Predicate;
65
import lombok.RequiredArgsConstructor;
@@ -24,8 +23,8 @@ public class MissionService {
2423

2524
@Transactional(readOnly = true)
2625
public List<MissionInfo.Completeness> findAllMission(Long userId) {
27-
val completedStampList = stampRepository.findAllByUserId(userId);
28-
val missionList = missionRepository.findAllByDisplay(true);
26+
val completedStampList = stampRepository.findAllByUserId(userId);;
27+
val missionList = missionRepository.findAllByDisplayOrderByLevelAscTitleAsc(true);
2928

3029
return missionList.stream()
3130
.map(mission -> MissionInfo.Completeness.builder()
@@ -35,8 +34,6 @@ public List<MissionInfo.Completeness> findAllMission(Long userId) {
3534
.profileImage(mission.getProfileImage())
3635
.isCompleted(isCompletedMission(mission.getId(), completedStampList))
3736
.build())
38-
.sorted(Comparator.comparing(MissionInfo.Completeness::getLevel)
39-
.thenComparing(MissionInfo.Completeness::getTitle))
4037
.toList();
4138
}
4239

src/main/java/org/sopt/app/interfaces/postgres/MissionRepository.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ public interface MissionRepository extends JpaRepository<Mission, Long> {
1515
List<Mission> findMissionInOrderByLevelAndTitle(@Param("missions") List<Long> missions);
1616

1717
List<Mission> findAllByDisplay(boolean display);
18+
19+
List<Mission> findAllByDisplayOrderByLevelAscTitleAsc(boolean display);
1820
}

src/test/java/org/sopt/app/application/MissionServiceTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import java.util.List;
1212
import java.util.Optional;
1313
import org.assertj.core.groups.Tuple;
14-
import org.junit.jupiter.api.Assertions;
1514
import org.junit.jupiter.api.DisplayName;
1615
import org.junit.jupiter.api.Test;
1716
import org.junit.jupiter.api.extension.ExtendWith;
@@ -71,7 +70,7 @@ void SUCCESS_findAllMission() {
7170
);
7271

7372
when(stampRepository.findAllByUserId(userId)).thenReturn(completedStamps);
74-
when(missionRepository.findAllByDisplay(true)).thenReturn(displayedMissions);
73+
when(missionRepository.findAllByDisplayOrderByLevelAscTitleAsc(true)).thenReturn(displayedMissions);
7574

7675
// when
7776
List<Completeness> result = missionService.findAllMission(userId);

0 commit comments

Comments
 (0)