Added notification display (#2816)

Cheshiriks · web-flow · commit 6a7f116e5f1a · 2023-10-27T16:12:46.000+03:00
* Added notification display
diff --git a/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/NotificationController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/NotificationController.kt
@@ -0,0 +1,73 @@
+package com.saveourtool.save.backend.controllers
+
+import com.saveourtool.save.authservice.utils.username
+import com.saveourtool.save.backend.service.NotificationService
+import com.saveourtool.save.configs.ApiSwaggerSupport
+import com.saveourtool.save.entities.NotificationDto
+import com.saveourtool.save.utils.StringResponse
+import com.saveourtool.save.utils.blockingToFlux
+import com.saveourtool.save.utils.blockingToMono
+import com.saveourtool.save.v1
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.responses.ApiResponse
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.tags.Tags
+import org.springframework.http.HttpStatus
+import org.springframework.http.ResponseEntity
+import org.springframework.security.access.prepost.PreAuthorize
+import org.springframework.security.core.Authentication
+import org.springframework.web.bind.annotation.*
+import org.springframework.web.server.ResponseStatusException
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
+
+/**
+ * Controller for working with notifications.
+ */
+@ApiSwaggerSupport
+@Tags(
+    Tag(name = "notifications"),
+)
+@RestController
+@RequestMapping(path = ["/api/$v1/notifications"])
+class NotificationController(
+    private val notificationService: NotificationService,
+) {
+    @GetMapping("/get-all-by-user")
+    @Operation(
+        method = "GET",
+        summary = "Get all notifications by user name.",
+        description = "Get user notifications.",
+    )
+    @ApiResponse(responseCode = "200", description = "Successfully fetched all notifications by user name")
+    fun getAllNotifications(
+        authentication: Authentication?,
+    ): Flux<NotificationDto> = blockingToFlux {
+        authentication?.let {
+            notificationService.getAllByUserName(authentication.username()).map { it.toDto() }
+        }.orEmpty()
+    }
+
+    @DeleteMapping("/delete-by-id")
+    @Operation(
+        method = "DELETE",
+        summary = "Delete notification by id.",
+        description = "Delete notification by id.",
+    )
+    @PreAuthorize("permitAll()")
+    @ApiResponse(responseCode = "200", description = "Successfully deleted notification by id")
+    fun deleteById(
+        @RequestParam id: Long,
+        authentication: Authentication?,
+    ): Mono<StringResponse> = blockingToMono {
+        val notification = notificationService.getById(id)
+        notification?.let {
+            if (authentication?.username() == notification.user.name) {
+                notificationService.deleteById(id)
+                ResponseEntity.ok("Successfully deleted requested notification.")
+            } else {
+                throw ResponseStatusException(HttpStatus.FORBIDDEN, "it is not your notification")
+            }
+        } ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "notification is not found")
+    }
+}
diff --git a/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/NotificationRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/NotificationRepository.kt
@@ -8,4 +8,10 @@ import org.springframework.stereotype.Repository
  * Repository to access data about user notification
  */
 @Repository
-interface NotificationRepository : BaseEntityRepository<Notification>
+interface NotificationRepository : BaseEntityRepository<Notification> {
+    /**
+     * @param name
+     * @return list of notification
+     */
+    fun findByUserName(name: String): List<Notification>
+}
diff --git a/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/NotificationService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/NotificationService.kt
@@ -2,6 +2,7 @@ package com.saveourtool.save.backend.service
 
 import com.saveourtool.save.backend.repository.NotificationRepository
 import com.saveourtool.save.entities.Notification
+import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
@@ -26,4 +27,22 @@ class NotificationService(
      */
     @Transactional
     fun saveAll(notifications: List<Notification>): List<Notification> = notificationRepository.saveAll(notifications)
+
+    /**
+     * @param name name of user
+     * @return list of notifications
+     */
+    fun getAllByUserName(name: String): List<Notification> = notificationRepository.findByUserName(name)
+
+    /**
+     * @param id of notification
+     */
+    @Transactional
+    fun deleteById(id: Long) = notificationRepository.deleteById(id)
+
+    /**
+     * @param id of notification
+     * @return notification by id
+     */
+    fun getById(id: Long) = notificationRepository.findByIdOrNull(id)
 }
diff --git a/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/NotificationDto.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/NotificationDto.kt
@@ -4,11 +4,13 @@ import kotlinx.datetime.LocalDateTime
 import kotlinx.serialization.Serializable
 
 /**
+ * @property id
  * @property message
  * @property createDate
  */
 @Serializable
 class NotificationDto(
+    val id: Long,
     val message: String,
     val createDate: LocalDateTime?,
 )
