feat: decimal problem fixed

Author: f-arslan

src/main/kotlin/com/example/dto/ItemDto.kt

@@ -0,0 +1,12 @@
+package com.example.dto
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ItemDto(
+    val id: Int,
+    val orderId: Int,
+    val foodId: Int,
+    val quantity: Int,
+    val price: Double
+)

src/main/kotlin/com/example/dto/OrderDto.kt

@@ -1,18 +1,16 @@
 package com.example.dto
 
-import com.example.util.BigDecimalSerializer
 import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable
 import java.math.BigDecimal
-import java.util.UUID
 
-@Serializable(with = BigDecimalSerializer::class)
+@Serializable
 data class OrderDto(
     val id: Int,
-    val userId: UUID,
+    val userId: String,
     val orderTime: Instant,
     val orderStatus: OrderStatus = OrderStatus.Pending,
-    val totalPrice: BigDecimal,
+    val totalPrice: Double,
     val paymentDetails: String? = null,
 )
 

src/main/kotlin/com/example/dto/OrderItemDto.kt

@@ -1,7 +1,7 @@
 package com.example.service
 
 import com.example.table.Foods
-import com.example.table.OrderItems
+import com.example.table.Items
 import com.example.table.Orders
 import com.example.table.Users
 import kotlinx.coroutines.Dispatchers
@@ -20,7 +20,7 @@ object DatabaseModule {
             SchemaUtils.create(Users)
             SchemaUtils.create(Foods)
             SchemaUtils.create(Orders)
-            SchemaUtils.create(OrderItems)
+            SchemaUtils.create(Items)
         }
     }
 

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

@@ -6,9 +6,8 @@ import com.example.dto.OrderStatus
 import com.example.service.DatabaseModule.dbQuery
 import com.example.service.OrderService
 import com.example.table.Foods
-import com.example.table.OrderItems
+import com.example.table.Items
 import com.example.table.Orders
-import com.example.util.ext.toFoodDto
 import com.example.util.ext.toOrderDto
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.insert
@@ -40,12 +39,12 @@ class OrderServiceImpl : OrderService {
             (Orders.userId eq userId) and (Orders.orderStatus eq OrderStatus.Started)
         }.forUpdate().single()
 
-        val orderId = OrderItems.insert {
-            it[OrderItems.orderId] = activeOrder[Orders.id]
-            it[OrderItems.foodId] = foodDto.id
-            it[OrderItems.quantity] = quantity
-            it[OrderItems.price] = foodDto.price.toBigDecimal()
-        }[OrderItems.id]
+        val orderId = Items.insert {
+            it[Items.orderId] = activeOrder[Orders.id]
+            it[Items.foodId] = foodDto.id
+            it[Items.quantity] = quantity
+            it[Items.price] = foodDto.price.toBigDecimal()
+        }[Items.id]
 
         val totalPrice = activeOrder[Orders.totalPrice] + (foodDto.price * quantity).toBigDecimal()
         Orders.update({ Orders.id eq activeOrder[Orders.id] }) {
@@ -56,21 +55,21 @@ class OrderServiceImpl : OrderService {
     }
 
     override suspend fun updateItemInOrder(orderId: Int, quantity: Int): Result<Boolean> = dbQuery {
-        val orderItem = OrderItems.select { OrderItems.id eq orderId }.singleOrNull()
+        val orderItem = Items.select { Items.id eq orderId }.singleOrNull()
         if (orderItem == null) {
             throw Exception("Order item not found")
         }
 
-        val food = Foods.select { Foods.id eq orderItem[OrderItems.foodId] }.single()
+        val food = Foods.select { Foods.id eq orderItem[Items.foodId] }.single()
         val totalPrice = (food[Foods.price] * quantity).toBigDecimal()
-        OrderItems.update({ OrderItems.id eq orderId }) {
-            it[OrderItems.quantity] = quantity
-            it[OrderItems.price] = totalPrice
+        Items.update({ Items.id eq orderId }) {
+            it[Items.quantity] = quantity
+            it[Items.price] = totalPrice
         }
 
-        val activeOrder = Orders.select { Orders.id eq orderItem[OrderItems.orderId] }.single()
-        val orderItems = OrderItems.select { OrderItems.orderId eq activeOrder[Orders.id] }
-        val newTotalPrice = orderItems.sumOf { it[OrderItems.price].toDouble() }.toBigDecimal()
+        val activeOrder = Orders.select { Orders.id eq orderItem[Items.orderId] }.single()
+        val orderItems = Items.select { Items.orderId eq activeOrder[Orders.id] }
+        val newTotalPrice = orderItems.sumOf { it[Items.price].toDouble() }.toBigDecimal()
         Orders.update({ Orders.id eq activeOrder[Orders.id] }) {
             it[Orders.totalPrice] = newTotalPrice
         }

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

@@ -2,7 +2,7 @@ package com.example.table
 
 import org.jetbrains.exposed.sql.Table
 
-object OrderItems : Table() {
+object Items : Table() {
     val id = integer("id").autoIncrement()
     val orderId = integer("orderId").references(Orders.id)
     val foodId = integer("foodId").references(Foods.id)

src/main/kotlin/com/example/table/OrderItems.kt renamed to src/main/kotlin/com/example/table/Items.kt

@@ -23,10 +23,10 @@ fun ResultRow.toFoodDto(): FoodDto = FoodDto(
 
 fun ResultRow.toOrderDto(): OrderDto = OrderDto(
     id = this[Orders.id],
-    userId = this[Orders.userId],
+    userId = this[Orders.userId].toString(),
     orderTime = this[Orders.orderTime].toKotlinInstant(),
     orderStatus = this[Orders.orderStatus],
-    totalPrice = this[Orders.totalPrice],
+    totalPrice = this[Orders.totalPrice].toDouble(),
     paymentDetails = this[Orders.paymentDetails]
 )