[BE] FIX: dev 변경사항 머지

innovationacademy-kr · Oct 26, 2023 · a738ae0 · a738ae0
1 parent 2c76240
commit a738ae0
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 232 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetOptionalFetcher.java b/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetOptionalFetcher.java
@@ -1,6 +1,8 @@
 package org.ftclub.cabinet.cabinet.repository;
 
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.ftclub.cabinet.cabinet.domain.Cabinet;
@@ -18,9 +20,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * CabinetService를 위한 ExceptionService
  */
@@ -62,22 +61,23 @@ public List<ActiveCabinetInfoEntities> findCabinetsActiveLentHistoriesByBuilding
     public List<Cabinet> findCabinetsByBuildingAndFloor2(String building, Integer floor) {
         return cabinetRepository.findAllCabinetsByBuildingAndFloor(building, floor);
     }
-	/**
-	 * 유저 ID로 사물함을 찾습니다.
-	 *
-	 * @param userId 유저ID
-	 * @return 사물함 엔티티
-	 * @throws ServiceException 사물함을 찾을 수 없는 경우
-	 */
-	public Cabinet findLentCabinetByUserId(Long userId) {
-		log.debug("Called findLentCabinetByUserId: {}", userId);
-		return cabinetRepository.findLentCabinetByUserId(userId).orElse(null);
-	}
-
-	public List<String> findAllBuildings() {
-		log.debug("Called findAllBuildings");
-		return cabinetRepository.findAllBuildings();
-	}
+
+    /**
+     * 유저 ID로 사물함을 찾습니다.
+     *
+     * @param userId 유저ID
+     * @return 사물함 엔티티
+     * @throws ServiceException 사물함을 찾을 수 없는 경우
+     */
+    public Cabinet findLentCabinetByUserId(Long userId) {
+        log.debug("Called findLentCabinetByUserId: {}", userId);
+        return cabinetRepository.findLentCabinetByUserId(userId).orElse(null);
+    }
+
+    public List<String> findAllBuildings() {
+        log.debug("Called findAllBuildings");
+        return cabinetRepository.findAllBuildings();
+    }
 
     public List<Integer> findAllFloorsByBuilding(String building) {
         log.debug("Called findAllFloorsByBuilding: {}", building);
@@ -90,10 +90,11 @@ public List<String> findAllSectionsByBuildingAndFloor(String building, Integer f
         return cabinetRepository.findAllSectionsByBuildingAndFloor(building, floor);
     }
 
-	public List<Cabinet> findAllPendingCabinetsByCabinetStatusAndBeforeEndedAt(CabinetStatus cabinetStatus, LocalDateTime currentDate) {
-		log.debug("Called findAllCabinetsByCabinetStatusAndBeforeEndedAt: {}", cabinetStatus);
-		return cabinetRepository.findAllCabinetsByCabinetStatusAndBeforeEndedAt(cabinetStatus, currentDate);
-	}
+    public List<Cabinet> findAllPendingCabinetsByCabinetStatusAndBeforeEndedAt(CabinetStatus cabinetStatus,
+                                                                               LocalDateTime currentDate) {
+        log.debug("Called findAllCabinetsByCabinetStatusAndBeforeEndedAt: {}", cabinetStatus);
+        return cabinetRepository.findAllCabinetsByCabinetStatusAndBeforeEndedAt(cabinetStatus, currentDate);
+    }
 
     public Page<Cabinet> findPaginationByLentType(LentType lentType, PageRequest pageable) {
         log.debug("Called findPaginationByLentType: {}", lentType);
@@ -120,17 +121,6 @@ public List<Cabinet> findAllCabinetsByBuildingAndFloor(String building, Integer
     }
     /*-------------------------------------------GET--------------------------------------------*/
 
-    /**
-     * 유저 ID로 사물함을 찾습니다.
-     *
-     * @param userId 유저ID
-     * @return 사물함 엔티티
-     * @throws ServiceException 사물함을 찾을 수 없는 경우
-     */
-    public Cabinet findLentCabinetByUserId(Long userId) {
-        log.debug("Called findLentCabinetByUserId: {}", userId);
-        return cabinetRepository.findLentCabinetByUserId(userId).orElse(null);
-    }
 
     /**
      * 사물함 ID로 변경 사항이 예정된 사물함을 찾습니다.
@@ -189,16 +179,16 @@ public Cabinet getClubCabinet(Long cabinetId) {
         return cabinet;
     }
 
-	/**
-	 * 사물함 ID로 위치(빌딩, 층, 섹션) 정보를 찾습니다.
-	 *
-	 * @param cabinetId 사물함 ID
-	 * @return 위치 엔티티
-	 * @throws ServiceException 사물함을 찾을 수 없는 경우
-	 */
-	public Location getLocation(Long cabinetId) {
-		log.debug("Called getLocation: {}", cabinetId);
-		return cabinetRepository.findLocationById(cabinetId)
-				.orElseThrow(() -> new ServiceException(ExceptionStatus.NOT_FOUND_CABINET));
-	}
+    /**
+     * 사물함 ID로 위치(빌딩, 층, 섹션) 정보를 찾습니다.
+     *
+     * @param cabinetId 사물함 ID
+     * @return 위치 엔티티
+     * @throws ServiceException 사물함을 찾을 수 없는 경우
+     */
+    public Location getLocation(Long cabinetId) {
+        log.debug("Called getLocation: {}", cabinetId);
+        return cabinetRepository.findLocationById(cabinetId)
+                .orElseThrow(() -> new ServiceException(ExceptionStatus.NOT_FOUND_CABINET));
+    }
 }
diff --git a/backend/src/main/java/org/ftclub/cabinet/config/CabinetProperties.java b/backend/src/main/java/org/ftclub/cabinet/config/CabinetProperties.java
@@ -13,7 +13,7 @@ public class CabinetProperties {
 	@Value("${spring.cabinet.lent.term.share}")
 	private Integer lentTermShare;
 	@Value("${spring.cabinet.lent.term.extend}")
-	private Integer lentTermExtend;
+	private Integer lentExtendTerm;
 	@Value("${spring.cabinet.penalty.day.share}")
 	private Integer penaltyDayShare;
 	@Value("${spring.cabinet.penalty.day.padding}")

diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/controller/LentController.java b/backend/src/main/java/org/ftclub/cabinet/lent/controller/LentController.java
@@ -39,7 +39,6 @@ public void startLentCabinet(
 		log.info("Called startLentCabinet user: {}, cabinetId: {}", user, cabinetId);
 		lentFacadeService.startLentCabinet(user.getUserId(), cabinetId);
 	}
-
 	@PostMapping("/cabinets/share/{cabinetId}")
 	public void startLentShareCabinet(
 			@UserSession UserSessionDto user,
@@ -50,13 +49,6 @@ public void startLentShareCabinet(
 				shareCodeDto.getShareCode());
 	}
 
-	@PatchMapping("/cabinets/extend")
-	public void extendLentCabinet(
-			@UserSession UserSessionDto user) {
-		log.info("Called extendLentCabinet user: {}, cabinetId: {}", user);
-		lentFacadeService.extendLent(user.getUserId());
-	}
-
 	@PatchMapping("/cabinets/share/cancel/{cabinetId}")
 	public void cancelLentShareCabinet(
 			@UserSession UserSessionDto user,

diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicy.java b/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicy.java
@@ -76,11 +76,6 @@ LentPolicyStatus verifyUserForLentShare(User user, Cabinet cabinet, int userActi
 	 */
 	Integer getDaysForLentTermShare(Integer totalUserCount);
 
-	/**
-	 * @return 사물함 대여 기간 연장 가능한 날
-	 */
-	int getDaysForTermExtend();
-
 	/**
 	 * @return 만료가 임박하여 공유 사물함을 빌릴 수 없는 날
 	 */

diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicyImpl.java b/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicyImpl.java
@@ -196,12 +196,6 @@ public Integer getDaysForLentTermShare(Integer totalUserCount) {
 		return cabinetProperties.getLentTermShare() * totalUserCount;
 	}
 
-	@Override
-	public int getDaysForTermExtend() {
-		log.debug("Called getDaysForTermExtend");
-		return cabinetProperties.getLentTermExtend();
-	}
-
 	@Override
 	public Integer getDaysForNearExpiration() {
 		log.debug("Called getDaysForNearExpiration");

diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentFacadeService.java b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentFacadeService.java
@@ -164,10 +164,4 @@ void updateCabinetInfo(UserSessionDto userSessionDto,
 	 */
 	void assignLent(Long userId, Long cabinetId);
 
-	/**
-	 * 대여기간을 연장합니다.
-	 *
-	 * @param userId
-	 */
-	void extendLent(Long userId);
 }
diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentService.java b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentService.java
@@ -89,7 +89,5 @@ public interface LentService {
 	 *
 	 * @param userId
 	 */
-	void extendLentCabinet(Long userId);
-
 
 }
diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentServiceImpl.java b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentServiceImpl.java
@@ -13,8 +13,6 @@
 import org.ftclub.cabinet.cabinet.repository.CabinetOptionalFetcher;
 import org.ftclub.cabinet.config.CabinetProperties;
 import org.ftclub.cabinet.dto.ActiveLentHistoryDto;
-import org.ftclub.cabinet.exception.ExceptionStatus;
-import org.ftclub.cabinet.exception.ServiceException;
 import org.ftclub.cabinet.lent.domain.LentHistory;
 import org.ftclub.cabinet.lent.domain.LentPolicy;
 import org.ftclub.cabinet.lent.repository.LentOptionalFetcher;
@@ -26,7 +24,6 @@
 import org.ftclub.cabinet.user.repository.BanHistoryRepository;
 import org.ftclub.cabinet.user.repository.UserOptionalFetcher;
 import org.ftclub.cabinet.user.service.UserService;
-import org.ftclub.cabinet.utils.slackbot.SlackbotManager;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -46,7 +43,6 @@ public class LentServiceImpl implements LentService {
 	private final LentMapper lentMapper;
 	private final LentRedis lentRedis;
 	private final CabinetProperties cabinetProperties;
-	private final SlackbotManager slackbotManager;
 
 
 	@Override
@@ -71,7 +67,6 @@ public void startLentCabinet(Long userId, Long cabinetId) {
 		LentHistory lentHistory = LentHistory.of(now, expiredAt, userId, cabinetId);
 		lentPolicy.applyExpirationDate(lentHistory, expiredAt);
 		lentRepository.save(lentHistory);
-		slackbotManager.sendSlackMessage(user.getName(), cabinet.getVisibleNum(), expiredAt);
 	}
 
 	@Override
@@ -268,39 +263,6 @@ public List<ActiveLentHistoryDto> getAllActiveLentHistories() {
 				.collect(Collectors.toList());
 	}
 
-	@Override
-	public void extendLentCabinet(Long userId) {
-		log.debug("Called extendLentCabinet: {}, {}", userId);
-
-		User user = userOptionalFetcher.getUser(userId);
-		if (!user.isExtensible()) {
-			throw new ServiceException(ExceptionStatus.EXTENSION_TICKET_NOT_FOUND);
-		}
-
-		Cabinet lentCabinet = cabinetOptionalFetcher.findLentCabinetByUserId(userId);
-		if (lentCabinet == null) {
-			throw new ServiceException(ExceptionStatus.NO_LENT_CABINET);
-		}
-
-		Long cabinetId = lentCabinet.getCabinetId();
-		List<LentHistory> allActiveLentByCabinetId = lentOptionalFetcher.findAllActiveLentByCabinetId(
-				cabinetId);
-		int lentHistorySize = allActiveLentByCabinetId.size();
-
-		// 공유사물함에서 1명일 때 연장권 사용 방지
-		LentType lentType = lentCabinet.getLentType();
-		if (lentType.equals(LentType.SHARE) && lentHistorySize == 1) {
-			throw new ServiceException(ExceptionStatus.EXTENSION_SOLO_IN_SHARE_NOT_ALLOWED);
-		}
-
-		LocalDateTime oldExpiredAt = allActiveLentByCabinetId.get(0).getExpiredAt();
-		allActiveLentByCabinetId.forEach(lentHistory -> {
-			lentHistory.setExpiredAt(
-					lentPolicy.generateExtendedExpirationDate(oldExpiredAt));
-		});
-		user.setExtensible(false);
-	}
-
 	public void saveLentHistories(LocalDateTime now, Long cabinetId) {
 		ArrayList<String> userIdList = lentRedis.getUserIdsByCabinetIdInRedis(
 				cabinetId.toString());
@@ -315,3 +277,4 @@ public void saveLentHistories(LocalDateTime now, Long cabinetId) {
 				});
 	}
 }
+
diff --git a/backend/src/main/java/org/ftclub/cabinet/mapper/UserMapper.java b/backend/src/main/java/org/ftclub/cabinet/mapper/UserMapper.java
@@ -38,7 +38,7 @@ public interface UserMapper {
 	@Mapping(target = "userId", source = "user.userId")
 	@Mapping(target = "cabinetId", source = "cabinet.cabinetId")
 	MyProfileResponseDto toMyProfileResponseDto(UserSessionDto user, Cabinet cabinet,
-			BanHistory banHistory, boolean isExtensible);
+			BanHistory banHistory);
 
 	BlockedUserPaginationDto toBlockedUserPaginationDto(List<UserBlockedInfoDto> result,
 			Long totalLength);

diff --git a/backend/src/main/java/org/ftclub/cabinet/user/service/LentExtensionServiceImpl.java b/backend/src/main/java/org/ftclub/cabinet/user/service/LentExtensionServiceImpl.java
@@ -50,6 +50,7 @@ public void issueLentExtension() {
         });
     }
 
+
     @Override
     public void assignLentExtension(String username) {
         log.debug("Called assignLentExtension {}", username);

diff --git a/backend/src/main/java/org/ftclub/cabinet/user/service/UserService.java b/backend/src/main/java/org/ftclub/cabinet/user/service/UserService.java
@@ -38,8 +38,6 @@ public interface UserService {
 
 	void updateUserBlackholedAt(Long userId, LocalDateTime newBlackholedAt);
 
-	void updateUserExtensible(List<UserMonthDataDto> extensibleUsers);
-
 	void banUser(Long userId, LentType lentType, LocalDateTime startedAt, LocalDateTime endedAt,
 			LocalDateTime expiredAt);
 

diff --git a/backend/src/main/java/org/ftclub/cabinet/utils/scheduler/SystemScheduler.java b/backend/src/main/java/org/ftclub/cabinet/utils/scheduler/SystemScheduler.java
@@ -8,7 +8,6 @@
 import org.ftclub.cabinet.dto.UserBlackholeInfoDto;
 import org.ftclub.cabinet.lent.service.LentService;
 import org.ftclub.cabinet.occupiedtime.OccupiedTimeManager;
-import org.ftclub.cabinet.occupiedtime.UserMonthDataDto;
 import org.ftclub.cabinet.user.service.UserService;
 import org.ftclub.cabinet.utils.blackhole.manager.BlackholeManager;
 import org.ftclub.cabinet.utils.leave.absence.LeaveAbsenceManager;
@@ -99,10 +98,10 @@ public void releasePendingCabinet() {
 		releaseManager.releasingCabinets();
 	}
 
-	@Scheduled(cron = "${spring.schedule.cron.extensible-user-check}")
-	public void checkUserQualifyForExtensible(){
-		log.info("called checkUserQualifyForExtensible");
-		List<UserMonthDataDto> userMonthDataDtos = occupiedTimeManager.metLimitTimeUser(occupiedTimeManager.getUserLastMonthOccupiedTime());
-		userService.updateUserExtensible(userMonthDataDtos);
-	}
+//	@Scheduled(cron = "${spring.schedule.cron.extensible-user-check}")
+//	public void checkUserQualifyForExtensible(){
+//		log.info("called checkUserQualifyForExtensible");
+//		List<UserMonthDataDto> userMonthDataDtos = occupiedTimeManager.metLimitTimeUser(occupiedTimeManager.getUserLastMonthOccupiedTime());
+//		userService.updateUserExtensible(userMonthDataDtos);
+//	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,7 +89,5 @@ public interface LentService { @@
     	 *
     	 * @param userId
     	 */
-    	void extendLentCabinet(Long userId);
     }