♻️ refactor: update user level batch refactoring

backend/streetdrop-api/src/main/java/com/depromeet/domains/level/service/LevelService.java

@@ -1,6 +1,6 @@
 package com.depromeet.domains.level.service;
 
-import com.depromeet.domains.level.data.LevelPolicy;
+import com.depromeet.level.data.LevelPolicy;
 import com.depromeet.domains.level.dto.LevelPolicyDataDto;
 import com.depromeet.domains.level.dto.LevelPolicyResponseDto;
 import lombok.RequiredArgsConstructor;

backend/streetdrop-api/src/main/java/com/depromeet/domains/user/service/UserLevelService.java

@@ -3,18 +3,19 @@
 import com.depromeet.common.error.dto.CommonErrorCode;
 import com.depromeet.common.error.exception.internal.NotFoundException;
 import com.depromeet.domains.item.repository.ItemRepository;
-import com.depromeet.domains.level.data.LevelPolicy;
 import com.depromeet.domains.user.dto.response.UserLevelProgressDto;
 import com.depromeet.domains.user.dto.response.UserLevelResponseDto;
 import com.depromeet.domains.user.repository.UserLevelRepository;
+import com.depromeet.level.data.LevelPolicy;
 import com.depromeet.user.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 
-import static com.depromeet.domains.level.data.LevelPolicy.getNextLevel;
+import static com.depromeet.level.data.LevelPolicy.getNextLevel;
+
 
 @RequiredArgsConstructor
 @Service

backend/streetdrop-batch/src/main/java/com/depromeet/domains/item/dto/UserItemCount.java

@@ -0,0 +1,11 @@
+package com.depromeet.domains.item.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public class UserItemCount {
+    private Long userId;
+    private Long itemCount;
+}

backend/streetdrop-batch/src/main/java/com/depromeet/domains/item/repository/ItemRepository.java

@@ -1,17 +1,23 @@
 package com.depromeet.domains.item.repository;
 
-import com.depromeet.domains.user.UserItemDto;
+import com.depromeet.domains.item.dto.UserItemCount;
 import com.depromeet.item.Item;
+import com.depromeet.user.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Repository
 public interface ItemRepository extends JpaRepository<Item, Long> {
 
-	@Query("SELECT new com.depromeet.domains.user.UserItemDto(i.user.id, CAST(COUNT(i.id) AS int)) FROM Item i WHERE i.user.id IN :userIds GROUP BY i.user.id")
-	List<UserItemDto> countItemsByUserIdIn(@Param("userIds") List<Long> userIds);
+	@Query("SELECT new com.depromeet.domains.item.dto.UserItemCount(i.user.id, CAST(COUNT(i.id) AS long)) FROM Item i WHERE i.user.id IN :userIds GROUP BY i.user.id")
+	List<UserItemCount> countItemsByUserIdIn(@Param("userIds") List<Long> userIds);
+
+	@Query("SELECT i.user FROM Item AS i WHERE i.createdAt > :createdAt")
+	List<User> findAllItemUpdateUser(@Param("createdAt") LocalDateTime createdAt);
+
 }

backend/streetdrop-batch/src/main/java/com/depromeet/domains/level/LevelUpdater.java

@@ -0,0 +1,16 @@
+package com.depromeet.domains.level;
+
+import com.depromeet.level.data.LevelPolicy;
+import lombok.AllArgsConstructor;
+
+import java.util.Arrays;
+
+@AllArgsConstructor
+public class LevelUpdater {
+	public static LevelPolicy getUpdateLevel(Long dropCount) {
+		return Arrays.stream(LevelPolicy.values())
+				.filter(policy -> dropCount >= policy.getDropCountStart() && dropCount < policy.getDropCountEnd())
+				.findFirst()
+				.orElse(LevelPolicy.LEVEL_1);
+	}
+}

backend/streetdrop-batch/src/main/java/com/depromeet/domains/popup/repository/PopupRepository.java

