B 22087 int - Number of shipments in the search queue not decreasing when shipments are deleted

pkg/handlers/ghcapi/internal/payloads/model_to_payload.go

@@ -2633,13 +2633,7 @@ func SearchMoves(appCtx appcontext.AppContext, moves models.Moves) *ghcmessages.
 	for i, move := range moves {
 		customer := move.Orders.ServiceMember
 
-		numShipments := 0
-
-		for _, shipment := range move.MTOShipments {
-			if shipment.Status != models.MTOShipmentStatusDraft {
-				numShipments++
-			}
-		}
+		numShipments := len(move.MTOShipments)
 
 		var pickupDate, deliveryDate *strfmt.Date
 

pkg/handlers/ghcapi/internal/payloads/model_to_payload_test.go

@@ -865,6 +865,7 @@ func (suite *PayloadsSuite) TestSearchMoves() {
 			},
 		},
 	}, nil)
+
 	moves := models.Moves{moveUSMC}
 	suite.Run("Success - Returns a ghcmessages Upload payload from Upload Struct Marine move with no shipments", func() {
 		payload := SearchMoves(appCtx, moves)

pkg/models/mto_shipments.go

@@ -518,3 +518,23 @@ func FetchShipmentByID(db *pop.Connection, shipmentID uuid.UUID) (*MTOShipment,
 	}
 	return &mtoShipment, nil
 }
+
+// filters the returned MtoShipments for each move.
+// Ignoring mto shipments that have been deleted, cancelled, or rejected.
+func FilterDeletedRejectedCanceledMtoShipments(unfilteredShipments MTOShipments) MTOShipments {
+	if len(unfilteredShipments) == 0 {
+		return unfilteredShipments
+	}
+
+	filteredShipments := MTOShipments{}
+	for _, shipment := range unfilteredShipments {
+		if shipment.DeletedAt == nil &&
+			(shipment.Status != MTOShipmentStatusDraft) &&
+			(shipment.Status != MTOShipmentStatusRejected) &&
+			(shipment.Status != MTOShipmentStatusCanceled) {
+			filteredShipments = append(filteredShipments, shipment)
+		}
+	}
+
+	return filteredShipments
+}

pkg/services/move/move_searcher.go

@@ -68,7 +68,7 @@ func (s moveSearcher) SearchMoves(appCtx appcontext.AppContext, params *services
 		Join("addresses as origin_addresses", "origin_addresses.id = origin_duty_locations.address_id").
 		Join("duty_locations as new_duty_locations", "new_duty_locations.id = orders.new_duty_location_id").
 		Join("addresses as new_addresses", "new_addresses.id = new_duty_locations.address_id").
-		LeftJoin("mto_shipments", "mto_shipments.move_id = moves.id AND mto_shipments.status <> 'DRAFT'").
+		LeftJoin("mto_shipments", "mto_shipments.move_id = moves.id").
 		LeftJoin("move_to_gbloc", "move_to_gbloc.move_id = moves.id").
 		GroupBy("moves.id", "service_members.id", "origin_addresses.id", "new_addresses.id").
 		Where("show = TRUE")
@@ -105,6 +105,12 @@ func (s moveSearcher) SearchMoves(appCtx appcontext.AppContext, params *services
 	if err != nil {
 		return models.Moves{}, 0, apperror.NewQueryError("Move", err, "")
 	}
+
+	for i := range moves {
+		if moves[i].MTOShipments != nil {
+			moves[i].MTOShipments = models.FilterDeletedRejectedCanceledMtoShipments(moves[i].MTOShipments)
+		}
+	}
 	return moves, query.Paginator.TotalEntriesSize, nil
 }
 

pkg/services/move/move_searcher_test.go

@@ -248,6 +248,97 @@ func (suite *MoveServiceSuite) TestMoveSearch() {
 		suite.Equal(secondMove.Locator, moves[0].Locator)
 		suite.Equal(2, totalCount)
 	})
+	suite.Run("filtering mto shipments search results", func() {
+		qaeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeQae})
+
+		session := auth.Session{
+			ApplicationName: auth.OfficeApp,
+			Roles:           qaeUser.User.Roles,
+			OfficeUserID:    qaeUser.ID,
+			IDToken:         "fake_token",
+			AccessToken:     "fakeAccessToken",
+		}
+
+		moveWithShipmentsOfEveryStatus := factory.BuildMove(suite.DB(), []factory.Customization{
+			{
+				Model: models.Move{
+					Locator: "AAAAAA",
+				},
+			},
+		}, nil)
+
+		shipmentWithSubmittedStatus := factory.BuildMTOShipment(suite.DB(), []factory.Customization{
+			{
+				Model:    moveWithShipmentsOfEveryStatus,
+				LinkOnly: true,
+			},
+			{
+				Model: models.MTOShipment{
+					Status: models.MTOShipmentStatusSubmitted,
+				},
+			},
+		}, nil)
+		shipmentWithCanceledStatus := factory.BuildMTOShipment(suite.DB(), []factory.Customization{
+			{
+				Model:    moveWithShipmentsOfEveryStatus,
+				LinkOnly: true,
+			},
+			{
+				Model: models.MTOShipment{
+					Status: models.MTOShipmentStatusCanceled,
+				},
+			},
+		}, nil)
+		rejectionReason := "bad shipment"
+		shipmentWithRejectedStatus := factory.BuildMTOShipment(suite.DB(), []factory.Customization{
+			{
+				Model:    moveWithShipmentsOfEveryStatus,
+				LinkOnly: true,
+			},
+			{
+				Model: models.MTOShipment{
+					Status:          models.MTOShipmentStatusRejected,
+					RejectionReason: &rejectionReason,
+				},
+			},
+		}, nil)
+		shipmentWithCancellationRequestedStatus := factory.BuildMTOShipment(suite.DB(), []factory.Customization{
+			{
+				Model:    moveWithShipmentsOfEveryStatus,
+				LinkOnly: true,
+			},
+			{
+				Model: models.MTOShipment{
+					Status: models.MTOShipmentStatusCancellationRequested,
+				},
+			},
+		}, nil)
+		shipmentWithApprovedStatus := factory.BuildMTOShipment(suite.DB(), []factory.Customization{
+			{
+				Model:    moveWithShipmentsOfEveryStatus,
+				LinkOnly: true,
+			},
+			{
+				Model: models.MTOShipment{
+					Status: models.MTOShipmentStatusApproved,
+				},
+			},
+		}, nil)
+		moveWithShipmentsOfEveryStatus.MTOShipments = models.MTOShipments{
+			shipmentWithSubmittedStatus,
+			shipmentWithCanceledStatus,
+			shipmentWithRejectedStatus,
+			shipmentWithCancellationRequestedStatus,
+			shipmentWithApprovedStatus,
+		}
+		filteredShipments := models.FilterDeletedRejectedCanceledMtoShipments(moveWithShipmentsOfEveryStatus.MTOShipments)
+		moves, _, err := searcher.SearchMoves(suite.AppContextWithSessionForTest(&session), &services.SearchMovesParams{Locator: &moveWithShipmentsOfEveryStatus.Locator})
+		suite.NoError(err)
+		suite.Len(moves, 1)
+		suite.Len(moves[0].MTOShipments, 3)
+		suite.Equal(len(filteredShipments), 3)
+
+	})
 }
 
 func setupTestData(suite *MoveServiceSuite) (models.Move, models.Move, models.MTOShipment) {

yarn.lock

@@ -16502,9 +16502,9 @@ stop-iteration-iterator@^1.0.0:
     internal-slot "^1.0.4"
 
 store2@^2.14.2:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.2.tgz#56138d200f9fe5f582ad63bc2704dbc0e4a45068"
-  integrity sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==
+  version "2.14.4"
+  resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.4.tgz#81b313abaddade4dcd7570c5cc0e3264a8f7a242"
+  integrity sha512-srTItn1GOvyvOycgxjAnPA63FZNwy0PTyUBFMHRM+hVFltAeoh0LmNBz9SZqUS9mMqGk8rfyWyXn3GH5ReJ8Zw==
 
 storybook@^7.6.20:
   version "7.6.20"