Skip to content

[Fix] 솝트로그 관련 이슈 해결 (#519) #520

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
merged 2 commits into from
Mar 31, 2025
Merged

[Fix] 솝트로그 관련 이슈 해결 (#519) #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f09ec4d
[Refactor] 활동 기수여도 솝탬프 조회 안하도록 주석처리 (#519)
geniusYoo Mar 31, 2025
35bd8c4
[Fix] 활동 기수여도 솝트와 N개월로 리턴되게 수정 (#519)
geniusYoo Mar 31, 2025
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
14 changes: 13 additions & 1 deletion src/main/java/org/sopt/app/application/playground/dto/PlaygroundProfileInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
import jakarta.validation.constraints.NotNull;
import java.util.*;
import lombok.*;
import lombok.extern.slf4j.Slf4j;
import org.sopt.app.common.exception.BadRequestException;
import org.sopt.app.common.response.ErrorCode;
import org.sopt.app.domain.enums.PlaygroundPart;
import org.sopt.app.domain.enums.UserStatus;

@Slf4j
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class PlaygroundProfileInfo {

Expand Down Expand Up @@ -121,7 +123,17 @@ public Long getGeneration() {
}

public PlaygroundPart getPlaygroundPart() {
return findPlaygroundPartByPartName(cardinalInfo.split(",")[1]);
try {
String[] parts = cardinalInfo.split(",");
if (parts.length < 2) {
log.warn("Invalid cardinalInfo format: {}", cardinalInfo);
return PlaygroundPart.NONE;
}
return findPlaygroundPartByPartName(parts[1]);
} catch (Exception e) {
log.warn("Error parsing PlaygroundPart from cardinalInfo: {}", cardinalInfo, e);
return PlaygroundPart.NONE;
}
}
}

Expand Down
18 changes: 11 additions & 7 deletions src/main/java/org/sopt/app/presentation/user/UserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,21 @@ public ResponseEntity<UserResponse.SoptLog> getUserSoptLog(
Boolean isActive = playgroundProfile.getLatestActivity().getGeneration().equals(generation);
boolean isFortuneChecked = fortuneService.isExistTodayFortune((user.getId()));
String fortuneText = isFortuneChecked?fortuneService.getTodayFortuneWordByUserId(user.getId(), LocalDate.now()).title():"오늘 내 운세는?";
if (isActive) {
soptampRank = rankFacade.findUserRank(user.getId());
} else {
List<Long> generations = playgroundProfile.getAllActivities().stream()

// if (isActive) {
// // soptampRank = rankFacade.findUserRank(user.getId());
// } else {
//
// }

List<Long> generations = playgroundProfile.getAllActivities().stream()
.map(PlaygroundProfileInfo.ActivityCardinalInfo::getGeneration)
.toList();

if (!generations.isEmpty()) {
soptDuring = (long) ActivityDurationCalculator.calculate(generations);
}
if (!generations.isEmpty()) {
soptDuring = (long) ActivityDurationCalculator.calculate(generations);
}

List<String> icons = authFacade.getIcons(isActive ? IconType.ACTIVE : IconType.INACTIVE);
List<String> iconsMutableList = new ArrayList<>(icons);
List<String> iconPriority = List.of("sop-level", "poke", "soptamp", "duration");
Expand Down