chore: update notification format

KogoCampus · Jan 21, 2025 · 6dc55fd · 6dc55fd
1 parent 58691df
commit 6dc55fd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/main/kotlin/com/kogo/content/endpoint/controller/MeController.kt b/src/main/kotlin/com/kogo/content/endpoint/controller/MeController.kt
@@ -173,7 +173,7 @@ class MeController @Autowired constructor(
                 schema = Schema(implementation = Notification::class)
             ))],
         )]
-    ) fun getNotification(
+    ) fun getNotifications(
         paginationRequest: PaginationRequest
     ): ResponseEntity<*> = run {
         val me = userService.findCurrentUser()

diff --git a/src/main/kotlin/com/kogo/content/endpoint/controller/PostController.kt b/src/main/kotlin/com/kogo/content/endpoint/controller/PostController.kt
@@ -198,7 +198,7 @@ class PostController @Autowired constructor(
                 sender = user,
                 eventType = EventType.LIKE_TO_POST,
                 message = NotificationMessage(
-                    title = "New Like",
+                    title = post.content.take(50) + if (post.content.length > 50) "..." else "",
                     body = "${user.username} liked your post",
                     dataType = DataType.POST,
                     data = post
@@ -259,8 +259,8 @@ class PostController @Autowired constructor(
                 sender = user,
                 eventType = EventType.LIKE_TO_COMMENT,
                 message = NotificationMessage(
-                    title = "New Like",
-                    body = "${user.username} liked your comment: ${comment.content}",
+                    title = comment.content.take(50) + if (comment.content.length > 50) "..." else "",
+                    body = "${user.username} liked your comment",
                     dataType = DataType.COMMENT,
                     data = comment
                 )
@@ -324,8 +324,8 @@ class PostController @Autowired constructor(
                 sender = user,
                 eventType = EventType.LIKE_TO_REPLY,
                 message = NotificationMessage(
-                    title = "New Like",
-                    body = "${user.username} liked your reply: ${reply.content}",
+                    title = reply.content.take(50) + if (reply.content.length > 50) "..." else "",
+                    body = "${user.username} liked your reply",
                     dataType = DataType.REPLY,
                     data = reply
                 )
@@ -407,8 +407,8 @@ class PostController @Autowired constructor(
             eventType = EventType.CREATE_COMMENT_TO_POST,
             sender = author,
             message = NotificationMessage(
-                title = "New Comment",
-                body = "${author.username} commented: ${newComment.content}",
+                title = commentDto.content.take(50) + if (commentDto.content.length > 50) "..." else "",
+                body = "${author.username} commented on your post",
                 dataType = DataType.COMMENT,
                 data = newComment
             )
@@ -529,8 +529,8 @@ class PostController @Autowired constructor(
             sender = author,
             eventType = EventType.CREATE_REPLY_TO_COMMENT,
             message = NotificationMessage(
-                title = "New Reply",
-                body = "${author.username} replied: ${newReply.content}",
+                title = commentDto.content.take(50) + if (commentDto.content.length > 50) "..." else "",
+                body = "${author.username} replied to your comment",
                 dataType = DataType.REPLY,
                 data = newReply
             )

diff --git a/src/main/kotlin/com/kogo/content/storage/repository/NotificationRepository.kt b/src/main/kotlin/com/kogo/content/storage/repository/NotificationRepository.kt
@@ -2,6 +2,7 @@ package com.kogo.content.storage.repository
 
 import com.kogo.content.endpoint.common.PaginationRequest
 import com.kogo.content.endpoint.common.PaginationSlice
+import com.kogo.content.endpoint.common.SortDirection
 import com.kogo.content.storage.pagination.MongoPaginationQueryBuilder
 import com.kogo.content.storage.model.Notification
 import org.springframework.beans.factory.annotation.Autowired
@@ -21,7 +22,9 @@ class NotificationRepositoryCustomImpl : NotificationRepositoryCustom {
     override fun findAllByRecipientId(recipientId:String, paginationRequest: PaginationRequest): PaginationSlice<Notification> {
         return mongoPaginationQueryBuilder.getPage(
             Notification::class,
-            paginationRequest = paginationRequest.withFilter("recipientId", recipientId)
+            paginationRequest = paginationRequest
+                .withFilter("recipientId", recipientId)
+                .withSort("createdAt", SortDirection.DESC)
         )
     }
 }