refactor: general

Author: f-arslan

README.md

@@ -69,7 +69,7 @@ responses, [check out the DTOs here](/src/main/kotlin/com/example/dto).
 - **POST** `/orders/{userId}/items`
     - Adds a food item to the user's order.
     - **Path**: `userId` (UUID as string)
-    - **Body**: `FoodDto` (JSON)
+    - **Body**: `foodId` (Integer)
     - **Response**: `200 OK` with order ID, `500 Internal Server Error` with error message.
 
 ### Update Order Item Quantity
@@ -87,6 +87,24 @@ responses, [check out the DTOs here](/src/main/kotlin/com/example/dto).
     - **Path**: `userId` (UUID as string)
     - **Response**: `200 OK` with order details, `404 Not Found` with error message.
 
+### Get All Order
+- **GET** `/orders/{userId}/all`
+    - Retrieves all orders for the specified user.
+    - **Path**: `userId` (UUID as string)
+    - **Response**: `200 OK` with a list of all orders, `404 Not Found` with error message if no orders are found.
+
+### Get All Order as Flow
+- **GET** `/orders/{userId}/all/flow`
+    - Retrieves a real-time flow of all orders for the specified user.
+    - **Path**: `userId` (UUID as string)
+    - **Response**: `200 OK` with a flow of orders, `404 Not Found` with error message if no orders are found.
+
+### Get Active Order as Flow
+- **GET** `/orders/{userId}/order/flow`
+    - Retrieves a real-time flow of the user's active order.
+    - **Path**: `userId` (UUID as string)
+    - **Response**: `200 OK` with a flow of the active order, `404 Not Found` with error message if no active order is found.
+
 ### Complete Order
 
 - **GET** `/orders/{userId}/complete`
@@ -108,6 +126,20 @@ responses, [check out the DTOs here](/src/main/kotlin/com/example/dto).
     - **Path**: `userId` (UUID as string), `orderId` (Integer)
     - **Response**: `200 OK` with deletion status, `500 Internal Server Error` with error message.
 
+### Get All Orders
+
+- **GET** `/orders/{userId}/all`
+  - Retrieves all orders for the specified user.
+  - **Path**: `userId` (UUID as string)
+  - **Response**: `200 OK` with a list of all orders, `404 Not Found` with error message if no orders are found.
+
+### Get All Orders as Flow
+
+- **GET** `/orders/{userId}/all/flow`
+  - Retrieves a real-time flow of all orders for the specified user.
+  - **Path**: `userId` (UUID as string)
+  - **Response**: `200 OK` with a flow of orders, `404 Not Found` with error message if no orders are found.
+
 ## Food API Endpoints
 
 ### Get Food Details
@@ -131,16 +163,6 @@ responses, [check out the DTOs here](/src/main/kotlin/com/example/dto).
     - **Query**: `type` (String, optional) - Category type, defaults to "all".
     - **Response**: `200 OK` with foods by category, `404 Not Found` with error message.
 
-### Get All Orders
-
-- **GET** `/orders/{userId}/all`
-  - Retrieves all orders for the specified user.
-  - **Path**: `userId` (UUID as string)
-  - **Response**: `200 OK` with a list of all orders, `404 Not Found` with error message if no orders are found.
-
-### Get All Orders as Flow
-
-- **GET** `/orders/{userId}/all/flow`
-  - Retrieves a real-time flow of all orders for the specified user.
-  - **Path**: `userId` (UUID as string)
-  - **Response**: `200 OK` with a flow of orders, `404 Not Found` with error message if no orders are found.
+- **GET** `/foods/categories/list`
+    - Retrieves a list of all food categories.
+    - **Response**: `200 OK` with list of food categories, `404 Not Found` with error message.

src/main/kotlin/com/example/route/OrderRoute.kt

@@ -1,6 +1,5 @@
 package com.example.route
 
-import com.example.dto.FoodDto
 import com.example.service.OrderService.Companion.orderService
 import com.example.util.ext.getValueFromParameters
 import io.ktor.http.*
