[FEAT] 솝트 로그 API 개발 - #437 (#459)

sopt-makers · Jan 20, 2025 · d846fce · d846fce
2 parents 6a0f388 + 35bd47d
commit d846fce
Show file tree

Hide file tree

Showing 17 changed files with 265 additions and 16 deletions.
diff --git a/src/main/java/org/sopt/app/application/playground/PlaygroundAuthService.java b/src/main/java/org/sopt/app/application/playground/PlaygroundAuthService.java
@@ -36,6 +36,7 @@
 import org.sopt.app.common.exception.BadRequestException;
 import org.sopt.app.common.exception.UnauthorizedException;
 import org.sopt.app.common.response.ErrorCode;
+import org.sopt.app.domain.entity.User;
 import org.sopt.app.domain.enums.UserStatus;
 import org.sopt.app.presentation.auth.AppAuthRequest.AccessTokenRequest;
 import org.sopt.app.presentation.auth.AppAuthRequest.CodeRequest;
@@ -250,4 +251,15 @@ private <T extends PostWithMemberInfo> List<T> getPostsWithMemberInfo(String pla
         }
         return mutablePosts;
     }
+
+    public int getUserSoptLevel(User user) {
+        final Map<String, String> accessToken = createAuthorizationHeaderByUserPlaygroundToken(user.getPlaygroundToken());
+        return playgroundClient.getPlayGroundUserSoptLevel(accessToken,user.getPlaygroundId()).soptProjectCount();
+    }
+
+    public PlaygroundProfile getPlayGroundProfile(String accessToken) {
+        Map<String, String> requestHeader = createAuthorizationHeaderByUserPlaygroundToken(accessToken);
+        return playgroundClient.getPlayGroundProfile(requestHeader);
+
+    }
 }
diff --git a/src/main/java/org/sopt/app/application/playground/PlaygroundClient.java b/src/main/java/org/sopt/app/application/playground/PlaygroundClient.java
@@ -8,6 +8,7 @@
 import org.sopt.app.application.auth.dto.PlaygroundAuthTokenInfo.RefreshedToken;
 import org.sopt.app.application.playground.dto.PlayGroundEmploymentResponse;
 import org.sopt.app.application.playground.dto.PlayGroundPostDetailResponse;
+import org.sopt.app.application.playground.dto.PlayGroundUserSoptLevelResponse;
 import org.sopt.app.application.playground.dto.PlaygroundPostInfo.PlaygroundPostResponse;
 import org.sopt.app.application.playground.dto.PlaygroundUserFindCondition;
 import org.sopt.app.application.playground.dto.RecommendedFriendInfo.PlaygroundUserIds;
@@ -64,4 +65,10 @@ PlayGroundEmploymentResponse getPlaygroundEmploymentPost(@HeaderMap Map<String,
     @RequestLine("GET /api/v1/community/posts/{postId}")
     PlayGroundPostDetailResponse getPlayGroundPostDetail(@HeaderMap Map<String, String> headers,
                                                          @Param Long postId);
+
+    @RequestLine("GET /internal/api/v1/members/{memberId}/project")
+    PlayGroundUserSoptLevelResponse getPlayGroundUserSoptLevel(@HeaderMap Map<String, String> headers, @Param Long memberId);
+
+    @RequestLine("GET /api/v1/members/profile/me")
+    PlaygroundProfile getPlayGroundProfile(@HeaderMap Map<String, String> headers);
 }
diff --git a/src/main/java/org/sopt/app/application/playground/dto/PlayGroundUserSoptLevelResponse.java b/src/main/java/org/sopt/app/application/playground/dto/PlayGroundUserSoptLevelResponse.java
@@ -0,0 +1,8 @@
+package org.sopt.app.application.playground.dto;
+
+public record PlayGroundUserSoptLevelResponse(
+        Long id,
+        String profileImage,
+        int soptProjectCount
+) {
+}
diff --git a/src/main/java/org/sopt/app/application/playground/dto/PlaygroundProfileInfo.java b/src/main/java/org/sopt/app/application/playground/dto/PlaygroundProfileInfo.java
@@ -88,6 +88,7 @@ public static class PlaygroundProfile {
         private Long memberId;
         private String name;
         private String profileImage;
+        private String introduction;
         private List<ActivityCardinalInfo> activities;
 
         public ActivityCardinalInfo getLatestActivity() {

diff --git a/src/main/java/org/sopt/app/application/poke/PokeService.java b/src/main/java/org/sopt/app/application/poke/PokeService.java
@@ -62,4 +62,8 @@ private PokeHistory createPokeByApplyingReply(
                 .isAnonymous(isAnonymous)
                 .build());
     }
+
+    public Long getUserPokeCount(Long userId) {
+        return historyRepository.countByPokerIdOrPokedId(userId, userId);
+    }
 }