@@ -2,6 +2,8 @@
 
 import com.depromeet.popup.Popup;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface PopupRepository extends JpaRepository<Popup, Long> {
 }

backend/streetdrop-batch/src/main/java/com/depromeet/domains/popup/service/PopupService.java

@@ -16,4 +16,9 @@ public void createLevelUpPopup(User user, long newLevel) {
         Popup popup = new Popup(user.getId(), "LEVEL_" + newLevel);
         popupRepository.save(popup);
     }
+
+    public void createGuidePopup(User user) {
+        Popup popup = new Popup(user.getId(), "GUIDE_1");
+        popupRepository.save(popup);
+    }
 }

backend/streetdrop-batch/src/main/java/com/depromeet/domains/user/jobs/UserGuideJob.java

@@ -0,0 +1,16 @@
+package com.depromeet.domains.user.jobs;
+
+import com.depromeet.domains.user.service.UserService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class UserGuideJob {
+    private final UserService userService;
+
+    public void run() {
+        userService.createGuidePopup();
+    }
+
+}

backend/streetdrop-batch/src/main/java/com/depromeet/domains/user/repository/UserRepository.java

@@ -1,10 +1,14 @@
 package com.depromeet.domains.user.repository;
 
 import com.depromeet.user.User;
-import com.depromeet.user.UserLevel;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
+
+    List<User> findAllByCreatedAtBefore(LocalDateTime createdAt);
 }

backend/streetdrop-batch/src/main/java/com/depromeet/domains/user/scheduler/UserLevelBatchScheduler.java

@@ -1,18 +1,24 @@
 package com.depromeet.domains.user.scheduler;
 
+import com.depromeet.domains.user.jobs.UserGuideJob;
 import com.depromeet.domains.user.jobs.UserLevelJob;
 import lombok.RequiredArgsConstructor;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Component
 @RequiredArgsConstructor
 public class UserLevelBatchScheduler {
 	private final UserLevelJob userLevelJob;
+	private final UserGuideJob userGuideJob;
 
 	@Scheduled(cron = "0 0/30 * * * *")
 	public void runUserLevelJob() {
 		userLevelJob.run();
 	}
+
+	@Scheduled(cron = "0 0/30 * * * *")
+	public void runUserGuideJob() {
+		userGuideJob.run();
+	}
 }

backend/streetdrop-batch/src/main/java/com/depromeet/domains/user/service/UserService.java

@@ -1,84 +1,61 @@
 package com.depromeet.domains.user.service;
 
+import com.depromeet.domains.item.dto.UserItemCount;
 import com.depromeet.domains.item.repository.ItemRepository;
-import com.depromeet.domains.level.LevelUpdatePolicy;
-import com.depromeet.domains.level.LevelUpdatePolicyImpl;
+import com.depromeet.domains.level.LevelUpdater;
 import com.depromeet.domains.popup.service.PopupService;
-import com.depromeet.domains.user.UserItemDto;
-import com.depromeet.domains.user.repository.UserLevelRepository;
 import com.depromeet.domains.user.repository.UserRepository;
+import com.depromeet.level.data.LevelPolicy;
 import com.depromeet.user.User;
