B 20618 testing tae

Dockerfile.e2e

@@ -1,4 +1,4 @@
-FROM alpine:3.20.2
+FROM alpine:3.20.3
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox

Dockerfile.migrations

@@ -1,4 +1,4 @@
-FROM alpine:3.20.2
+FROM alpine:3.20.3
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox

Dockerfile.migrations_local

@@ -18,7 +18,7 @@ RUN rm -f bin/milmove && make bin/milmove
 # FINAL #
 #########
 
-FROM alpine:3.20.2
+FROM alpine:3.20.3
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox --force-missing-repositories

Dockerfile.reviewapp

@@ -45,7 +45,7 @@ RUN set -x \
   && make bin/generate-test-data
 
 # define migrations before client build since it doesn't need client
-FROM alpine:3.20.2 as migrate
+FROM alpine:3.20.3 as migrate
 
 COPY --from=server_builder /build/bin/rds-ca-2019-root.pem /bin/rds-ca-2019-root.pem
 COPY --from=server_builder /build/bin/milmove /bin/milmove

Dockerfile.tools

@@ -1,4 +1,4 @@
-FROM alpine:3.20.2
+FROM alpine:3.20.3
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox

Dockerfile.tools_local

@@ -18,7 +18,7 @@ RUN rm -f bin/prime-api-client && make bin/prime-api-client
 # FINAL #
 #########
 
-FROM alpine:3.20.2
+FROM alpine:3.20.3
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox

pkg/factory/boat_shipment_factory.go

@@ -14,7 +14,7 @@ type boatBuildType byte
 const (
 	boatBuildStandard boatBuildType = iota
 	boatBuildStandardTowAway
-	boatBuildStandardHualAway
+	boatBuildStandardHaulAway
 )
 
 // buildBoatShipmentWithBuildType does the actual work
@@ -56,7 +56,7 @@ func buildBoatShipmentWithBuildType(db *pop.Connection, customs []Customization,
 		shipment.ShipmentType = models.MTOShipmentTypeBoatTowAway
 	}
 
