Merge branch 'develop' of github.com:Here-You/here-you-backend into f…

…eature/#248

src/comment/comment.service.ts

@@ -43,6 +43,7 @@ export class CommentService {
         notification.notificationSender = user;
         notification.notificationTargetType = 'RULE';
         notification.notificationTargetId = rule.id;
+        notification.notificationTargetDesc = rule.mainTitle;
         notification.notificationAction = 'COMMENT';
         await notification.save();
       }

src/notification/notification.entity.ts

@@ -30,6 +30,9 @@ export class NotificationEntity extends BaseEntity {
   @Column()
   notificationTargetId: number;
 
+  @Column({ type: 'text' })
+  notificationTargetDesc: string;
+
   @Column({ type: 'enum', enum: ['LIKE', 'COMMENT'] })
   notificationAction: 'LIKE' | 'COMMENT';
 

src/notification/notification.service.ts

@@ -48,6 +48,7 @@ export class NotificationService {
             action: notification.notificationAction,
           },
           itemId: notification.notificationTargetId,
+          itemDesc: notification.notificationTargetDesc,
           isRead: notification.notificationRead,
           created: notification.created,
         })),

src/signature/signature.comment.service.ts

@@ -40,6 +40,7 @@ export class SignatureCommentService {
     const user = await UserEntity.findOneOrFail({ where: { id: userId } });
     const signature = await SignatureEntity.findOneOrFail({
       where: { id: signatureId },
+      relations: { user: true },
     });
 
     if (!user || !signature) {
@@ -58,6 +59,7 @@ export class SignatureCommentService {
 
         const parentComment = await SignatureCommentEntity.findOneOrFail({
           where: { id: parentCommentId },
+          relations: { user: true },
         });
 
         if (!parentComment) throw new NotFoundException('404 Not Found');
@@ -67,13 +69,15 @@ export class SignatureCommentService {
         }
 
         notification.notificationReceiver = parentComment.user;
+        notification.notificationTargetDesc = parentComment.content;
       } else {
         // 댓글: parentId는 본인으로 설정
         const savedComment = await comment.save();
         savedComment.parentComment = savedComment;
         await savedComment.save();
 
         notification.notificationReceiver = signature.user;
+        notification.notificationTargetDesc = signature.title;
       }
 
       notification.notificationSender = user;

src/signature/signature.service.ts

@@ -275,6 +275,7 @@ export class SignatureService {
     notification.notificationSender = loginUser;
     notification.notificationTargetType = 'SIGNATURE';
     notification.notificationTargetId = signature.id;
+    notification.notificationTargetDesc = signature.title;
     notification.notificationAction = 'LIKE';
     await notification.save();