Skip to content

Commit

Permalink
INT-B-19552 (#12616)
Browse files Browse the repository at this point in the history
* update queue query to not show full ppms when not necessary

* updating tests p1

* fixed a bunch of tests

* fixed remaining tests

* fixed playwright test

* maybe this works /shrug

* removed playwright changes
  • Loading branch information
loganwc authored May 9, 2024
1 parent 2578e2e commit b27cf93
Show file tree
Hide file tree
Showing 2 changed files with 155 additions and 63 deletions.
4 changes: 4 additions & 0 deletions pkg/services/order/order_fetcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/transcom/mymove/pkg/apperror"
"github.com/transcom/mymove/pkg/db/utilities"
"github.com/transcom/mymove/pkg/models"
"github.com/transcom/mymove/pkg/models/roles"
"github.com/transcom/mymove/pkg/services"
)

Expand Down Expand Up @@ -159,6 +160,9 @@ func (f orderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uuid
Where("(ppm_shipments.status IS NULL OR ppm_shipments.status NOT IN (?))", models.PPMShipmentStatusWaitingOnCustomer, models.PPMShipmentStatusNeedsPaymentApproval, models.PPMShipmentStatusPaymentApproved)
}
} else {
if appCtx.Session().Roles.HasRole(roles.RoleTypeTOO) {
query.Where("(moves.ppm_type = 'PARTIAL' or (moves.ppm_type = 'FULL' and origin_dl.provides_services_counseling = 'false'))")
}
// TODO not sure we'll need this once we're in a situation where closeout param is always passed
query.LeftJoin("ppm_shipments", "ppm_shipments.shipment_id = mto_shipments.id")
}
Expand Down
Loading

0 comments on commit b27cf93

Please sign in to comment.