Int b 22693 #14957

brianmanley-caci · 2025-03-04T23:35:33Z

Agility ticket

Summary

In B-22692 we added a new DB procedure for populating the prime_acknowledge_at columns on the moves and shipments table. In this story we are adding a new endpoint prime/v1/move-task-orders/acknowledge to the prime API. This endpoint allows the prime to send the move/shipment data with the primeAcknowledgedAt values, and we will then pass that to our DB procedure to save those values.

Verification Steps for the Author

These are to be checked by the author.

Have the Agility acceptance criteria been met for this change?

Verification Steps for Reviewers

These are to be checked by a reviewer.

Has the branch been pulled in and checked out?
Have the BL acceptance criteria been met for this change?
Was the Local build successful?
Has the code been reviewed from a standards and best practices point of view?

How to test

Start your local server.
Login to the office app as a Prime Simulator.
Open up the prime v1 swagger UI (http://officelocal:3000/swagger-ui/prime.html).
Scroll down to the acknowledgeMovesAndShipments endpoint and click Try it out.
Open DBeaver and execute the following query to find some move/shipment data:
select m.id as move_id, ms.id as shipment_id, m.prime_acknowledged_at as move_prime_acknowledged_at, ms.prime_acknowledged_at as shipment_prime_acknowledged_at from moves m join mto_shipments ms on m.id = ms.move_id;
Go back to swagger and plug a move id, shipment id, and primeAcknowledgeAt values into the payload.
Click Execute.
Verify that you receive a success message.
Go back to DBeaver, and verify that the prime_acknowledged_at column has been populated with the correct values.

Backend

Code follows the guidelines for Logging.
The requirements listed in Querying the Database Safely have been satisfied.

Database

Any new migrations/schema changes:

Follows our guidelines for Zero-Downtime Deploys.
Have been communicated to #g-database.
Secure migrations have been tested following the instructions in our docs.

Screenshots

pkg/services/acknowledge_moves_shipments/move_shipment_acknowledgement_updater_test.go

ryan-mchugh · 2025-03-05T17:32:06Z

pkg/handlers/primeapi/move_task_order_test.go

+		suite.Assertions.IsType(&movetaskorderops.AcknowledgeMovesAndShipmentsOK{}, handlerResponse)
+	})
+
+	suite.Run("Unsuccessful Acknowledge Moves and Shipments - 200", func() {


(minor) 200->500 (internal server error)

Updated to the correct http code.

ryan-mchugh · 2025-03-05T17:54:32Z

pkg/handlers/primeapi/move_task_order.go

+				return movetaskorderops.NewAcknowledgeMovesAndShipmentsInternalServerError(), err
+			}
+			responsePayload := &primemessages.AcknowledgeMovesShipmentsSuccessResponse{
+				Message: "Successfully updated acknowledgement for moves and shipments",


(minor) can check the message on tests

Added a check to validate the success message.

ryan-mchugh · 2025-03-05T17:55:15Z

pkg/handlers/primeapi/move_task_order.go

+			}
+			moves, verrs := payloads.MovesModelFromAcknowledgeMovesAndShipments(&payload)
+			if verrs != nil && verrs.HasAny() {
+				return movetaskorderops.NewAcknowledgeMovesAndShipmentsUnprocessableEntity().WithPayload(payloads.ValidationError(


(minor) can check the unprocessable type on tests

Actually not as minor as you thought. I added the test, but realized I wasn't properly returning this error in the case of a bad payload. Good catch 🙇 Should be good to go now.

pkg/handlers/primeapi/move_task_order.go

ryan-mchugh · 2025-03-05T18:33:48Z

Local Testing

ryan-mchugh · 2025-03-05T18:44:45Z

pkg/services/mto_service_item/mto_service_item_validators_test.go

@@ -1118,6 +1118,72 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemData() {
 		}
 	})

+	suite.Run("SITDepartureDate - Does not error or update shipment auth end date when set after the authorized end date - international", func() {


am getting a failing test

And here I was attempting to fix that failure 😞 I'll take a look.

So this test was essentially duplicated on main, but not on int. Somehow after removing the duplicate from my main B branch it got added back to my INT-B branch 😕 I removed it from this branch only as it doesn't exists on my main one.

ryan-mchugh

failing server test

…void any lingering possible issue with storybook

…m/mymove into B-22814-EnvVariableTests

B-22652 MAIN: UB Weight Restriction Email Updates

change to env variables for bypass if needed; unset aws env; fix whitespace; change needs to include now passing/req'd tests; change some images to use harbor proxy vs docker to avoid rate limit

loganwc · 2025-03-07T16:13:27Z

swagger/prime.yaml

+          schema:
+            $ref: '#/definitions/AcknowledgeMovesShipmentsSuccessResponse'
+        '401':
+          $ref: '#/responses/PermissionDenied'


you're only handling unprocessable, error and ok. could you include some checks for these other responses if they might be needed or you could just remove them from here

Good call. I removed them here.

danieljordan-caci

Just some little things

danieljordan-caci · 2025-03-07T20:09:31Z

pkg/services/acknowledge_moves_shipments/move_shipment_acknowledgement_updater.go

+// NewPortLocationFetcher returns a new port location fetcher
+func NewMoveAndShipmentAcknowledgementUpdater() services.MoveAndShipmentAcknowledgementUpdater {
+	return &moveAndShipmentAcknowledgementUpdater{}


Got a copy pasta thang here

Fixed in here.

danieljordan-caci · 2025-03-07T20:13:01Z

swagger-def/definitions/prime/AcknowledgeMovesShipments.yaml

+  AcknowledgeShipment:
+    type: object
+    properties:
+      id:
+        type: string
+        format: uuid
+        example: 1f2270c7-7166-40ae-981e-b200ebdf3054
+      primeAcknowledgedAt:
+        type: string
+        format: date-time
+        example: 2025-04-13T14:15:33Z
+
+  AcknowledgeMove:
+    type: object
+    properties:
+      id:
+        type: string
+        format: uuid
+        example: a502b4f1-b9c4-4faf-8bdd-68292501bf26
+      primeAcknowledgedAt:
+        type: string
+        format: date-time
+        example: 2025-04-13T14:15:22Z
+      mtoShipments:
+        type: array
+        items:
+          $ref: '#/definitions/AcknowledgeShipment'
+
+  AcknowledgeMoves:
+    type: array
+    items:
+      $ref: '#/definitions/AcknowledgeMove'
+
+  AcknowledgeMovesShipmentsSuccessResponse:
+    type: object
+    properties:
+      message:
+        type: string
+        example: 'Moves/Shipments acknowledgement successfully completed'


Can you break these up into their own .yaml files?

So having an AcknowledgeShipment.yaml, AcknowledgeMove.yaml, AcknowledgeMoves.yaml and AcknowledgeMovesShipmentsSuccessResponse.yaml

This keeps up with how we have things currently here in the definitions folder

My thinking was that they weren't going to be terribly reusable, so maybe keep them together. But I also don't think it would hurt to break them up for consistency.

Got those separated out in here.

brianmanley-caci added 7 commits February 27, 2025 17:42

B-22693 new prime acknowledgement endpoint

4654a2f

B-22693 handler and payload logic for prime moves acknowledgement

ed7bdbb

B-22693 prime acknowledge service to call db procedure

a63db71

Merge main into B-22693

a194387

B-22693 must test the handler

f2024ec

B-22693 fix a couple broken tests

420a1bc

Merge B-22693 into INT-B-22693

a3e6c33

brianmanley-caci added INTEGRATION Slated for Integration Testing Go-Rillaz Go-Rillaz labels Mar 4, 2025

brianmanley-caci requested review from danieljordan-caci, joeydoyecaci and a team March 4, 2025 23:35

brianmanley-caci self-assigned this Mar 4, 2025

brianmanley-caci requested a review from a team as a code owner March 4, 2025 23:35

brianmanley-caci added the backend label Mar 5, 2025

ryan-mchugh reviewed Mar 5, 2025

View reviewed changes

pkg/services/acknowledge_moves_shipments/move_shipment_acknowledgement_updater_test.go Outdated Show resolved Hide resolved

brianmanley-caci added 3 commits March 5, 2025 17:24

B-22693 fix spelling issue

b924da6

Merge remote-tracking branch 'origin/MAIN-B-22693' into INT-B-22693

de72dd6

Merge branch 'integrationTesting' into INT-B-22693

f782926

ryan-mchugh self-requested a review March 5, 2025 17:59

ryan-mchugh reviewed Mar 5, 2025

View reviewed changes

ryan-mchugh self-requested a review March 5, 2025 18:17

ryan-mchugh approved these changes Mar 5, 2025

View reviewed changes

ryan-mchugh reviewed Mar 5, 2025

View reviewed changes

ryan-mchugh requested changes Mar 5, 2025

View reviewed changes

brianmanley-caci added 4 commits March 5, 2025 14:04

Merge branch 'integrationTesting' into INT-B-22693

ee5098c

Remove duplicate tests found only on my INT-B-22693 branch

c742245

B-22693 fix/improve tests and resolve potential bug

5cb04a2

Merge remote-tracking branch 'origin/MAIN-B-22693' into INT-B-22693

0b3a81f

brianmanley-caci requested a review from ryan-mchugh March 5, 2025 21:57

brianmanley-caci and others added 16 commits March 6, 2025 11:20

Merge branch 'integrationTesting' into INT-B-22693

dafcb3e

change to env variables for bypass if needed; unset aws env just to a…

96997c5

…void any lingering possible issue with storybook

need logic to by dynamic in rules

59eb2a2

missed one

112e5de

final fix

592ce54

Merge branch 'integrationTesting' into INT-B-22693

8821f04

Merge branch 'main' into B-22814-EnvVariableTests

c0c9f1c

update to dockerhub

9ef25cd

Merge branch 'B-22814-EnvVariableTests' of https://github.com/transco…

2c5402b

…m/mymove into B-22814-EnvVariableTests

switch to harbor

4781d85

Merge branch 'main' into B-22652-MAIN

19cf559

change to harbor

0d3f1f7

Merge pull request #14975 from transcom/B-22652-MAIN

e90754a

B-22652 MAIN: UB Weight Restriction Email Updates

Merge branch 'main' into B-22814-EnvVariableTests

0e1c59f

white space clean up

9eda4fc

Merge pull request #14973 from transcom/B-22814-EnvVariableTests

554691a

change to env variables for bypass if needed; unset aws env; fix whitespace; change needs to include now passing/req'd tests; change some images to use harbor proxy vs docker to avoid rate limit

loganwc requested changes Mar 7, 2025

View reviewed changes

brianmanley-caci added 4 commits March 7, 2025 17:21

B-22693 remove unused statuses

102f553

Merge main into MAIN-B-22693

592766f

Merge branch 'integrationTesting' into INT-B-22693

2411979

Merge B-22693 into INT-B-22693

402d3bd

brianmanley-caci requested a review from loganwc March 7, 2025 17:58

danieljordan-caci requested changes Mar 7, 2025

View reviewed changes

brianmanley-caci added 3 commits March 7, 2025 22:49

B-22693 separate definitions into separate yaml files for consistency

bd8807c

Merge remote-tracking branch 'origin/MAIN-B-22693' into INT-B-22693

ef5464a

Merge branch 'integrationTesting' into INT-B-22693

bf565d5

brianmanley-caci requested a review from danieljordan-caci March 7, 2025 22:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Int b 22693 #14957

Int b 22693 #14957

brianmanley-caci commented Mar 4, 2025

ryan-mchugh Mar 5, 2025

brianmanley-caci Mar 5, 2025

ryan-mchugh Mar 5, 2025

brianmanley-caci Mar 5, 2025

ryan-mchugh Mar 5, 2025

brianmanley-caci Mar 5, 2025

ryan-mchugh commented Mar 5, 2025

ryan-mchugh Mar 5, 2025

brianmanley-caci Mar 5, 2025

brianmanley-caci Mar 5, 2025

ryan-mchugh left a comment

loganwc Mar 7, 2025

brianmanley-caci Mar 7, 2025

danieljordan-caci left a comment

danieljordan-caci Mar 7, 2025

brianmanley-caci Mar 7, 2025

danieljordan-caci Mar 7, 2025

danieljordan-caci Mar 7, 2025

brianmanley-caci Mar 7, 2025

brianmanley-caci Mar 7, 2025

Int b 22693 #14957

Are you sure you want to change the base?

Int b 22693 #14957

Conversation

brianmanley-caci commented Mar 4, 2025

Summary

Verification Steps for the Author

Verification Steps for Reviewers

How to test

Backend

Database

Any new migrations/schema changes:

Screenshots

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryan-mchugh commented Mar 5, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryan-mchugh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

danieljordan-caci left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment