hot fix v2

This commit is contained in:
KP9lK 2025-06-11 14:17:33 +03:00
parent 577377bcbf
commit f8a6cf6e27
4 changed files with 11 additions and 5 deletions

View File

@ -51,7 +51,15 @@ fun ResultRow.toOrderResponse(): OrderResponse {
dateTime = this[OrderTable.orderDateTime],
orderStatus = toOrderStatusResponse(),
orderTotalSum = this[OrderTable.orderTotalSum],
orderSet = emptyList()
orderSet = emptyList(),
addressResponse = AddressResponse(
addressId = this[AddressTable.id],
entrance = this[AddressTable.entrance],
apartment = this[AddressTable.apartment],
floor = this[AddressTable.floor],
comment = this[AddressTable.comment],
address = this[AddressTable.address],
)
)
}
fun ResultRow.toOrderStatusResponse(): OrderStatusResponse {

View File

@ -34,7 +34,7 @@ class OrderRepository {
return@dbQuery false
}
suspend fun getOrdersByUuid(userUUID: UUID): List<OrderResponse> = DatabaseSettings.dbQuery {
return@dbQuery (OrderTable innerJoin OrderStatusTable)
return@dbQuery (OrderTable innerJoin OrderStatusTable innerJoin AddressTable)
.selectAll()
.where {
OrderTable.userUuid eq userUUID

View File

@ -93,8 +93,5 @@ class UserRepository {
ProfileTable.update({ ProfileTable.uuid eq uuid }) {
it[ProfileTable.address] = address[AddressTable.id]
}
if(user.hasValue(AddressTable.id)){
AddressTable.deleteWhere { id eq user[id] }
}
}
}

View File

@ -12,6 +12,7 @@ data class OrderResponse(
@Serializable(with = UuidSerializer::class)
val userUuid : UUID,
val addressId: Long,
val addressResponse: AddressResponse,
val dateTime: LocalDateTime,
val orderStatus : OrderStatusResponse,
@Serializable(with = BigDecimalSerializer::class)