[FEAT] 모든 질답 완료 시 응답값 구분 #100

Team-Umbba · Aug 24, 2023 · 1ddd5cc · 1ddd5cc
1 parent ee39c8c
commit 1ddd5cc
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 5 deletions.
diff --git a/umbba-api/src/main/java/sopt/org/umbba/api/service/qna/QnAService.java b/umbba-api/src/main/java/sopt/org/umbba/api/service/qna/QnAService.java
@@ -305,6 +305,12 @@ public GetMainViewResponseDto getMainInfo(Long userId) {
         QnA lastQna = qnaList.get(parentchild.getCount()-1);
         log.info("getCount(): {}", parentchild.getCount());
 
+        QnA currentQnA = parentchild.getQnaList().get(parentchild.getCount() - 1);
+        if (parentchild.getCount() == 7 && (currentQnA.isParentAnswer() && currentQnA.isChildAnswer())) {
+            return GetMainViewResponseDto.of(lastQna, parentchild.getCount()+1);  // 유효하지 않은 8로 반환 시 엔딩이벤트
+        }
+
+
         return GetMainViewResponseDto.of(lastQna, parentchild.getCount());
     }
 

diff --git a/umbba-domain/src/main/java/sopt/org/umbba/domain/domain/parentchild/dao/ParentchildDao.java b/umbba-domain/src/main/java/sopt/org/umbba/domain/domain/parentchild/dao/ParentchildDao.java
@@ -14,11 +14,17 @@
 
 @Slf4j
 @Repository
-public class ParentchildDao {
+public class ParentchildDao implements AutoCloseable {
 
     @PersistenceContext
     private EntityManager em;
 
+
+    @Override
+    public void close() throws Exception {
+
+    }
+
     public Optional<Parentchild> findByUserId(Long userId) {
 
         String jpql = "SELECT pc FROM Parentchild pc " +

diff --git a/...otification/src/main/java/sopt/org/umbba/notification/config/ConnectionClosingAspect.java b/...otification/src/main/java/sopt/org/umbba/notification/config/ConnectionClosingAspect.java
@@ -0,0 +1,19 @@
+/*
+package sopt.org.umbba.notification.config;
+
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.stereotype.Component;
+
+import java.sql.Connection;
+
+@Aspect
+@Component
+public class ConnectionClosingAspect {
+
+    @AfterThrowing(pointcut = "execution(* sopt.org.umbba.notification.service.*.*(..))", throwing = "ex")
+    public void closeConnectionOnException(Exception ex) {
+        Connection conn =
+    }
+}
+*/
diff --git a/umbba-notification/src/main/java/sopt/org/umbba/notification/service/fcm/FCMService.java b/umbba-notification/src/main/java/sopt/org/umbba/notification/service/fcm/FCMService.java
@@ -186,7 +186,8 @@ public void schedulePushAlarm(String cronExpression, Long parentchildId) {
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
-                throw new RuntimeException(e);
+                Thread.currentThread().interrupt();
+//                throw new RuntimeException(e);
             }
 
             TransactionDefinition transactionDefinition = new DefaultTransactionDefinition();

diff --git a/...otification/src/main/java/sopt/org/umbba/notification/service/scheduler/FCMScheduler.java b/...otification/src/main/java/sopt/org/umbba/notification/service/scheduler/FCMScheduler.java
@@ -2,6 +2,8 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -15,6 +17,7 @@
 import java.util.List;
 
 @Slf4j
+@Aspect
 @Component
 @RequiredArgsConstructor
 public class FCMScheduler {
@@ -42,8 +45,8 @@ public String pushTodayQna()  {
                 })
                 .forEach(pc -> {
                 log.info(pc.getId() + "번째 Parentchild");
-                String cronExpression = String.format("0 %s %s * * ?", pc.getPushTime().getMinute(), pc.getPushTime().getHour());
-//                String cronExpression = String.format("*/20 * * * * *");
+//                String cronExpression = String.format("0 %s %s * * ?", pc.getPushTime().getMinute(), pc.getPushTime().getHour());
+                String cronExpression = String.format("*/20 * * * * *");
                 log.info("cron: {}", cronExpression);
                 fcmService.schedulePushAlarm(cronExpression, pc.getId());
             });

diff --git a/umbba-notification/src/main/resources/application.yaml b/umbba-notification/src/main/resources/application.yaml
@@ -29,7 +29,7 @@ spring:
       connection-timeout: 30000 # 30초(default: 30초)
       maximum-pool-size: 10  # default: 10개
       max-lifetime: 600000   # 10분(default: 30분)
-      leak-detection-threshold: 2000  # default: 0(이용X)
+      leak-detection-threshold: 60000  # default: 0(이용X)
   jpa:
     show-sql: false
     hibernate: