🚑 Hot Fix - Article UI Error & Push Notification

client-app/lib/presentation/widget/article/brief/article_brief_default_item_view.dart

@@ -19,7 +19,7 @@ class ArticleBriefDefaultItemView extends StatelessWidget {
     return GestureDetector(
       onTap: onTap,
       child: Container(
-        height: 160,
+        height: 176,
         padding: const EdgeInsets.symmetric(vertical: 16),
         color: ColorSystem.white,
         child: Column(

client-app/lib/presentation/widget/article/summary/article_summary_default_item_view.dart

@@ -21,7 +21,7 @@ class ArticleSummaryDefaultItemView extends StatelessWidget {
     return GestureDetector(
       onTap: onTap,
       child: Container(
-        height: 180,
+        height: 196,
         padding: const EdgeInsets.symmetric(vertical: 16),
         color: ColorSystem.white,
         child: Row(
@@ -54,9 +54,7 @@ class ArticleSummaryDefaultItemView extends StatelessWidget {
                   const SizedBox(height: 4),
                   Text(
                     state.preview,
-                    style: FontSystem.Sub3.copyWith(
-                      fontSize: 16,
-                    ),
+                    style: FontSystem.Sub3,
                     overflow: TextOverflow.ellipsis,
                     maxLines: 2,
                   ),

client-app/pubspec.yaml

@@ -1,7 +1,7 @@
 name: wooahan
 description: "Senior Care Service – We're Still Going Strong"
 
-version: 1.0.3+3
+version: 1.0.3+6
 
 environment:
   sdk: '>=3.4.3 <4.0.0'

server-api/src/main/java/org/dongguk/dscd/wooahan/api/core/listener/GenerationListener.java

@@ -2,15 +2,9 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.dongguk.dscd.wooahan.api.core.exception.error.ErrorCode;
-import org.dongguk.dscd.wooahan.api.core.exception.type.CommonException;
-import org.dongguk.dscd.wooahan.api.question.domain.mysql.Answer;
-import org.dongguk.dscd.wooahan.api.question.domain.mysql.Question;
 import org.dongguk.dscd.wooahan.api.question.event.CreateQuestionEvent;
-import org.dongguk.dscd.wooahan.api.question.repository.mysql.AnswerRepository;
-import org.dongguk.dscd.wooahan.api.question.repository.mysql.QuestionRepository;
+import org.dongguk.dscd.wooahan.api.question.service.CreateAnswerService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
@@ -27,8 +21,7 @@ public class GenerationListener {
     @Value("${inner-services.generation.url}")
     String generationServiceUrl;
 
-    private final QuestionRepository questionRepository;
-    private final AnswerRepository answerRepository;
+    private final CreateAnswerService createAnswerService;
 
     private final ObjectMapper objectMapper;
 
@@ -37,9 +30,6 @@ public class GenerationListener {
     @Async
     @EventListener(classes = {CreateQuestionEvent.class})
     public void handleCreateQuestionEvent(CreateQuestionEvent event) {
-        Question question = questionRepository.findById(event.questionId())
-                .orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_RESOURCE));
-
         String similarAnswer = "";
 
         try {
@@ -48,20 +38,18 @@ public void handleCreateQuestionEvent(CreateQuestionEvent event) {
                     .headers(httpHeaders -> {
                         httpHeaders.set("Content-Type", "application/json");
                     })
-                    .body(generateMessageJson(question.getContent()))
+                    .body(generateMessageJson(event.content()))
                     .retrieve()
                     .body(GenerationResult.class);
 
             similarAnswer = (String) response.data().get("result");
         } catch (Exception ignored) {
         }
 
-        Answer answer = Answer.builder()
-                .question(question)
-                .content(similarAnswer)
-                .build();
-
-        answerRepository.save(answer);
+        createAnswerService.execute(
+                event.questionId(),
+                similarAnswer
+        );
     }
 
     private String generateMessageJson(String content) throws JsonProcessingException {

server-api/src/main/java/org/dongguk/dscd/wooahan/api/core/listener/NotificationListener.java

@@ -0,0 +1,24 @@
+package org.dongguk.dscd.wooahan.api.core.listener;
+
+import lombok.RequiredArgsConstructor;
+import org.dongguk.dscd.wooahan.api.notification.service.NotificationService;
+import org.dongguk.dscd.wooahan.api.question.event.CreateAnswerEvent;
+import org.dongguk.dscd.wooahan.api.question.event.CreateQuestionEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class NotificationListener {
+
+    private final NotificationService notificationService;
+
+    @Async
+    @EventListener(classes = {CreateAnswerEvent.class})
+    public void handleCreateAnswerEvent(
+            CreateAnswerEvent event
+    ) {
+        notificationService.sendPushNotification(event.userId());
+    }
+}

server-api/src/main/java/org/dongguk/dscd/wooahan/api/notification/service/NotificationService.java

@@ -39,7 +39,7 @@ public void sendPushNotificationOnBreakfast() {
 
         // 3. 사용자 목록을 통해 알림 메시지 생성
         List<Message> messageList = recieverList.stream()
-                .map(user -> convertToMap(user, ETime.BREAKFAST))
+                .map(user -> convertToMapForMedication(user, ETime.BREAKFAST))
                 .toList();
 
         // 4. 알림 메시지 전송
@@ -66,7 +66,7 @@ public void sendPushNotificationOnLunch() {
 
         // 3. 사용자 목록을 통해 알림 메시지 생성
         List<Message> messageList = recieverList.stream()
-                .map(user -> convertToMap(user, ETime.LUNCH))
+                .map(user -> convertToMapForMedication(user, ETime.LUNCH))
                 .toList();
 
         // 4. 알림 메시지 전송
@@ -93,7 +93,7 @@ public void sendPushNotificationOnDinner() {
 
         // 3. 사용자 목록을 통해 알림 메시지 생성
         List<Message> messageList = recieverList.stream()
-                .map(user -> convertToMap(user, ETime.DINNER))
+                .map(user -> convertToMapForMedication(user, ETime.DINNER))
                 .toList();
 
         // 4. 알림 메시지 전송
@@ -105,7 +105,44 @@ public void sendPushNotificationOnDinner() {
         }
     }
 
-    Message convertToMap(User user, ETime time) {
+    public void sendPushNotification(
+            UUID userId,
+            ETime time
+    ) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_USER));
+
+        if (!user.getIsAllowedNotification() || user.getDeviceToken() == null) {
+            return;
+        }
+
+        Message message = convertToMapForMedication(user, time);
+
+        try {
+            FirebaseMessaging.getInstance().send(message);
+        } catch (FirebaseMessagingException ignore) {
+        }
+    }
+
+    public void sendPushNotification(
+            UUID userId
+    ){
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_USER));
+
+        if (!user.getIsAllowedNotification() || user.getDeviceToken() == null) {
+            return;
+        }
+
+        Message message = convertToMapForMedication(user);
+
+        try {
+            FirebaseMessaging.getInstance().send(message);
+        } catch (FirebaseMessagingException ignore) {
+        }
+    }
+
+    Message convertToMapForMedication(User user, ETime time) {
         String content = switch (time) {
             case BREAKFAST -> String.format(BREAKFAST_NOTIFICATION_CONTENT_FORM, user.getNickname());
             case LUNCH -> String.format(LUNCH_NOTIFICATION_CONTENT_FORM, user.getNickname());
@@ -148,18 +185,24 @@ Message convertToMap(User user, ETime time) {
                 .build();
     }
 
-    public void sendPushNotification(
-            UUID userId,
-            ETime time
-    ) {
-        User user = userRepository.findById(userId)
-                .orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_USER));
-
-        Message message = convertToMap(user, time);
-
-        try {
-            FirebaseMessaging.getInstance().send(message);
-        } catch (FirebaseMessagingException ignore) {
-        }
+    Message convertToMapForMedication(User user) {
+        return Message.builder()
+                .setToken(user.getDeviceToken())
+                .setNotification(
+                        Notification.builder()
+                                .setTitle("우아한")
+                                .setBody("작성한 질문에 답변이 등록되었어요!")
+                                .build()
+                )
+                .setApnsConfig(
+                        ApnsConfig.builder()
+                                .setAps(
+                                        Aps.builder()
+                                                .setSound("default")
+                                                .build()
+                                )
+                                .build()
+                )
+                .build();
     }
 }

server-api/src/main/java/org/dongguk/dscd/wooahan/api/question/event/CreateAnswerEvent.java

@@ -0,0 +1,8 @@
+package org.dongguk.dscd.wooahan.api.question.event;
+
+import java.util.UUID;
+
+public record CreateAnswerEvent(
+        UUID userId
+) {
+}

server-api/src/main/java/org/dongguk/dscd/wooahan/api/question/repository/mysql/QuestionRepository.java

@@ -3,6 +3,7 @@
 import org.dongguk.dscd.wooahan.api.question.domain.mysql.Question;
 import org.dongguk.dscd.wooahan.api.question.dto.projection.ReadQuestionProjection;
 import org.dongguk.dscd.wooahan.api.question.repository.mysql.custom.QuestionRepositoryCustom;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
@@ -20,4 +21,8 @@ public interface QuestionRepository extends JpaRepository<Question, Long>, Quest
         WHERE q.id = :id
     """)
     Optional<ReadQuestionProjection> findByIdWithDetail(Long id);
+
+
+    @EntityGraph(attributePaths = {"creator"})
+    Optional<Question> findWithUserById(Long id);
 }

server-api/src/main/java/org/dongguk/dscd/wooahan/api/question/service/CreateAnswerService.java

@@ -9,9 +9,11 @@
 import org.dongguk.dscd.wooahan.api.question.domain.mysql.Answer;
 import org.dongguk.dscd.wooahan.api.question.domain.mysql.Question;
 import org.dongguk.dscd.wooahan.api.question.dto.request.CreateAnswerDto;
+import org.dongguk.dscd.wooahan.api.question.event.CreateAnswerEvent;
 import org.dongguk.dscd.wooahan.api.question.repository.mysql.AnswerRepository;
 import org.dongguk.dscd.wooahan.api.question.repository.mysql.QuestionRepository;
 import org.dongguk.dscd.wooahan.api.question.usecase.CreateAnswerUseCase;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
 import java.util.UUID;
@@ -27,6 +29,7 @@ public class CreateAnswerService implements CreateAnswerUseCase {
     private final ExpertRepository expertRepository;
 
     private final UpdaterScheduler updaterScheduler;
+    private final ApplicationEventPublisher applicationEventPublisher;
 
     @Override
     public void execute(
@@ -37,7 +40,7 @@ public void execute(
         Expert expert = expertRepository.findById(accountId)
                 .orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_EXPERT));
 
-        Question question = questionRepository.findById(questionId)
+        Question question = questionRepository.findWithUserById(questionId)
                 .orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_QUESTION));
 
         Answer answer = Answer.builder()
@@ -49,5 +52,32 @@ public void execute(
         answerRepository.save(answer);
 
         updaterScheduler.removeQuestionTask(questionId);
+
+        applicationEventPublisher.publishEvent(
+                new CreateAnswerEvent(
+                        question.getCreator().getId()
+                )
+        );
+    }
+
+    public void execute(
+            Long questionId,
+            String similarAnswer
+    ) {
+        Question question = questionRepository.findWithUserById(questionId)
+                .orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_QUESTION));
+
+        Answer answer = Answer.builder()
+                .question(question)
+                .content(similarAnswer)
+                .build();
+
+        answerRepository.save(answer);
+
+        applicationEventPublisher.publishEvent(
+                new CreateAnswerEvent(
+                        question.getCreator().getId()
+                )
+        );
     }
 }