diff --git a/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Notification.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Notification.kt
@@ -21,6 +21,7 @@ class Notification(
     var user: User,
 ) : BaseEntityWithDateAndDto<NotificationDto>() {
     override fun toDto() = NotificationDto(
+        id = requiredId(),
         message = message,
         createDate = createDate?.toKotlinLocalDateTime(),
     )
diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/index/IndexViewUserInfo.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/index/IndexViewUserInfo.kt
@@ -4,24 +4,71 @@
 
 package com.saveourtool.save.frontend.components.views.index
 
+import com.saveourtool.save.entities.NotificationDto
+import com.saveourtool.save.frontend.components.basic.markdown
+import com.saveourtool.save.frontend.externals.fontawesome.faTimes
 import com.saveourtool.save.frontend.externals.i18next.useTranslation
-import com.saveourtool.save.frontend.utils.UserInfoAwareProps
+import com.saveourtool.save.frontend.utils.*
+import com.saveourtool.save.frontend.utils.noopLoadingHandler
+import com.saveourtool.save.utils.toUnixCalendarFormat
+
 import js.core.jso
 import react.ChildrenBuilder
 import react.FC
+import react.StateSetter
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.h2
 import react.dom.html.ReactHTML.h4
 import react.dom.html.ReactHTML.img
 import react.dom.html.ReactHTML.p
+import react.dom.html.ReactHTML.span
+import react.useState
 import web.cssom.*
 
+import kotlinx.browser.window
+import kotlinx.datetime.TimeZone
+
 const val INDEX_VIEW_CUSTOM_BG = "rgb(247, 250, 253)"
+private const val DEFAULT_MAX_NOTIFICATION_AMOUNT = 5
 
 @Suppress("IDENTIFIER_LENGTH")
 val indexViewInfo: FC<UserInfoAwareProps> = FC { props ->
     val (t) = useTranslation("index")
 
+    val (notifications, setNotifications) = useState(emptyList<NotificationDto>())
+    val (isAllNotificationsShown, setIsAllNotificationsShown) = useState(false)
+    val (notificationForDeletion, setNotificationForDeletion) = useState<NotificationDto?>(null)
+
+    useRequest {
+        val newNotifications = get(
+            url = "$apiUrl/notifications/get-all-by-user",
+            headers = jsonHeaders,
+            loadingHandler = ::noopLoadingHandler,
+        ).unsafeMap {
+            it.decodeFromJsonString<List<NotificationDto>>()
+        }
+
+        setNotifications(newNotifications)
+    }
+
+    useRequest(arrayOf(notificationForDeletion)) {
+        notificationForDeletion?.let { notification ->
+            delete(
+                url = "$apiUrl/notifications/delete-by-id",
+                params = jso<dynamic> {
+                    id = notification.id
+                },
+                headers = jsonHeaders,
+                loadingHandler = ::noopLoadingHandler,
+            ).run {
+                if (ok) {
+                    setNotifications { it.minus(notification) }
+                    setNotificationForDeletion(null)
+                }
+            }
+        }
+    }
+
     div {
         className = ClassName("row justify-content-center mt-5 text-gray-900")
         h2 {
@@ -51,8 +98,25 @@ val indexViewInfo: FC<UserInfoAwareProps> = FC { props ->
         className = ClassName("card mb-4 mr-3 ml-3")
         div {
             className = ClassName("card-body")
-            p {
-                +"Your notifications will be located here.".t()
+            if (notifications.isEmpty()) {
+                p {
+                    +"Your notifications will be located here.".t()
+                }
+            } else {
+                if (notifications.size > DEFAULT_MAX_NOTIFICATION_AMOUNT && !isAllNotificationsShown) {
+                    display(notifications.take(DEFAULT_MAX_NOTIFICATION_AMOUNT), setNotificationForDeletion)
+                    div {
+                        className = ClassName("col-12 mt-3 px-0")
+                        onClick = { setIsAllNotificationsShown(true) }
+                        style = jso { cursor = "pointer".unsafeCast<Cursor>() }
+                        h4 {
+                            className = ClassName("text-center card p-2 shadow")
+                            +"Show all ${notifications.size} comments"
+                        }
+                    }
+                } else {
+                    display(notifications, setNotificationForDeletion)
+                }
             }
         }
     }
@@ -71,3 +135,37 @@ internal fun ChildrenBuilder.cardImage(img: String) {
         }
     }
 }
+
+/**
+ * @param notifications list of notification
+ * @param setNotificationForDeletion [StateSetter] for delete notifications
+ */
+internal fun ChildrenBuilder.display(
+    notifications: List<NotificationDto>,
+    setNotificationForDeletion: StateSetter<NotificationDto?>
+) {
+    notifications.forEach { notification ->
+        div {
+            className = ClassName("shadow-none card text-left border-0")
+            div {
+                className = ClassName("flex-wrap d-flex justify-content-between")
+                style = jso { background = "#f1f1f1".unsafeCast<Background>() }
+                span {
+                    className = ClassName("ml-1")
+                    +(notification.createDate?.toUnixCalendarFormat(TimeZone.currentSystemDefault()) ?: "Unknown")
+                }
+                div {
+                    buttonBuilder(faTimes, style = "", classes = "btn-sm") {
+                        if (window.confirm("Are you sure you want to delete a notification?")) {
+                            setNotificationForDeletion(notification)
+                        }
+                    }
+                }
+            }
+            div {
+                className = ClassName("shadow-none card card-body border-0")
+                markdown(notification.message.split("\n").joinToString("\n\n"))
+            }
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ class Notification(`
`21`	`21`	`var user: User,`
`22`	`22`	`) : BaseEntityWithDateAndDto<NotificationDto>() {`
`23`	`23`	`override fun toDto() = NotificationDto(`
	`24`	`+ id = requiredId(),`
`24`	`25`	`message = message,`
`25`	`26`	`createDate = createDate?.toKotlinLocalDateTime(),`
`26`	`27`	`)`