Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ public TeamSummary getTeamSummaryByTeamNumber(TeamNumber teamNumber) {
}

public TeamSummary getTeamSummaryByUserId(Long userId) {
val appjamUser = appjamUserRepository.findByUserId(userId)
.orElseThrow(() -> new NotFoundException(ErrorCode.TEAM_NOT_FOUND));
return TeamSummary.from(appjamUser);
return appjamUserRepository.findByUserId(userId)
.map(TeamSummary::from)
.orElseGet(TeamSummary::empty);
}

public boolean isAppjamParticipant(Long userId) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.sopt.app.interfaces.postgres.MissionRepository;
import org.sopt.app.interfaces.postgres.SoptampUserRepository;
import org.sopt.app.interfaces.postgres.StampRepository;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;

@Service
Expand All @@ -30,14 +31,30 @@ public class AppjamMissionService {
private final StampRepository stampRepository;
private final SoptampUserRepository soptampUserRepository;

public List<AppjamMissionInfo> getDisplayedMissions() {
public List<AppjamMissionInfo> getMissions(
@Nullable TeamNumber teamNumber,
@Nullable Boolean isCompleted
){
val missions = (teamNumber != null)
? getMissionsByTeam(teamNumber)
: getDisplayedMissions();

if (isCompleted != null) {
return missions.stream()
.filter(mission -> Objects.equals(mission.isCompleted(), isCompleted))
.toList();
}
return missions;
}

private List<AppjamMissionInfo> getDisplayedMissions() {
val displayedMissions = missionRepository.findAllByDisplay(true);
return displayedMissions.stream()
.map(AppjamMissionInfo::createWhenUncompleted)
.toList();
}

public List<AppjamMissionInfo> getMissionsByTeam(TeamNumber teamNumber) {
private List<AppjamMissionInfo> getMissionsByTeam(TeamNumber teamNumber) {
val userIds = getTeamUserIds(teamNumber);
val stampsByMissionId = getStampMapByUserIds(userIds);
val soptampUserByUserId = getSoptampUserMapByUserIds(userIds);
Expand All @@ -48,15 +65,6 @@ public List<AppjamMissionInfo> getMissionsByTeam(TeamNumber teamNumber) {
.toList();
}

public List<AppjamMissionInfo> getMissionsByTeamAndCondition(TeamNumber teamNumber,
boolean isCompleted) {
List<AppjamMissionInfo> allMissions = getMissionsByTeam(teamNumber);

return allMissions.stream()
.filter(mission -> Objects.equals(mission.isCompleted(), isCompleted))
.toList();
}

private AppjamMissionInfo toTeamMissionInfo(
Mission mission,
Map<Long, Stamp> stampByMissionId,
Expand Down
25 changes: 10 additions & 15 deletions src/main/java/org/sopt/app/facade/MissionFacade.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import lombok.RequiredArgsConstructor;
import lombok.val;
import org.sopt.app.application.appjamuser.AppjamUserInfo.AppjamUserStatus;
import org.sopt.app.application.appjamuser.AppjamUserInfo.TeamSummary;
import org.sopt.app.application.appjamuser.AppjamUserService;
import org.sopt.app.application.mission.AppjamMissionService;
Expand All @@ -25,22 +24,18 @@ public AppjamMissionInfos getTeamMissions(
@Nullable TeamNumber teamNumber,
@Nullable Boolean complete
) {
if (teamNumber == null) {
val missions = appjamMissionService.getDisplayedMissions();
return AppjamMissionInfos.of(AppjamUserStatus.appjamNotJoined(), TeamSummary.empty(),
missions);
}

val teamSummary = appjamUserService.getTeamSummaryByTeamNumber(teamNumber);
val teamSummary = resolveTeamSummary(userId, teamNumber);
val appjamUserStatus = appjamUserService.getAppjamUserStatus(userId);
if (complete != null) {
return AppjamMissionInfos.of(
appjamUserStatus,
teamSummary,
appjamMissionService.getMissionsByTeamAndCondition(teamNumber, complete));
}

return AppjamMissionInfos.of(appjamUserStatus, teamSummary,
appjamMissionService.getMissionsByTeam(teamNumber));
appjamMissionService.getMissions(teamSummary.getTeamNumber(), complete));
}

private TeamSummary resolveTeamSummary(Long userId, TeamNumber teamNumber) {
if (teamNumber != null) {
return appjamUserService.getTeamSummaryByTeamNumber(teamNumber);
}
return appjamUserService.getTeamSummaryByUserId(userId);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ public ResponseEntity<UserResponse.MySoptLog> getMySoptLog(
return ResponseEntity.ok(response);
}

@Deprecated
@Operation(summary = "앱잼 팀 정보 조회")
@GetMapping("/appjam-info")
public ResponseEntity<UserResponse.AppjamStatusResponse> getTeamInfo(
Expand Down