hot fix v2
This commit is contained in:
parent
577377bcbf
commit
f8a6cf6e27
@ -51,7 +51,15 @@ fun ResultRow.toOrderResponse(): OrderResponse {
|
|||||||
dateTime = this[OrderTable.orderDateTime],
|
dateTime = this[OrderTable.orderDateTime],
|
||||||
orderStatus = toOrderStatusResponse(),
|
orderStatus = toOrderStatusResponse(),
|
||||||
orderTotalSum = this[OrderTable.orderTotalSum],
|
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 {
|
fun ResultRow.toOrderStatusResponse(): OrderStatusResponse {
|
||||||
|
@ -34,7 +34,7 @@ class OrderRepository {
|
|||||||
return@dbQuery false
|
return@dbQuery false
|
||||||
}
|
}
|
||||||
suspend fun getOrdersByUuid(userUUID: UUID): List<OrderResponse> = DatabaseSettings.dbQuery {
|
suspend fun getOrdersByUuid(userUUID: UUID): List<OrderResponse> = DatabaseSettings.dbQuery {
|
||||||
return@dbQuery (OrderTable innerJoin OrderStatusTable)
|
return@dbQuery (OrderTable innerJoin OrderStatusTable innerJoin AddressTable)
|
||||||
.selectAll()
|
.selectAll()
|
||||||
.where {
|
.where {
|
||||||
OrderTable.userUuid eq userUUID
|
OrderTable.userUuid eq userUUID
|
||||||
|
@ -93,8 +93,5 @@ class UserRepository {
|
|||||||
ProfileTable.update({ ProfileTable.uuid eq uuid }) {
|
ProfileTable.update({ ProfileTable.uuid eq uuid }) {
|
||||||
it[ProfileTable.address] = address[AddressTable.id]
|
it[ProfileTable.address] = address[AddressTable.id]
|
||||||
}
|
}
|
||||||
if(user.hasValue(AddressTable.id)){
|
|
||||||
AddressTable.deleteWhere { id eq user[id] }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -12,6 +12,7 @@ data class OrderResponse(
|
|||||||
@Serializable(with = UuidSerializer::class)
|
@Serializable(with = UuidSerializer::class)
|
||||||
val userUuid : UUID,
|
val userUuid : UUID,
|
||||||
val addressId: Long,
|
val addressId: Long,
|
||||||
|
val addressResponse: AddressResponse,
|
||||||
val dateTime: LocalDateTime,
|
val dateTime: LocalDateTime,
|
||||||
val orderStatus : OrderStatusResponse,
|
val orderStatus : OrderStatusResponse,
|
||||||
@Serializable(with = BigDecimalSerializer::class)
|
@Serializable(with = BigDecimalSerializer::class)
|
||||||
|
Loading…
Reference in New Issue
Block a user