Merge branch 'main' into release

KioSchool · May 16, 2024 · 2498c61 · 2498c61
2 parents fc7c458 + a455a56
commit 2498c61
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/main/kotlin/com/kioschool/kioschoolapi/order/service/OrderService.kt b/src/main/kotlin/com/kioschool/kioschoolapi/order/service/OrderService.kt
@@ -92,6 +92,15 @@ class OrderService(
         return savedOrder
     }
 
+    private fun saveOrderProductAndSendWebsocketMessage(orderProduct: OrderProduct): OrderProduct {
+        val savedOrderProduct = orderProductRepository.save(orderProduct)
+        websocketService.sendMessage(
+            "/sub/order/${orderProduct.order.workspace.id}",
+            Message("CREATE", savedOrderProduct)
+        )
+        return savedOrderProduct
+    }
+
     fun getAllOrdersByCondition(
         username: String,
         workspaceId: Long,
@@ -146,7 +155,7 @@ class OrderService(
 
         val orderProduct = orderProductRepository.findById(orderProductId).orElseThrow()
         orderProduct.isServed = isServed
-        return orderProductRepository.save(orderProduct)
+        return saveOrderProductAndSendWebsocketMessage(orderProduct)
     }
 
     fun changeOrderStatus(