From 0c9fde6abe7d8ed24589b41b4a5665c264ab9c1a Mon Sep 17 00:00:00 2001 From: pambecker Date: Thu, 30 Jan 2025 20:22:43 +0000 Subject: [PATCH] fix issue with multiple rows coming back for moves with more than 1 payment request --- pkg/services/move/move_fetcher.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/services/move/move_fetcher.go b/pkg/services/move/move_fetcher.go index 42772b151fc..6dc8ee3d3a9 100644 --- a/pkg/services/move/move_fetcher.go +++ b/pkg/services/move/move_fetcher.go @@ -229,16 +229,16 @@ func (f moveFetcherBulkAssignment) FetchMovesForBulkAssignmentPaymentRequest(app sqlQuery := ` SELECT moves.id, - payment_requests.requested_at AS earliest_date - FROM payment_requests - INNER JOIN moves on moves.id = payment_requests.move_id + min(payment_requests.requested_at) AS earliest_date + FROM moves INNER JOIN orders ON orders.id = moves.orders_id INNER JOIN service_members ON orders.service_member_id = service_members.id + INNER JOIN payment_requests on payment_requests.move_id = moves.id LEFT JOIN move_to_gbloc ON move_to_gbloc.move_id = moves.id - WHERE payment_requests.status = 'PENDING' - AND moves.show = $1 + WHERE moves.show = $1 AND (orders.orders_type NOT IN ($2, $3, $4)) - AND moves.tio_assigned_id IS NULL ` + AND moves.tio_assigned_id IS NULL + AND payment_requests.status = 'PENDING' ` if gbloc == "USMC" { sqlQuery += ` AND service_members.affiliation ILIKE 'MARINES' ` @@ -248,8 +248,8 @@ func (f moveFetcherBulkAssignment) FetchMovesForBulkAssignmentPaymentRequest(app AND move_to_gbloc.gbloc = '` + gbloc + `' ` } sqlQuery += ` - GROUP BY moves.id, payment_requests.id - ORDER BY payment_requests.requested_at ASC` + GROUP BY moves.id + ORDER BY earliest_date ASC` err := appCtx.DB().RawQuery(sqlQuery, models.BoolPointer(true),