#107 - bug: 로깅 npe 처리 및 쿼리 수정

team-dodal · Nov 20, 2023 · 4ead861 · 4ead861
1 parent 512edf6
commit 4ead861
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/dodal/meet/aop/ControllerLogAop.java b/src/main/java/com/dodal/meet/aop/ControllerLogAop.java
@@ -40,7 +40,7 @@ public void before(JoinPoint joinPoint) {
             if (!ObjectUtils.isEmpty(args[i]) && !args[i].getClass().getSimpleName().equals("UsernamePasswordAuthenticationToken")) {
                 sb.append("[").append(i+1).append("] ").append("Type : ").append(args[i].getClass().getSimpleName()).append(", ").append("Value : ").append(args[i]).append("\n");
             }
-            else if (!args[i].getClass().getSimpleName().equals("UsernamePasswordAuthenticationToken")){
+            else if (ObjectUtils.isEmpty(args[i])){
                 sb.append("[").append(i+1).append("] ").append("Type : null, ").append("Value : null\n");
             }
         }

diff --git a/src/main/java/com/dodal/meet/controller/response/challengeroom/ChallengeRoomCustomImpl.java b/src/main/java/com/dodal/meet/controller/response/challengeroom/ChallengeRoomCustomImpl.java
@@ -110,7 +110,7 @@ room.userCnt, room.bookmarkCnt, new CaseBuilder().when(bookmark.userEntity.isNot
                         room.registeredAt, roomTag.categoryName, roomTag.categoryValue, roomTag.tagName, roomTag.tagValue
                 )).from(room)
                 .innerJoin(roomTag)
-                .on(roomTag.challengeRoomEntity.eq(room))
+                .on(roomTag.eq(room.challengeTagEntity))
                 .leftJoin(bookmark)
                 .on(bookmark.userEntity.eq(userEntity).and(bookmark.challengeRoomEntity.eq(room)))
                 .where(room.title.contains(request.getWord()).and(certCntListIn(request.getCertCntList())))