[BE] FIX: 잘못 올라간 코드 삭제 및 exception 추가

innovationacademy-kr · Sep 15, 2023 · 54c7e0b · 54c7e0b
1 parent b913f14
commit 54c7e0b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
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
@@ -49,11 +49,6 @@ public List<ActiveCabinetInfoEntities> findCabinetsActiveLentHistoriesByBuilding
 				}).collect(Collectors.toList());
 	}
 
-	public List<Cabinet> findCabinetByBuildingAndFloorWithLentHistoryAndUser(String building, Integer floor) {
-		log.info("Called findCabinetByBuildingAndFloorWithLentHistoryAndUser: {}, {}", building, floor);
-		return cabinetRepository.findCabinetByBuildingAndFloorWithLentHistoryAndUser(building, floor);
-	}
-
 	/**
 	 * 유저 ID로 사물함을 찾습니다.
 	 *

diff --git a/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetRepository.java b/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetRepository.java
@@ -102,11 +102,4 @@ List<Object[]> findCabinetActiveLentHistoryUserListByBuildingAndFloor(
 			"FROM Cabinet c " +
 			"WHERE c.cabinetPlace.location.building = :building AND c.cabinetPlace.location.floor = :floor")
 	List<Cabinet> findAllByBuildingAndFloor(@Param("building") String building, @Param("floor") Integer floor);
-
-	@Query("SELECT c " +
-			"FROM Cabinet c " +
-			"LEFT JOIN FETCH c.lentHistories lh " +
-			"LEFT JOIN FETCH lh.user u " +
-			"WHERE c.cabinetPlace.location.building = :building AND c.cabinetPlace.location.floor = :floor ")
-	List<Cabinet> findCabinetByBuildingAndFloorWithLentHistoryAndUser(String building, Integer floor);
 }
diff --git a/backend/src/main/java/org/ftclub/cabinet/exception/CustomServiceException.java b/backend/src/main/java/org/ftclub/cabinet/exception/CustomServiceException.java
@@ -18,4 +18,9 @@ public CustomServiceException(CustomExceptionStatus status) {
     public CustomExceptionStatus getStatus() {
         return status;
     }
+
+    @Override
+    public String getMessage() {
+    	return status.getMessage();
+    }
 }
diff --git a/backend/src/main/java/org/ftclub/cabinet/exception/DomainException.java b/backend/src/main/java/org/ftclub/cabinet/exception/DomainException.java
@@ -12,4 +12,9 @@ public class DomainException extends RuntimeException{
 	public DomainException(ExceptionStatus status) {
 		this.status = status;
 	}
+
+	@Override
+	public String getMessage() {
+		return status.getMessage();
+	}
 }
diff --git a/backend/src/main/java/org/ftclub/cabinet/exception/ServiceException.java b/backend/src/main/java/org/ftclub/cabinet/exception/ServiceException.java
@@ -23,4 +23,9 @@ public ServiceException(ExceptionStatus status) {
     public ExceptionStatus getStatus() {
         return status;
     }
+
+    @Override
+    public String getMessage() {
+        return status.getMessage();
+    }
 }
diff --git a/backend/src/main/java/org/ftclub/cabinet/exception/UtilException.java b/backend/src/main/java/org/ftclub/cabinet/exception/UtilException.java
@@ -20,4 +20,9 @@ public UtilException(ExceptionStatus status) {
 		this.status = status;
 	}
 
+	@Override
+	public String getMessage() {
+		return status.getMessage();
+	}
+
 }