diff --git a/src/main/java/org/sopt/app/application/rank/SoptampUserRankCalculator.java b/src/main/java/org/sopt/app/application/rank/SoptampUserRankCalculator.java
@@ -1,5 +1,6 @@
 package org.sopt.app.application.rank;
 
+import java.util.AbstractMap;
 import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -20,4 +21,16 @@ public List<Main> calculateRank() {
                 .map(user -> Main.of(rankPoint.getAndIncrement(), user))
                 .toList();
     }
+
+    public Long getUserRank(Long userId) {
+        AtomicInteger rankPoint = new AtomicInteger(1);
+
+        return Long.valueOf(soptampUserInfos.stream()
+                .sorted(Comparator.comparing(SoptampUserInfo::getTotalPoints).reversed())
+                .map(user -> new AbstractMap.SimpleEntry<>(rankPoint.getAndIncrement(), user))
+                .filter(entry -> entry.getValue().getId().equals(userId))
+                .map(AbstractMap.SimpleEntry::getKey)
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("User not found")));
+    }
 }
diff --git a/src/main/java/org/sopt/app/application/user/UserService.java b/src/main/java/org/sopt/app/application/user/UserService.java
@@ -1,5 +1,6 @@
 package org.sopt.app.application.user;
 
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
@@ -8,7 +9,10 @@
 import org.sopt.app.common.exception.NotFoundException;
 import org.sopt.app.common.exception.UnauthorizedException;
 import org.sopt.app.common.response.ErrorCode;
+import org.sopt.app.domain.entity.Icons;
 import org.sopt.app.domain.entity.User;
+import org.sopt.app.domain.enums.IconType;
+import org.sopt.app.interfaces.postgres.IconRepository;
 import org.sopt.app.interfaces.postgres.UserRepository;
 import org.sopt.app.presentation.auth.AppAuthRequest.AccessTokenRequest;
 import org.springframework.stereotype.Service;
