Merge pull request #14497 from transcom/B-22148-main

B 22148 main - Assigned User Cleanup [BE] - PPM Closeout
transcom · Jan 14, 2025 · c45a1d6 · c45a1d6
2 parents 345a61e + 7838746
commit c45a1d6
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 2 deletions.
diff --git a/pkg/services/ppmshipment/ppm_shipment_fetcher.go b/pkg/services/ppmshipment/ppm_shipment_fetcher.go
@@ -307,6 +307,7 @@ func FindPPMShipment(appCtx appcontext.AppContext, id uuid.UUID) (*models.PPMShi
 	err := appCtx.DB().Scope(utilities.ExcludeDeletedScope()).
 		EagerPreload(
 			"Shipment",
+			"Shipment.MoveTaskOrder",
 			"WeightTickets",
 			"MovingExpenses",
 			"ProgearWeightTickets",

diff --git a/pkg/services/ppmshipment/ppm_shipment_review_documents.go b/pkg/services/ppmshipment/ppm_shipment_review_documents.go
@@ -59,7 +59,7 @@ func (p *ppmShipmentReviewDocuments) SubmitReviewedDocuments(appCtx appcontext.A
 		if err != nil {
 			return err
 		}
-
+		updatedPPMShipment.Shipment.MoveTaskOrder.SCAssignedID = nil
 		err = validatePPMShipment(appCtx, updatedPPMShipment, ppmShipment, &ppmShipment.Shipment, PPMShipmentUpdaterChecks...)
 
 		if err != nil {
@@ -74,6 +74,14 @@ func (p *ppmShipmentReviewDocuments) SubmitReviewedDocuments(appCtx appcontext.A
 			return apperror.NewQueryError("PPMShipment", err, "unable to update PPMShipment")
 		}
 
+		verrs, err = appCtx.DB().ValidateAndSave(&updatedPPMShipment.Shipment.MoveTaskOrder)
+		if verrs != nil && verrs.HasAny() {
+			return apperror.NewInvalidInputError(updatedPPMShipment.ID, nil, verrs, "")
+		}
+		if err != nil {
+			return err
+		}
+
 		err = p.signCertificationPPMCloseout(appCtx, updatedPPMShipment.Shipment.MoveTaskOrderID, updatedPPMShipment.ID)
 
 		if err != nil {

diff --git a/pkg/services/ppmshipment/ppm_shipment_review_documents_test.go b/pkg/services/ppmshipment/ppm_shipment_review_documents_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/transcom/mymove/pkg/auth"
 	"github.com/transcom/mymove/pkg/factory"
 	"github.com/transcom/mymove/pkg/models"
+	"github.com/transcom/mymove/pkg/models/roles"
 	"github.com/transcom/mymove/pkg/services"
 	"github.com/transcom/mymove/pkg/services/mocks"
 	signedcertification "github.com/transcom/mymove/pkg/services/signed_certification"
@@ -126,7 +127,6 @@ func (suite *PPMShipmentSuite) TestReviewDocuments() {
 
 	suite.Run("Can route the PPMShipment properly", func() {
 		existingPPMShipment := factory.BuildPPMShipmentThatNeedsCloseout(suite.DB(), nil, nil)
-
 		sm := factory.BuildServiceMember(suite.DB(), nil, nil)
 		session := suite.AppContextWithSessionForTest(&auth.Session{
 			ApplicationName: auth.OfficeApp,
@@ -135,6 +135,43 @@ func (suite *PPMShipmentSuite) TestReviewDocuments() {
 			FirstName:       "Nelson",
 			LastName:        "Muntz",
 		})
+		setupTestData := func() models.OfficeUser {
+
+			transportationOffice := factory.BuildTransportationOffice(suite.DB(), []factory.Customization{
+				{
+					Model: models.TransportationOffice{
+						ProvidesCloseout: true,
+					},
+				},
+			}, nil)
+
+			officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), []factory.Customization{
+				{
+					Model:    transportationOffice,
+					LinkOnly: true,
+					Type:     &factory.TransportationOffices.CloseoutOffice,
+				},
+			}, []roles.RoleType{roles.RoleTypeServicesCounselor})
+
+			return officeUser
+		}
+
+		officeUser := setupTestData()
+		move := factory.BuildMoveWithShipment(suite.DB(), []factory.Customization{
+			{
+				Model: models.Move{
+					Status: models.MoveStatusNeedsServiceCounseling,
+				},
+			},
+			{
+				Model:    officeUser,
+				LinkOnly: true,
+				Type:     &factory.OfficeUsers.SCAssignedUser,
+			},
+		}, nil)
+
+		existingPPMShipment.Shipment.MoveTaskOrder = move
+		suite.NotNil(existingPPMShipment.Shipment.MoveTaskOrder.SCAssignedID)
 
 		router := setUpPPMShipperRouterMock(
 			func(_ appcontext.AppContext, ppmShipment *models.PPMShipment) error {
@@ -154,6 +191,9 @@ func (suite *PPMShipmentSuite) TestReviewDocuments() {
 				existingPPMShipment.ID,
 			)
 
+			//check removal of the SC Assigned User
+			suite.Nil(updatedPPMShipment.Shipment.MoveTaskOrder.SCAssignedID)
+
 			if suite.NoError(err) && suite.NotNil(updatedPPMShipment) {
 				suite.Equal(models.PPMShipmentStatusCloseoutComplete, updatedPPMShipment.Status)