Merge branch 'feat/#377', remote-tracking branch 'origin' into develop

Author: Arin0303

prisma/migrations/20260104064222_add_notification_type_admin_message/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE `Notification` MODIFY `type` ENUM('FOLLOW', 'NEW_PROMPT', 'INQUIRY', 'ANNOUNCEMENT', 'REPORT', 'ADMIN_MESSAGE') NOT NULL;

prisma/schema.prisma

@@ -501,6 +501,7 @@ enum NotificationType {
   INQUIRY
   ANNOUNCEMENT
   REPORT
+  ADMIN_MESSAGE
 }
 
 enum Payment_provider {

src/messages/services/message.service.ts

@@ -2,6 +2,7 @@ import { Service } from "typedi";
 import { CreateMessageDto } from "../dtos/message.dto";
 import { MessageRepository } from "../repositories/message.repository";
 import { AppError } from "../../errors/AppError";
+import eventBus from "../../config/eventBus";
 
 @Service()
 export class MessageService {
@@ -114,6 +115,9 @@ async sendMessage(currentUserId: number, data: CreateMessageDto) {
 
   const message = await this.messageRepository.createMessage(data);
 
+  // 새 관리자 메세지 알림 이벤트 발생
+  eventBus.emit('adminMessage.created', data.sender_id, data.receiver_id, data.body);
+
   return {
     message: "메시지 전송 성공",
     message_id: message.message_id,

src/notifications/listeners/notification.listener.ts

@@ -5,6 +5,7 @@ import {
   createFollowNotification,
   createInquiryNotification,
   createPromptNotification,
+  createAdminMessageNtification
 } from "../services/notification.service";
 
 
@@ -52,4 +53,15 @@ eventBus.on('prompt.created', async (prompterId: number, promptId: number) => {
   } catch (err) {
     console.error("[알림 리스너 오류]: 새로운 프롬프트 업로드 알림 생성 실패", err);
   }
-});
+});
+
+
+// 관리자 메세지 알림 리스너
+eventBus.on('adminMessage.created', async( adminId: number, userId: number, content: string) => {
+  try {
+    await createAdminMessageNtification(adminId, userId, content);
+  } catch (err) {
+    console.error("[알림 리스너 오류]: 관리자 메세지 알림 생성 실패", err);
+  }
+
+})

src/notifications/repositories/notification.repository.ts

@@ -100,7 +100,6 @@ export const createNotification = async ({
   });
 };
 
-// ==========알림 목록 조회==========
 // ==========알림 목록 조회==========
 export const findNotificationsByUserId = async (
   userId: number,
@@ -131,9 +130,9 @@ export const findNotificationsByUserId = async (
     }),
   });
 
-  // 2. FOLLOW / NEW_PROMPT 알림에 대해 profileImage 조회
+  // profileImage 조회
   const actorIdsToFetch = notifications
-    .filter(n => (n.type === 'FOLLOW' || n.type === 'NEW_PROMPT') && n.actor)
+    .filter(n => (n.type === 'FOLLOW' || n.type === 'NEW_PROMPT' || n.type === 'ADMIN_MESSAGE') && n.actor)
     .map(n => n.actor!.user_id);
 
   let actorProfilesMap: Record<number, { url: string } | null> = {};
@@ -160,7 +159,7 @@ export const findNotificationsByUserId = async (
       ? {
           ...n.actor,
           profileImage:
-            n.type === 'FOLLOW' || n.type === 'NEW_PROMPT'
+            n.type === 'FOLLOW' || n.type === 'NEW_PROMPT' || n.type === 'ADMIN_MESSAGE'
               ? actorProfilesMap[n.actor.user_id] ?? null
               : null,
         }

src/notifications/services/notification.service.ts

@@ -235,4 +235,16 @@ export const getNotificationHasNewStatusService = async (
   const hasNew = latestNotificationTime > lastNotificationCheckTime;
 
   return { hasNew };
-};
+};
+
+// 관리자 메세지 알림
+export const createAdminMessageNtification = async( adminId: number, userId: number, content: string) => {
+  
+  return createNotificationService({
+    userId, 
+    type: NotificationType.ADMIN_MESSAGE,
+    content: content,
+    linkUrl: null,
+    actorId: adminId,
+  });
+}