From 22b690a1472c06b0c33c85820c03ebd87e24e6fc Mon Sep 17 00:00:00 2001 From: jiyoon <95969941+jjunjji@users.noreply.github.com> Date: Sun, 17 Sep 2023 12:52:37 +0900 Subject: [PATCH 1/2] Update rds localTime --- .github/workflows/gradle-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index cd9a701..33638d9 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.github/workflows/gradle-publish.yml @@ -52,7 +52,7 @@ jobs: - run: echo "${{ secrets.FIREBASE_SECRET_KEY }}" > ./src/main/resources/firebase/handsup-9c9e7-firebase-adminsdk-ow0l5-6bb4cd6c8c.json - run: cat ./src/main/resources/firebase/handsup-9c9e7-firebase-adminsdk-ow0l5-6bb4cd6c8c.json - run: touch ./src/main/resources/application.properties - - run: echo "${{ secrets.APPLICATION }}" > ./src/main/resources/application.properties + - run: echo "${{ secrets.PROPERTIES }}" > ./src/main/resources/application.properties - run: cat ./src/main/resources/application.properties # (3) Gradle build (Test 제외) From 8ff375a7c2e6e1afba40321976761862d2c184f8 Mon Sep 17 00:00:00 2001 From: jiyoon <95969941+jjunjji@users.noreply.github.com> Date: Sun, 17 Sep 2023 12:54:11 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EC=9E=90=EC=8B=A0=EC=9D=98=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=EC=97=90=20=EC=B1=84=ED=8C=85?= =?UTF-8?q?=EB=B0=A9=20=EC=83=9D=EC=84=B1=20=EA=B8=88=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/back/handsUp/baseResponse/BaseResponseStatus.java | 1 + src/main/java/com/back/handsUp/service/ChatService.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/back/handsUp/baseResponse/BaseResponseStatus.java b/src/main/java/com/back/handsUp/baseResponse/BaseResponseStatus.java index 6f53d67..2072e51 100644 --- a/src/main/java/com/back/handsUp/baseResponse/BaseResponseStatus.java +++ b/src/main/java/com/back/handsUp/baseResponse/BaseResponseStatus.java @@ -62,6 +62,7 @@ public enum BaseResponseStatus { EXIST_CHATROOMKEY(false, 4055, "이미 존재하는 채팅방 키입니다."), NON_EXIST_LIKE_BOARDS(false, 4056, "다른 사람이 좋아요를 누른 게시물이 없습니다."), NON_EXIST_CHATROOM_USER(false, 4057, "채팅방 내 존재하는 유저가 아닙니다."), + SELF_CHAT_ERROR(false, 4058, "자신이 작성한 게시글에는 채팅방을 생성할 수 없습니다."), /** diff --git a/src/main/java/com/back/handsUp/service/ChatService.java b/src/main/java/com/back/handsUp/service/ChatService.java index 0203651..c114ffb 100644 --- a/src/main/java/com/back/handsUp/service/ChatService.java +++ b/src/main/java/com/back/handsUp/service/ChatService.java @@ -160,7 +160,6 @@ public String chatAlarm(Principal principal, ChatDto.ResSendChat sendChat) throw .build(); try { notificationRepository.save(notificationEntity); - log.info("세이브 완={}", "complete"); firebaseCloudMessageService.sendMessageTo(fcmToken.getFcmToken(), me.getNickname(), "채팅이 도착하였습니다."); return "채팅 알림을 성공적으로 보냈습니다."; } catch (Exception e) { @@ -195,6 +194,10 @@ public String createChat(Principal principal, ChatDto.ReqCreateChat reqCreateCha } User hostUser = optionalHostUser.get(); + if(subUser.getUserIdx() == hostUser.getUserIdx()){ + throw new BaseException(SELF_CHAT_ERROR); + } + ChatRoom chatRoom = ChatRoom.builder() .boardIdx(board) .subUserIdx(subUser)