-import com.depromeet.user.UserLevel;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
+@RequiredArgsConstructor
 public class UserService {
 
-	public static final int LEVEL_ONE = 1;
-	public static final int LEVEL_TWO = 2;
-	public static final int LEVEL_THREE = 3;
-
 	private final UserRepository userRepository;
-	private final UserLevelRepository userLevelRepository;
 	private final ItemRepository itemRepository;
-	private final Map<Integer, LevelUpdatePolicy> levelUpdatePolicies;
 	private final PopupService popupService;
 
-	public UserService(UserRepository userRepository, UserLevelRepository userLevelRepository, ItemRepository itemRepository, PopupService popupService) {
-		this.userRepository = userRepository;
-		this.userLevelRepository = userLevelRepository;
-		this.itemRepository = itemRepository;
-		levelUpdatePolicies = createLevelUpdatePolicies();
-		this.popupService = popupService;
-	}
 
-	private Map<Integer, LevelUpdatePolicy> createLevelUpdatePolicies() {
-		Map<Integer, LevelUpdatePolicy> policies = new HashMap<>();
-		policies.put(LEVEL_ONE, new LevelUpdatePolicyImpl(0, 4, getUserLevelById(1L)));
-		policies.put(LEVEL_TWO, new LevelUpdatePolicyImpl(5, 24, getUserLevelById(2L)));
-		policies.put(LEVEL_THREE, new LevelUpdatePolicyImpl(25, 55, getUserLevelById(3L)));
-		return policies;
-	}
-
-	private UserLevel getUserLevelById(long userLevelId) {
-		return userLevelRepository.findUserLevelById(userLevelId);
+	@Transactional
+	public void createGuidePopup() {
+		var signUpUsers = userRepository.findAllByCreatedAtBefore(LocalDateTime.now().minusMinutes(30));
+		signUpUsers.forEach(popupService::createGuidePopup);
 	}
 
 	@Transactional
 	public void updateLevel() {
-		List<User> usersToUpdateLevel = new ArrayList<>();
-		var allUsers = userRepository.findAll();
-		var userIds = allUsers.stream().map(User::getId).collect(Collectors.toList());
-		var userItemDtoList = itemRepository.countItemsByUserIdIn(userIds);
-
-		Map<Long, Integer> itemCountMap = userItemDtoList.stream()
-				.collect(Collectors.toMap(UserItemDto::getUserId, UserItemDto::getItemCount));
-
-		allUsers.forEach(user -> {
-			var itemCount = itemCountMap.getOrDefault(user.getId(), 0);
-			updateUserLevel(user, itemCount, usersToUpdateLevel);
-		});
-		userRepository.saveAll(usersToUpdateLevel);
-	}
-
-	private void updateUserLevel(User user, Integer itemCount, List<User> usersToUpdateLevel) {
-		for (Map.Entry<Integer, LevelUpdatePolicy> entry : levelUpdatePolicies.entrySet()) {
-			LevelUpdatePolicy policy = entry.getValue();
-			if (policy.isAcceptable(itemCount)) {
-				user.changeLevel(policy.getNewLevel().getId());
-				popupService.createLevelUpPopup(user, policy.getNewLevel().getId());
-				usersToUpdateLevel.add(user);
-				break;
-			}
-		}
+		var itemUpdateUsers = itemRepository.findAllItemUpdateUser(LocalDateTime.now().minusMinutes(30)).stream().distinct().toList();
+
+		var userIds = itemUpdateUsers.stream().map(User::getId).toList();
+		List<UserItemCount> userItemDtoMap = itemRepository.countItemsByUserIdIn(userIds);
+
+
+		itemUpdateUsers.forEach(
+				user -> {
+					var userId = user.getId();
+					var itemCount = userItemDtoMap.stream()
+							.filter(dto -> dto.getUserId().equals(userId))
+							.map(UserItemCount::getItemCount)
+							.findFirst()
+							.orElse(null);
+
+					LevelPolicy newLevel = LevelUpdater.getUpdateLevel(itemCount);
+					if (newLevel.getLevel() > user.getUserLevel().getId()) {
+						user.changeLevel(newLevel.getLevel());
+						popupService.createLevelUpPopup(user, newLevel.getLevel());
+					}
+				}
+		);
+
+		userRepository.saveAll(itemUpdateUsers);
 	}
 }

backend/streetdrop-api/src/main/java/com/depromeet/domains/level/data/LevelPolicy.java → backend/streetdrop-domain/src/main/java/com/depromeet/level/data/LevelPolicy.java

@@ -1,4 +1,4 @@
-package com.depromeet.domains.level.data;
+package com.depromeet.level.data;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;