alpha .4 main <- develop

src/main/java/io/oeid/mogakgo/domain/achievement/infrastructure/UserAchievementRepositoryCustomImpl.java

@@ -73,18 +73,18 @@ public List<UserAchievementInfoRes> getAchievementInfoAboutUser(Long userId) {
             )
             .from(userAchievement)
             .innerJoin(userAchievement.achievement).on(userAchievement.achievement.id.eq(achievement.id))
-            .innerJoin(userActivity).on(
-                userActivity.activityType.eq(userAchievement.achievement.activityType), 
-                userActivity.user.id.eq(userId)
-            )
+            .innerJoin(userActivity).on(userActivity.activityType.eq(userAchievement.achievement.activityType))
             .where(
                 userAchievement.user.id.eq(userId),
+                userAchievement.user.id.eq(userActivity.user.id),
                 userAchievement.achievement.id.in(
                     JPAExpressions.select(achievement1.id.max())
                         .from(userAchievement1)
-                        .innerJoin(achievement1).on(achievement1.id.eq(userAchievement1.achievement.id))
+                        .innerJoin(achievement1).on(achievement1.id.eq(userAchievement1.achievement.id), userAchievement1.user.id.eq(userId))
                         .innerJoin(userActivity1).on(achievement1.activityType.eq(userActivity1.activityType))
-                        .where(userAchievement1.achievement.requirementType.eq(RequirementType.ACCUMULATE))
+                        .where(
+                            userAchievement1.achievement.requirementType.eq(RequirementType.ACCUMULATE),
+                            userAchievement1.user.id.eq(userActivity1.user.id))
                         .groupBy(userActivity1.activityType)
                 )
             )

src/main/java/io/oeid/mogakgo/domain/user/application/UserService.java

@@ -24,6 +24,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -61,14 +62,21 @@ public List<UserDevelopLanguageRes> updateUserDevelopLanguages(long userId) {
         User user = userCommonService.getUserById(userId);
         user.deleteAllDevelopLanguageTags();
         var languageMap = userGithubUtil.updateUserDevelopLanguage(user.getRepositoryUrl());
-        var languages = sortDevelopLanguageMap(languageMap);
-        languages.forEach((key, value) -> {
+        var result = sortDevelopLanguageMap(languageMap);
+        result.ifPresentOrElse(language -> language.forEach((key, value) -> {
             UserDevelopLanguageTag developLanguageTag = UserDevelopLanguageTag.builder()
                 .user(user)
                 .developLanguage(DevelopLanguage.of(key))
                 .byteSize(value)
                 .build();
             userDevelopLanguageTagRepository.save(developLanguageTag);
+        }), () -> {
+            var userDevelopLanguageTag = UserDevelopLanguageTag.builder()
+                .user(user)
+                .developLanguage(DevelopLanguage.NULL)
+                .byteSize(0)
+                .build();
+            userDevelopLanguageTagRepository.save(userDevelopLanguageTag);
         });
         List<UserDevelopLanguageRes> response = new ArrayList<>();
         for (var developLanguage : user.getUserDevelopLanguageTags()) {
@@ -114,12 +122,17 @@ private void validateWantedJobDuplicate(List<WantedJob> wantedJobs) {
         }
     }
 
-    private Map<String, Integer> sortDevelopLanguageMap(Map<String, Integer> languageMap){
+    private Optional<Map<String, Integer>> sortDevelopLanguageMap(
+        Map<String, Integer> languageMap) {
+        if (languageMap.isEmpty()) {
+            return Optional.empty();
+        }
         List<String> languageKeys = new ArrayList<>(languageMap.keySet());
         languageKeys.sort((o1, o2) -> languageMap.get(o2).compareTo(languageMap.get(o1)));
         Map<String, Integer> result = new LinkedHashMap<>();
-        languageKeys.subList(0, 3).forEach(key -> result.put(key, languageMap.get(key)));
-        return result;
+        int length = Math.min(languageMap.size(), 3);
+        languageKeys.subList(0, length).forEach(key -> result.put(key, languageMap.get(key)));
+        return Optional.of(result);
     }
 
 }

src/main/java/io/oeid/mogakgo/domain/user/domain/enums/DevelopLanguage.java

@@ -53,7 +53,9 @@ public enum DevelopLanguage {
     OBJECT_C("Objective-C",
         "https://github.com/Open-Eye-Im-Developer/MoGakGo-BE/assets/85854384/c99bf59a-716f-4dfd-9414-005133ce9c97"),
     ETC("ETC",
-        "https://github.com/Open-Eye-Im-Developer/MoGakGo-BE/assets/85854384/b489846c-bcbf-4575-8bfc-7788da4b9ba0");
+        "https://github.com/Open-Eye-Im-Developer/MoGakGo-BE/assets/85854384/b489846c-bcbf-4575-8bfc-7788da4b9ba0"),
+    NULL("NULL",
+        "https://github.com/Open-Eye-Im-Developer/MoGakGo-BE/assets/85854384/8f0c33f3-62ef-4379-ba6f-eb1eb0ef2471");
 
     private final String language;
     private final String imageUrl;

src/main/java/io/oeid/mogakgo/domain/user/util/UserGithubUtil.java

@@ -23,7 +23,7 @@ public UserGithubUtil(@Value("${auth.github-access-token}") String accessToken)
 
     public Map<String, Integer> updateUserDevelopLanguage(String repositoryUrl) {
         var repositoriesData = getRepositoriesData(repositoryUrl);
-        if (repositoriesData == null) {
+        if (repositoriesData == null || repositoriesData.isEmpty()) {
             return Map.of();
         }
         var monoList = repositoriesData.stream().map(

src/test/java/io/oeid/mogakgo/domain/user/application/UserServiceTest.java

@@ -32,6 +32,7 @@
 @ExtendWith(MockitoExtension.class)
 @DisplayName("서비스 테스트: UserService")
 class UserServiceTest {
+
     @InjectMocks
     private UserService userService;
     @Mock
@@ -131,6 +132,19 @@ void init() {
             .contains(300, 200, 100);
     }
 
+    @Test
+    void 유저_개발언어_업데이트_레포지토리가_존재하지_않는_경우() {
+        // Arrange
+        var expectedUserId = 1L;
+        when(userCommonService.getUserById(expectedUserId)).thenReturn(user);
+        when(userGithubUtil.updateUserDevelopLanguage(any(String.class))).thenReturn(Map.of());
+        // Act
+        var actualResult = userService.updateUserDevelopLanguages(expectedUserId);
+        // Assert
+        assertThat(actualResult).isNotNull().hasSize(1).extracting("language")
+            .contains(DevelopLanguage.NULL);
+    }
+
     @Test
     void 유저_프로필_조회() {
         // Arrange
@@ -181,7 +195,7 @@ void init() {
     }
 
     @Test
-    void 유저_잔디력_조회(){
+    void 유저_잔디력_조회() {
         // Arrange
         var expectedUserId = 1L;
         when(userCommonService.getUserById(expectedUserId)).thenReturn(user);