@@ -14,8 +13,8 @@ fun Application.orderRoute() {
     routing {
         post("/orders/{userId}/items") {
             val userId = call.getValueFromParameters("userId", UUID::fromString)
-            val foodDto = call.receive<FoodDto>()
-            orderService.addFoodToOrder(userId, foodDto, 1).fold(
+            val foodId = call.receive<Int>()
+            orderService.addFoodToOrder(userId, foodId, 1).fold(
                 onSuccess = { orderId -> call.respond(HttpStatusCode.OK, orderId) },
                 onFailure = { call.respond(HttpStatusCode.InternalServerError, it.message ?: "Unknown error") }
             )

src/main/kotlin/com/example/service/OrderService.kt

@@ -2,21 +2,23 @@ package com.example.service
 
 import com.example.dto.FoodDto
 import com.example.dto.GetOrderWithItemsDto
+import com.example.dto.OrderDto
 import com.example.service.impl.OrderServiceImpl
 import kotlinx.coroutines.flow.Flow
 import java.util.*
 
 interface OrderService {
     suspend fun getActiveOrder(userId: UUID): Result<GetOrderWithItemsDto>
     suspend fun getActiveOrderFlow(userId: UUID): Result<Flow<GetOrderWithItemsDto>>
-    suspend fun addFoodToOrder(userId: UUID, foodDto: FoodDto, quantity: Int): Result<Int>
+    suspend fun addFoodToOrder(userId: UUID, foodId: Int, quantity: Int): Result<Int>
     suspend fun updateItemInOrder(itemId: Int, quantity: Int): Result<Boolean>
     suspend fun deleteCurrentOrder(userId: UUID): Result<Boolean>
     suspend fun deleteOrder(userId: UUID, orderId: Int): Result<Boolean>
     suspend fun completeCurrentOrder(userId: UUID): Result<Boolean>
     suspend fun cancelOrder(userId: UUID, orderId: Int): Result<Boolean>
     suspend fun getAllOrders(userId: UUID): Result<List<GetOrderWithItemsDto>>
     suspend fun getAllOrderFlow(userId: UUID): Result<Flow<GetOrderWithItemsDto>>
+
     companion object {
         val orderService: OrderService by lazy { OrderServiceImpl() }
     }

src/main/kotlin/com/example/service/impl/OrderServiceImpl.kt

@@ -35,7 +35,9 @@ class OrderServiceImpl : OrderService {
         }.asFlow()
     }
 
-    override suspend fun addFoodToOrder(userId: UUID, foodDto: FoodDto, quantity: Int): Result<Int> = dbQuery {
+    override suspend fun addFoodToOrder(userId: UUID, foodId: Int, quantity: Int): Result<Int> = dbQuery {
+        val food = Foods.select { Foods.id eq foodId }.singleOrNull() ?: throw Exception("Food not found")
+
         Orders.select {
             (Orders.userId eq userId) and (Orders.orderStatus eq OrderStatus.Started)
         }.forUpdate().singleOrNull() ?: createOrder(userId)
@@ -45,7 +47,7 @@ class OrderServiceImpl : OrderService {
         }.forUpdate().single()
 
         val item = Items.select {
-            (Items.orderId eq activeOrder[Orders.id]) and (Items.foodId eq foodDto.id)
+            (Items.orderId eq activeOrder[Orders.id]) and (Items.foodId eq foodId)
         }.singleOrNull()
 
         val itemId = if (item != null) {
@@ -57,13 +59,13 @@ class OrderServiceImpl : OrderService {
         } else {
             Items.insert {
                 it[Items.orderId] = activeOrder[Orders.id]
-                it[Items.foodId] = foodDto.id
+                it[Items.foodId] = foodId
                 it[Items.quantity] = quantity
-                it[Items.price] = foodDto.price
+                it[Items.price] = food[Foods.price]
             }[Items.id]
         }
 
-        val totalPrice = activeOrder[Orders.totalPrice] + foodDto.price * quantity.toBigDecimal()
+        val totalPrice = activeOrder[Orders.totalPrice] + food[Foods.price] * quantity.toBigDecimal()
         Orders.update({ Orders.id eq activeOrder[Orders.id] }) {
             it[Orders.totalPrice] = totalPrice
         }