Merge pull request #97 from Team-Umbba/fix/#95-notification_server_error

[FIX] 커넥션 누수를 해결하기 위해 em.close() 코드 추가
Team-Umbba · Aug 14, 2023 · 9fbc22b · 9fbc22b
2 parents 94a3e38 + c0a3aeb
commit 9fbc22b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/umbba-api/src/main/java/sopt/org/umbba/api/config/sqs/producer/SqsProducer.java b/umbba-api/src/main/java/sopt/org/umbba/api/config/sqs/producer/SqsProducer.java
@@ -13,6 +13,7 @@
 import sopt.org.umbba.common.sqs.dto.MessageDto;
 
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
 
 /**
@@ -51,7 +52,12 @@ public void produce(MessageDto message) {
                     .withMessageAttributes(createMessageAttributes(message.getType()));
 
             amazonSqs.sendMessage(request);
-            log.info(MessageUtils.generate(SQS_QUEUE_REQUEST_LOG_MESSAGE, request));
+            if (Objects.equals(message.getType(), MessageType.SLACK)) {
+                log.info(MessageUtils.generate(SQS_QUEUE_REQUEST_LOG_MESSAGE, "Slack 500 Error 내용"));
+            } else {
+                log.info(MessageUtils.generate(SQS_QUEUE_REQUEST_LOG_MESSAGE, request));
+            }
+
 
         } catch (JsonProcessingException e) {
             log.error(e.getMessage(), e);

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
@@ -8,6 +8,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.PersistenceContext;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -32,6 +33,8 @@ public Optional<Parentchild> findByUserId(Long userId) {
 
         } catch (NoResultException e) {
             return Optional.empty();
+        } finally {
+            em.close();
         }
 
     }
@@ -49,6 +52,8 @@ public Optional<User> findMatchUserByUserId(Long userId) {
             return Optional.ofNullable(user);
         } catch (NoResultException e) {
             return Optional.empty();
+        } finally {
+            em.close();
         }
     }
 
@@ -58,9 +63,15 @@ public List<String> findFcmTokensById(Long parentchildId) {
                 "JOIN Parentchild pc ON pc.id = u.parentChild.id " +
                 "WHERE pc.id = :id";
 
-        return em.createQuery(jpql, String.class)
-                .setParameter("id", parentchildId)
-                .getResultList();
+        try {
+            return em.createQuery(jpql, String.class)
+                    .setParameter("id", parentchildId)
+                    .getResultList();
+        } catch (NoResultException e) {
+            return new ArrayList<>();
+        } finally {
+            em.close();
+        }
     }
 
 

diff --git a/umbba-domain/src/main/java/sopt/org/umbba/domain/domain/qna/dao/QnADao.java b/umbba-domain/src/main/java/sopt/org/umbba/domain/domain/qna/dao/QnADao.java
@@ -42,6 +42,8 @@ public Optional<List<QnA>> findQnASByUserId(Long userId) {
         } catch (NoResultException e) {
 
             return Optional.empty();
+        } finally {
+            em.close();
         }
     }