@@ -21,6 +25,7 @@
 public class UserService {
 
     private final UserRepository userRepository;
+    private final IconRepository iconRepository;
 
     @Transactional
     public Long upsertUser(LoginInfo loginInfo) {
@@ -82,4 +87,22 @@ public List<Long> getAllPlaygroundIds() {
     public boolean isUserExist(Long userId) {
         return userRepository.existsById(userId);
     }
+
+    public Long getDuration(Long myGeneration, Long currentGeneration) {
+        long monthsBetweenGenerations = (currentGeneration - myGeneration) * 6;
+        LocalDate now = LocalDate.now();
+        int currentMonth = now.getMonthValue();
+        int startMonth = (currentGeneration % 2 == 0) ? 3 : 9;
+        int monthsSinceStart = currentMonth - startMonth;
+        if (monthsSinceStart < 0) {
+            monthsSinceStart += 12;
+        }
+        return monthsBetweenGenerations + monthsSinceStart;
+    }
+
+    public List<String> getIcons(IconType iconType) {
+        return iconRepository.findAllByIconType(iconType).stream()
+                .map(Icons::getIconUrl)
+                .toList();
+    }
 }
diff --git a/src/main/java/org/sopt/app/domain/entity/Icons.java b/src/main/java/org/sopt/app/domain/entity/Icons.java
@@ -0,0 +1,27 @@
+package org.sopt.app.domain.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.sopt.app.domain.enums.IconType;
+
+@Entity
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Icons {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String iconUrl;
+
+    @Enumerated(EnumType.STRING)
+    private IconType iconType;
+}
diff --git a/src/main/java/org/sopt/app/domain/enums/IconType.java b/src/main/java/org/sopt/app/domain/enums/IconType.java
@@ -0,0 +1,5 @@
+package org.sopt.app.domain.enums;
+
+public enum IconType {
+    ACTIVE, INACTIVE
+}
diff --git a/src/main/java/org/sopt/app/facade/AuthFacade.java b/src/main/java/org/sopt/app/facade/AuthFacade.java
@@ -1,13 +1,20 @@
 package org.sopt.app.facade;
 
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.sopt.app.application.auth.JwtTokenService;
-import org.sopt.app.application.auth.dto.PlaygroundAuthTokenInfo.*;
+import org.sopt.app.application.auth.dto.PlaygroundAuthTokenInfo.AppToken;
 import org.sopt.app.application.playground.PlaygroundAuthService;
-import org.sopt.app.application.playground.dto.PlaygroundProfileInfo.*;
+import org.sopt.app.application.playground.dto.PlaygroundProfileInfo.LoginInfo;
+import org.sopt.app.application.playground.dto.PlaygroundProfileInfo.PlaygroundMain;
+import org.sopt.app.application.playground.dto.PlaygroundProfileInfo.PlaygroundProfile;
+import org.sopt.app.application.poke.PokeService;
 import org.sopt.app.application.soptamp.SoptampUserService;
 import org.sopt.app.application.user.UserService;
-import org.sopt.app.presentation.auth.AppAuthRequest.*;
+import org.sopt.app.domain.entity.User;
+import org.sopt.app.domain.enums.IconType;
+import org.sopt.app.presentation.auth.AppAuthRequest.AccessTokenRequest;
+import org.sopt.app.presentation.auth.AppAuthRequest.CodeRequest;
 import org.sopt.app.presentation.auth.AppAuthResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,6 +27,7 @@ public class AuthFacade {
     private final UserService userService;
     private final PlaygroundAuthService playgroundAuthService;
     private final SoptampUserService soptampUserService;
+    private final PokeService pokeService;
 
     @Transactional
     public AppAuthResponse loginWithPlayground(CodeRequest codeRequest) {
@@ -66,4 +74,19 @@ public AppAuthResponse getRefreshToken(String refreshToken) {
                 .build();
     }
 
+    public int getUserSoptLevel(User user) {
+        return playgroundAuthService.getUserSoptLevel(user);
+    }
+
+    public PlaygroundProfile getUserDetails(User user) {
+        return playgroundAuthService.getPlayGroundProfile(user.getPlaygroundToken());
+    }
+
+    public Long getDuration(Long myGeneration, Long generation) {
+        return userService.getDuration(myGeneration, generation);
+    }
+
+    public List<String> getIcons(IconType iconType) {
+        return userService.getIcons(iconType);
+    }
 }
diff --git a/src/main/java/org/sopt/app/facade/PokeFacade.java b/src/main/java/org/sopt/app/facade/PokeFacade.java
@@ -259,4 +259,8 @@ public RecommendedFriendsRequest getRecommendedFriendsByTypeList(
     public boolean getIsNewUser(Long userId) {
         return friendService.getIsNewUser(userId);
     }
+
+    public Long getUserPokeCount(Long userId) {
+        return pokeService.getUserPokeCount(userId);
+    }
 }
diff --git a/src/main/java/org/sopt/app/facade/RankFacade.java b/src/main/java/org/sopt/app/facade/RankFacade.java
@@ -47,4 +47,11 @@ public PartRank findPartRank(Part part) {
                 .filter(partRank -> partRank.getPart().equals(part.getPartName()))
                 .findFirst().orElseThrow();
     }
+
+    @Transactional(readOnly = true)
+    public Long findUserRank(Long userId) {
+        List<SoptampUserInfo> soptampUserInfos = soptampUserFinder.findAllOfCurrentGeneration();
+        SoptampUserRankCalculator soptampUserRankCalculator = new SoptampUserRankCalculator(soptampUserInfos);
+        return soptampUserRankCalculator.getUserRank(userId);
+    }
 }
diff --git a/src/main/java/org/sopt/app/interfaces/postgres/IconRepository.java b/src/main/java/org/sopt/app/interfaces/postgres/IconRepository.java
@@ -0,0 +1,10 @@
+package org.sopt.app.interfaces.postgres;
+
+import java.util.List;
+import org.sopt.app.domain.entity.Icons;
+import org.sopt.app.domain.enums.IconType;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface IconRepository extends JpaRepository<Icons,Long> {
+    List<Icons> findAllByIconType(IconType iconType);
+}
diff --git a/src/main/java/org/sopt/app/interfaces/postgres/PokeHistoryRepository.java b/src/main/java/org/sopt/app/interfaces/postgres/PokeHistoryRepository.java
@@ -1,5 +1,6 @@
 package org.sopt.app.interfaces.postgres;
 
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 import org.sopt.app.domain.entity.poke.PokeHistory;
 import org.springframework.data.domain.Page;
@@ -36,4 +37,6 @@ List<PokeHistory> findAllWithFriendOrderByCreatedAtDescIsReplyFalse(@Param("user
     List<PokeHistory> findAllPokeHistoryByUsers(@Param("userId") Long userId, @Param("friendId") Long friendId);
 
     Long countByPokedIdAndIsReplyIsFalse(Long pokedId);
+
+    Long countByPokerIdOrPokedId(@NotNull Long pokerId, @NotNull Long pokedId);
 }
diff --git a/src/main/java/org/sopt/app/presentation/user/UserController.java b/src/main/java/org/sopt/app/presentation/user/UserController.java
@@ -6,20 +6,32 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import jakarta.validation.Valid;
+import java.time.LocalDate;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import lombok.val;
+import org.sopt.app.application.fortune.FortuneService;
+import org.sopt.app.application.playground.dto.PlaygroundProfileInfo.PlaygroundProfile;
 import org.sopt.app.application.soptamp.SoptampUserService;
 import org.sopt.app.domain.entity.User;
+import org.sopt.app.domain.enums.IconType;
+import org.sopt.app.facade.AuthFacade;
+import org.sopt.app.facade.PokeFacade;
+import org.sopt.app.facade.RankFacade;
 import org.sopt.app.facade.SoptampFacade;
+import org.sopt.app.presentation.user.UserResponse.SoptLog;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+@Slf4j
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/v2/user")
@@ -28,6 +40,13 @@ public class UserController {
 
     private final SoptampUserService soptampUserService;
     private final SoptampFacade soptampFacade;
+    private final AuthFacade authFacade;
+    private final PokeFacade pokeFacade;
+    private final RankFacade rankFacade;
+    private final FortuneService fortuneService;
+
+    @Value("${sopt.current.generation}")
+    private Long generation;
 
     @Operation(summary = "솝탬프 정보 조회")
     @ApiResponses({
@@ -38,10 +57,10 @@ public class UserController {
     public ResponseEntity<UserResponse.Soptamp> getSoptampInfo(@AuthenticationPrincipal User user) {
         val soptampUser = soptampUserService.getSoptampUserInfo(user.getId());
         val response = UserResponse.Soptamp.builder()
-            .nickname(soptampUser.getNickname())
-            .profileMessage(soptampUser.getProfileMessage())
-            .points(soptampUser.getTotalPoints())
-            .build();
+                .nickname(soptampUser.getNickname())
+                .profileMessage(soptampUser.getProfileMessage())
+                .points(soptampUser.getTotalPoints())
+                .build();
         return ResponseEntity.ok(response);
     }
 
@@ -55,11 +74,39 @@ public ResponseEntity<UserResponse.ProfileMessage> editProfileMessage(
             @AuthenticationPrincipal User user,
             @Valid @RequestBody UserRequest.EditProfileMessageRequest editProfileMessageRequest
     ) {
-        val result = soptampFacade.editSoptampUserProfileMessage(user.getId(), editProfileMessageRequest.getProfileMessage());
+        val result = soptampFacade.editSoptampUserProfileMessage(user.getId(),
+                editProfileMessageRequest.getProfileMessage());
         val response = UserResponse.ProfileMessage.builder()
-            .profileMessage(result.getProfileMessage())
-            .build();
+                .profileMessage(result.getProfileMessage())
+                .build();
         return ResponseEntity.ok(response);
     }
 
+    @Operation(summary = "유저 솝트로그 조회")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "success"),
+            @ApiResponse(responseCode = "500", description = "server error", content = @Content)
+    })
+    @GetMapping(value = "/sopt-log")
+    public ResponseEntity<UserResponse.SoptLog> getUserSoptLog(
+            @AuthenticationPrincipal User user, @RequestParam(required = false, value = "ko") boolean partTypeToKorean
+    ) {
+        int soptLevel = authFacade.getUserSoptLevel(user);
+        Long pokeCount = pokeFacade.getUserPokeCount(user.getId());
+        PlaygroundProfile playgroundProfile = authFacade.getUserDetails(user);
+        Long soptampRank = null;
+        Long soptDuring = null;
+        Boolean isActive = playgroundProfile.getLatestActivity().getGeneration() == 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 {
+            soptDuring = authFacade.getDuration(playgroundProfile.getLatestActivity().getGeneration(), generation);
+        }
+        List<String> icons = authFacade.getIcons(isActive ? IconType.ACTIVE : IconType.INACTIVE);
+        return ResponseEntity.ok(
+                SoptLog.of(soptLevel, pokeCount, soptampRank, soptDuring, isActive, icons, playgroundProfile,
+                        partTypeToKorean,isFortuneChecked, fortuneText));
+    }
 }