B-21941 TOO Queue Filtering For Destination Only Requests #14465
Conversation
traskowskycaci
added
Mountain Movers
traskowskycaci
requested review from
a team,
deandreJones,
danieljordan-caci,
TevinAdams and
cameroncaci
pinging those who I know have been taking a look - I updated the description with the above statement about ignoring CRQST1. @danieljordan-caci @brianmanley-caci @cameroncaci |
There was a problem hiding this comment.
It's crazy how such little code changes can be so complex under the hood.
I tested a bunch of moves and it seems to be working well. Destination only shows up in the destination queue and not in the origin queue, destination address requests only show up in the destination queue if that's all there is...
Hope you're okay after doing this work
Twas a rough one on me! |
There was a problem hiding this comment.
Leaving this note here per refactor discussions with @traskowskycaci
func excludeDestinationRequestsFilter(role roles.RoleType) QueryOption {
return func(query *pop.Query) {
codesToStringSlice := func(codes []models.ReServiceCode) []string {
codeStrings := make([]string, len(codes))
for i, code := range codes {
codeStrings[i] = string(code)
}
return codeStrings
}
if role == roles.RoleTypeTOO {
// Do not return moves that are purely in the destination queue
// eg, If they match this condition (status=APPROVALS REQUESTED + only destination SIT/shuttle/address updates)
// then exclude them from the results
query.Where(`
NOT (
moves.status = 'APPROVALS REQUESTED'
-- Check that destination address or re service codes are present and not approved
AND (
shipment_address_updates.status = 'REQUESTED'
OR (
mto_service_items.status = 'SUBMITTED'
AND (
re_services.code IN (?)
OR re_services.code IN (?)
)
)
)
-- Check that origin service codes, if present, are not of status SUBMITTED
AND NOT EXISTS (
-- Select any service item on this move that is submitted and NOT destination, if found then this move should not be excluded
SELECT 1
FROM mto_service_items AS msi
JOIN re_services AS re_service ON re_service.id = msi.re_service_id
WHERE msi.move_id = moves.id
AND msi.status = 'SUBMITTED'
-- Put our destination codes here, we want toANY service found that isn't destination
AND re_service.code NOT IN (?)
AND re_service.code NOT IN (?)
)
)
`,
codesToStringSlice(models.ValidDomesticDestinationSITReServiceCodes),
codesToStringSlice(models.ValidInternationalDestinationSITReServiceCodes),
codesToStringSlice(models.ValidDomesticDestinationSITReServiceCodes),
codesToStringSlice(models.ValidInternationalDestinationSITReServiceCodes),
)
}
}
}The following query adjustments were proposed, but for equivalent functionality and remaining bugs to iron out it wasn't pursued. Could be an idea if we need to come back to this query in the future for a new feature.
Existing functionality tested successfuly 👍
|
Appreciate all the reviews on this one, thanks guys! |
Agility ticket
Summary
This query gave me a run for my money - to filter out moves from the main TOO queue with only destination requests, we have to do some joins and check for destination requests, like destination SIT or destination address changes - as well as check that we only have those and not anything else that should keep the move in the TOO main queue (such as excess weight warnings).
I added a locator check in the
tooDestinationOnlyRequestsFilterfunction, otherwise it would pull in moves with excess weight on every search, in addition to the move searched for.How to test
Please ignore the move
CRQST1- it has only a destination address change and should be filtered out of the queue, but is hanging around for some reason. However, if you create a new move with only a destination address change - it is filtered out of the TOO queue correctly. I suspect the weird behavior is due to this being an old test move.Please try to think of any situation where a move should appear in the TOO queue and test that in addition the scenarios below.
Some test cases to try - please try various combos of these as you see fit.
Test cases:
Test service items, shipment address updates, excess weight triggered
Should be able to appear in both TOO and destination TOO queue:
SIT Extension should appear in TOO queue: