Skip to content

Commit

Permalink
removal delete empty shipment attempt
Browse files Browse the repository at this point in the history
  • Loading branch information
JonSpight committed Feb 27, 2025
1 parent a80eb5c commit 47f022c
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions pkg/services/move/move_searcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,8 @@ func (s moveSearcher) SearchMoves(appCtx appcontext.AppContext, params *services
scheduledDeliveryDateQuery := scheduledDeliveryDateFilter(params.DeliveryDate)
orderQuery := sortOrder(params.Sort, params.Order, params.CustomerName, params.PaymentRequestCode)
paymentRequestQuery := paymentRequestCodeFilter(params.PaymentRequestCode)
deletedShipmentsQuery := deletedShipmentsFilter()
options := [13]QueryOption{customerNameQuery, locatorQuery, dodIDQuery, branchQuery, orderQuery, originPostalCodeQuery,
destinationPostalCodeQuery, statusQuery, shipmentsCountQuery, scheduledPickupDateQuery, scheduledDeliveryDateQuery, paymentRequestQuery, deletedShipmentsQuery}
options := [12]QueryOption{customerNameQuery, locatorQuery, dodIDQuery, branchQuery, orderQuery, originPostalCodeQuery,
destinationPostalCodeQuery, statusQuery, shipmentsCountQuery, scheduledPickupDateQuery, scheduledDeliveryDateQuery, paymentRequestQuery}

for _, option := range options {
if option != nil {
Expand Down Expand Up @@ -151,12 +150,6 @@ func originPostalCodeFilter(postalCode *string) QueryOption {
}
}

func deletedShipmentsFilter() QueryOption {
return func(query *pop.Query) {
query.Where("mto_shipments.deleted_at IS NULL")
}
}

func destinationPostalCodeFilter(postalCode *string) QueryOption {
return func(query *pop.Query) {
if postalCode != nil {
Expand Down

0 comments on commit 47f022c

Please sign in to comment.