-	if buildType == boatBuildStandardHualAway {
+	if buildType == boatBuildStandardHaulAway {
 		shipment.ShipmentType = models.MTOShipmentTypeBoatHaulAway
 	}
 
@@ -80,7 +80,7 @@ func buildBoatShipmentWithBuildType(db *pop.Connection, customs []Customization,
 		boatShipment.IsRoadworthy = models.BoolPointer(true)
 	}
 
-	if buildType == boatBuildStandardHualAway {
+	if buildType == boatBuildStandardHaulAway {
 		boatShipment.Type = models.BoatShipmentTypeHaulAway
 		boatShipment.HasTrailer = models.BoolPointer(false)
 		boatShipment.IsRoadworthy = models.BoolPointer(false)
@@ -106,7 +106,7 @@ func BuildBoatShipmentTowAway(db *pop.Connection, customs []Customization, trait
 	return buildBoatShipmentWithBuildType(db, customs, traits, boatBuildStandardTowAway)
 }
 func BuildBoatShipmentHaulAway(db *pop.Connection, customs []Customization, traits []Trait) models.BoatShipment {
-	return buildBoatShipmentWithBuildType(db, customs, traits, boatBuildStandardHualAway)
+	return buildBoatShipmentWithBuildType(db, customs, traits, boatBuildStandardHaulAway)
 }
 
 // ------------------------

pkg/services/move/move_router_test.go

@@ -296,15 +296,56 @@ func (suite *MoveServiceSuite) TestMoveSubmission() {
 					},
 				}, nil)
 
+				boatMTOSHipment := factory.BuildMTOShipmentMinimal(suite.DB(), []factory.Customization{
+					{
+						Model: models.MTOShipment{
+							Status:       models.MTOShipmentStatusDraft,
+							ShipmentType: models.MTOShipmentTypeBoatHaulAway,
+						},
+					},
+					{
+						Model:    move,
+						LinkOnly: true,
+					},
+				}, nil)
+
+				mobileHomeMTOShipment := factory.BuildMTOShipmentMinimal(suite.DB(), []factory.Customization{
+					{
+						Model: models.MTOShipment{
+							Status:       models.MTOShipmentStatusDraft,
+							ShipmentType: models.MTOShipmentTypeMobileHome,
+						},
+					},
+					{
+						Model:    move,
+						LinkOnly: true,
+					},
+				}, nil)
+
 				ppmShipment := factory.BuildPPMShipment(suite.DB(), []factory.Customization{
 					{
 						Model: models.PPMShipment{
 							Status: models.PPMShipmentStatusDraft,
 						},
 					},
 				}, nil)
-				move.MTOShipments = models.MTOShipments{shipment}
+
+				boatShipment := factory.BuildBoatShipmentHaulAway(suite.DB(), []factory.Customization{
+					{
+						Model: models.BoatShipment{},
+					},
+				}, nil)
+
+				mobileHomeShipment := factory.BuildMobileHomeShipment(suite.DB(), []factory.Customization{
+					{
+						Model: models.MobileHome{},
+					},
+				}, nil)
+
+				move.MTOShipments = models.MTOShipments{shipment, boatMTOSHipment, mobileHomeMTOShipment}
 				move.MTOShipments[0].PPMShipment = &ppmShipment
+				move.MTOShipments[0].BoatShipment = &boatShipment
+				move.MTOShipments[0].MobileHome = &mobileHomeShipment
 
 				newSignedCertification := factory.BuildSignedCertification(nil, []factory.Customization{
 					{
@@ -397,6 +438,7 @@ func (suite *MoveServiceSuite) TestMoveSubmission() {
 		suite.Equal(models.MTOShipmentStatusSubmitted, move.MTOShipments[0].Status, "expected Submitted")
 		suite.Equal(models.PPMShipmentStatusSubmitted, move.MTOShipments[0].PPMShipment.Status, "expected Submitted")
 	})
+
 }
 
 func (suite *MoveServiceSuite) TestMoveCancellation() {
@@ -745,6 +787,28 @@ func (suite *MoveServiceSuite) TestCompleteServiceCounseling() {
 		suite.IsType(apperror.ConflictError{}, err)
 		suite.Contains(err.Error(), "NTS-release shipment must include facility info")
 	})
+
+	suite.Run("Boat Shipment - status changed to 'SERVICE_COUNSELING_COMPLETED'", func() {
+		move := factory.BuildStubbedMoveWithStatus(models.MoveStatusNeedsServiceCounseling)
+		boatShipment := factory.BuildBoatShipment(nil, nil, nil)
+		move.MTOShipments = models.MTOShipments{boatShipment.Shipment}
+
+		err := moveRouter.CompleteServiceCounseling(suite.AppContextForTest(), &move)
+
+		suite.NoError(err)
+		suite.Equal(models.MoveStatusServiceCounselingCompleted, move.Status)
+	})
+
+	suite.Run("Mobile Home Shipment - status changed to 'SERVICE_COUNSELING_COMPLETED'", func() {
+		move := factory.BuildStubbedMoveWithStatus(models.MoveStatusNeedsServiceCounseling)
+		mobileHomeShipment := factory.BuildMobileHomeShipment(nil, nil, nil)
+		move.MTOShipments = models.MTOShipments{mobileHomeShipment.Shipment}
+
+		err := moveRouter.CompleteServiceCounseling(suite.AppContextForTest(), &move)
+
+		suite.NoError(err)
+		suite.Equal(models.MoveStatusServiceCounselingCompleted, move.Status)
+	})
 }
 
 func (suite *MoveServiceSuite) createServiceItem() (models.MTOServiceItem, models.Move) {

pkg/services/shipment_summary_worksheet/shipment_summary_worksheet.go

@@ -227,12 +227,13 @@ func (s SSWPPMComputer) FormatValuesShipmentSummaryWorksheetFormPage1(data model
 	page1.WeightAllotmentProgearSpouse = FormatWeights(data.WeightAllotment.SpouseProGear)
 	page1.TotalWeightAllotment = FormatWeights(data.WeightAllotment.TotalWeight)
 
+	formattedSIT := WorkSheetSIT{}
+
 	formattedShipment := s.FormatShipment(data.PPMShipment, data.WeightAllotment, isPaymentPacket)
 	page1.ShipmentNumberAndTypes = formattedShipment.ShipmentNumberAndTypes
 	page1.ShipmentPickUpDates = formattedShipment.PickUpDates
 	page1.ShipmentCurrentShipmentStatuses = formattedShipment.CurrentShipmentStatuses
 
-	formattedSIT := WorkSheetSIT{}
 	// Shipment weights for Payment Packet are actual, for AOA Packet are estimated.
 	if isPaymentPacket {
 		formattedSIT = FormatAllSITSForPaymentPacket(data.MovingExpenses)
@@ -1008,12 +1009,13 @@ func (SSWPPMComputer *SSWPPMComputer) FetchDataShipmentSummaryWorksheetFormData(
 		return nil, err
 	}
 
-	// Fetches all signed certifications for a move to be filtered in this file by ppmid and type
-	signedCertifications, err := models.FetchSignedCertifications(appCtx.DB(), session, ppmShipment.Shipment.MoveTaskOrderID)
+	serviceMember.Edipi, err = formatEmplid(serviceMember)
 	if err != nil {
 		return nil, err
 	}
-	serviceMember.Edipi, err = formatEmplid(serviceMember)
+
+	// Fetches all signed certifications for a move to be filtered in this file by ppmid and type
+	signedCertifications, err := models.FetchSignedCertifications(appCtx.DB(), session, ppmShipment.Shipment.MoveTaskOrderID)
 	if err != nil {
 		return nil, err
 	}