From e4fc97c0288d658b1f3e96b4b6ca26b87e967380 Mon Sep 17 00:00:00 2001
From: Alex Lusk <alex.lusk@caci.com>
Date: Tue, 4 Feb 2025 15:31:10 +0000
Subject: [PATCH 1/7] test fix due to weird merge

---
 .../transportation_office_fetcher_test.go                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/services/transportation_office/transportation_office_fetcher_test.go b/pkg/services/transportation_office/transportation_office_fetcher_test.go
index 7514868e12a..9c91710989c 100644
--- a/pkg/services/transportation_office/transportation_office_fetcher_test.go
+++ b/pkg/services/transportation_office/transportation_office_fetcher_test.go
@@ -343,7 +343,7 @@ func (suite *TransportationOfficeServiceSuite) Test_Oconus_AK_FindCounselingOffi
 		return rateArea, oconusRateArea, *usprc, found_duty_location
 	}
 
-	suite.Run("success - findOconusGblocDepartmentIndicator - returns default GLOC for departmentAffiliation if no specific departmentAffilation mapping is defined", func() {
+	suite.Run("success - findOconusGblocDepartmentIndicator - returns default GBLOC for departmentAffiliation if no specific departmentAffilation mapping is defined", func() {
 		contract, err := createContract(suite.AppContextForTest(), testContractCode, testContractName)
 		suite.NotNil(contract)
 		suite.FatalNoError(err)
@@ -377,7 +377,7 @@ func (suite *TransportationOfficeServiceSuite) Test_Oconus_AK_FindCounselingOffi
 				ServiceMemberID: serviceMember.ID,
 			})
 			suite.Nil(err)
-			departmentIndictor, err := findOconusGblocDepartmentIndicator(appCtx, dutylocation, uuid.Nil)
+			departmentIndictor, err := findOconusGblocDepartmentIndicator(appCtx, dutylocation, serviceMember.ID)
 			suite.NotNil(departmentIndictor)
 			suite.Nil(err)
 			suite.Nil(departmentIndictor.DepartmentIndicator)
@@ -638,7 +638,7 @@ func (suite *TransportationOfficeServiceSuite) Test_Oconus_AK_FindCounselingOffi
 				appCtx := suite.AppContextWithSessionForTest(&auth.Session{
 					ServiceMemberID: serviceMember.ID,
 				})
-				offices, err := findCounselingOffice(appCtx, dutylocation.ID, uuid.Nil)
+				offices, err := findCounselingOffice(appCtx, dutylocation.ID, serviceMember.ID)
 				suite.NotNil(offices)
 				suite.Nil(err)
 				suite.Equal(1, len(offices))

From 925952f82d961b87efcb0fd9aa98f2bbcfb56ce2 Mon Sep 17 00:00:00 2001
From: Daniel Jordan <daniel.jordan@caci.com>
Date: Thu, 6 Feb 2025 17:24:31 +0000
Subject: [PATCH 2/7] initial commit, leggo

---
 .../PrimeUI/MoveTaskOrder/MoveDetails.jsx     |  9 ++++++++
 .../MoveTaskOrder/MoveDetails.test.jsx        | 21 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.jsx b/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.jsx
index 45881d58602..d07ddc4c34c 100644
--- a/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.jsx
+++ b/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.jsx
@@ -24,6 +24,7 @@ import scrollToTop from 'shared/scrollToTop';
 import { SERVICE_ITEMS_ALLOWED_UPDATE } from 'constants/serviceItems';
 import { MoveOrderDocumentType } from 'shared/constants';
 import { CHECK_SPECIAL_ORDERS_TYPES, SPECIAL_ORDERS_TYPES } from 'constants/orders';
+import { formatWeight } from 'utils/formatters';
 
 const MoveDetails = ({ setFlashMessage }) => {
   const { moveCodeOrID } = useParams();
@@ -207,6 +208,14 @@ const MoveDetails = ({ setFlashMessage }) => {
                     <dt>Gun Safe:</dt>
                     <dd>{moveTaskOrder.order.entitlement.gunSafe ? 'yes' : 'no'}</dd>
                   </div>
+                  <div className={descriptionListStyles.row}>
+                    <dt>Admin Restricted Weight:</dt>
+                    <dd>
+                      {moveTaskOrder.order.entitlement.weightRestriction > 0
+                        ? formatWeight(moveTaskOrder.order.entitlement.weightRestriction)
+                        : 'no'}
+                    </dd>
+                  </div>
                   <div className={descriptionListStyles.row}>
                     <Button onClick={handleDownloadOrders}>Download Move Orders</Button>
                     <select
diff --git a/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.test.jsx b/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.test.jsx
index a65e16d981d..3a9e0e5885e 100644
--- a/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.test.jsx
+++ b/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.test.jsx
@@ -8,6 +8,7 @@ import { usePrimeSimulatorGetMove } from 'hooks/queries';
 import { MockProviders } from 'testUtils';
 import { completeCounseling, deleteShipment, downloadMoveOrder } from 'services/primeApi';
 import { primeSimulatorRoutes } from 'constants/routes';
+import { formatWeight } from 'utils/formatters';
 
 const mockRequestedMoveCode = 'LN4T89';
 
@@ -194,6 +195,7 @@ const moveTaskOrder = {
   order: {
     entitlement: {
       gunSafe: true,
+      weightRestriction: 500,
     },
   },
 };
@@ -224,6 +226,25 @@ const renderWithProviders = (component) => {
 };
 describe('PrimeUI MoveDetails page', () => {
   describe('check move details page load', () => {
+    it('renders move and entitlement detais on load', async () => {
+      usePrimeSimulatorGetMove.mockReturnValue(moveReturnValue);
+
+      renderWithProviders(<MoveDetails />);
+
+      await waitFor(() => {
+        expect(screen.getByText(/Move Code/)).toBeInTheDocument();
+        expect(screen.getByText(/Move Id/)).toBeInTheDocument();
+        const gunSafe = screen.getByText('Gun Safe:');
+        expect(gunSafe).toBeInTheDocument();
+        expect(gunSafe.nextElementSibling.textContent).toBe('yes');
+        const adminRestrictedWeight = screen.getByText('Admin Restricted Weight:');
+        expect(adminRestrictedWeight).toBeInTheDocument();
+        expect(adminRestrictedWeight.nextElementSibling.textContent).toBe(
+          formatWeight(moveTaskOrder.order.entitlement.weightRestriction),
+        );
+      });
+    });
+
     it('displays payment requests information', async () => {
       usePrimeSimulatorGetMove.mockReturnValue(moveReturnValue);
       renderWithProviders(<MoveDetails />);

From 9eaee4a2ac6140f84281d4fd97d99a87fd904542 Mon Sep 17 00:00:00 2001
From: josiahzimmerman-caci <josiah.zimmerman@caci.com>
Date: Thu, 13 Feb 2025 20:54:53 +0000
Subject: [PATCH 3/7] add a 15 second loop for creating the db and waiting
 before doing a final check

---
 scripts/rds-snapshot-app-db | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/scripts/rds-snapshot-app-db b/scripts/rds-snapshot-app-db
index 580c30776c1..26fe6f8ce69 100755
--- a/scripts/rds-snapshot-app-db
+++ b/scripts/rds-snapshot-app-db
@@ -19,17 +19,35 @@ db_snapshot_identifier=$db_instance_identifier-$(date +%s)
 readonly db_snapshot_identifier
 readonly tags=("Key=Environment,Value=$environment" "Key=Tool,Value=$(basename "$0")")
 
+
 echo
 echo "Wait for concurrent database snapshots for ${db_instance_identifier} to complete before continuing ..."
-time aws rds wait db-snapshot-completed --cli-read-timeout 2100 --cli-connect-timeout 2100  --db-instance-identifier "$db_instance_identifier"
+time aws rds wait db-snapshot-completed  --db-instance-identifier "$db_instance_identifier"
+
 
 echo
 echo "Create database snapshot for ${db_instance_identifier} with identifier ${db_snapshot_identifier}"
-aws rds create-db-snapshot --cli-read-timeout 2100 --cli-connect-timeout 2100 --db-instance-identifier "$db_instance_identifier" --db-snapshot-identifier "$db_snapshot_identifier" --tags "${tags[@]}"
+
+
+aws rds create-db-snapshot --db-instance-identifier "$db_instance_identifier" --db-snapshot-identifier "$db_snapshot_identifier" --tags "${tags[@]}"
+
+#we want to loop whild status is not available and check after initiating the create
+while true; do
+  db_description=$(aws rds describe-db-snapshots --db-snapshot-identifier "$db_snapshot_identifier")
+  db_status=$(echo "${db_description}" | jq -r ".DBSnapshots[].Status")
+  echo "${db_snapshot_identifier} -- ${db_status}"
+  if [[ "${db_status}" == "available" ]]; then
+    break
+  fi
+  sleep 15
+done
+
+
+#unnecessary confirm but will leave in
 
 echo
 echo "Wait for current database snapshot ${db_snapshot_identifier} to complete before continuing ..."
-time aws rds wait db-snapshot-completed --cli-read-timeout 2100 --cli-connect-timeout 2100  --db-snapshot-identifier "$db_snapshot_identifier"
+time aws rds wait db-snapshot-completed  --db-snapshot-identifier "$db_snapshot_identifier"
 
 echo
 echo "Describe the database snapshot ${db_snapshot_identifier}"

From b69552413a3d13c52d4792f55e9443148541dab6 Mon Sep 17 00:00:00 2001
From: josiahzimmerman-caci <josiah.zimmerman@caci.com>
Date: Thu, 13 Feb 2025 15:17:27 -0600
Subject: [PATCH 4/7] Tasks for prod was using wrong image

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b5f47ad9f7..f83d084326b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -152,7 +152,7 @@ stages:
   #build off prd variables
   - export ECR_REPOSITORY_URI=${PRD_ACCOUNT_ID}.dkr.ecr.${PRD_REGION}.amazonaws.com
   - export APP_DOCKER_FILE=Dockerfile
-  - export TASK_DOCKER_FILE=Dockerfile
+  - export TASK_DOCKER_FILE=Dockerfile.tasks
   #TODO: update exp to prod
   - export APP_ENVIRONMENT=prd
 

From fe2b18471e3d41b09bac6186e2f6cefc43b8e4ca Mon Sep 17 00:00:00 2001
From: josiahzimmerman-caci <josiah.zimmerman@caci.com>
Date: Thu, 13 Feb 2025 21:58:56 +0000
Subject: [PATCH 5/7] add a 15 second loop for creating the db and waiting
 before doing a final check

---
 scripts/rds-snapshot-app-db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/rds-snapshot-app-db b/scripts/rds-snapshot-app-db
index 26fe6f8ce69..ea2f0afd5c0 100755
--- a/scripts/rds-snapshot-app-db
+++ b/scripts/rds-snapshot-app-db
@@ -31,7 +31,7 @@ echo "Create database snapshot for ${db_instance_identifier} with identifier ${d
 
 aws rds create-db-snapshot --db-instance-identifier "$db_instance_identifier" --db-snapshot-identifier "$db_snapshot_identifier" --tags "${tags[@]}"
 
-#we want to loop whild status is not available and check after initiating the create
+#we want to loop while status is not available; check after initiating the create
 while true; do
   db_description=$(aws rds describe-db-snapshots --db-snapshot-identifier "$db_snapshot_identifier")
   db_status=$(echo "${db_description}" | jq -r ".DBSnapshots[].Status")

From 2f444fb587e76108459001d6ee75f4711ca65b76 Mon Sep 17 00:00:00 2001
From: Jon Spight <Jonathan.Spight@caci.com>
Date: Sat, 15 Feb 2025 01:17:08 +0000
Subject: [PATCH 6/7] updated test cases

---
 .../MtoShipmentForm/MtoShipmentForm.test.jsx  | 48 ++++++++++++++-----
 .../DateAndLocationForm.test.jsx              | 32 +++++++++----
 2 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/src/components/Customer/MtoShipmentForm/MtoShipmentForm.test.jsx b/src/components/Customer/MtoShipmentForm/MtoShipmentForm.test.jsx
index 4205d3e9155..3c9d42111e3 100644
--- a/src/components/Customer/MtoShipmentForm/MtoShipmentForm.test.jsx
+++ b/src/components/Customer/MtoShipmentForm/MtoShipmentForm.test.jsx
@@ -326,19 +326,45 @@ describe('MtoShipmentForm component', () => {
       await userEvent.click(screen.getByTitle('Yes, I have a second pickup address'));
 
       const streetAddress1 = await screen.findAllByLabelText(/Address 1/);
-      expect(streetAddress1[1]).toHaveAttribute('name', 'secondaryPickup.address.streetAddress1');
+      expect(streetAddress1[0]).toHaveAttribute('name', 'pickup.address.streetAddress1');
 
       const streetAddress2 = await screen.findAllByLabelText(/Address 2/);
-      expect(streetAddress2[1]).toHaveAttribute('name', 'secondaryPickup.address.streetAddress2');
+      expect(streetAddress2[0]).toHaveAttribute('name', 'pickup.address.streetAddress2');
 
       const city = screen.getAllByTestId('City');
-      expect(city[1]).toHaveAttribute('aria-label', 'secondaryPickup.address.city');
+      expect(city[0]).toHaveAttribute('aria-label', 'pickup.address.city');
 
       const state = screen.getAllByTestId(/State/);
-      expect(state[1]).toHaveAttribute('aria-label', 'secondaryPickup.address.state');
+      expect(state[0]).toHaveAttribute('aria-label', 'pickup.address.state');
 
       const zip = screen.getAllByTestId(/ZIP/);
-      expect(zip[1]).toHaveAttribute('aria-label', 'secondaryPickup.address.postalCode');
+      expect(zip[0]).toHaveAttribute('aria-label', 'pickup.address.postalCode');
+    });
+
+    it('renders a second address fieldset when the user has a pickup address', async () => {
+      renderMtoShipmentForm();
+
+      await userEvent.click(screen.getByTitle('Yes, I know my delivery address'));
+
+      const streetAddress1 = await screen.findAllByLabelText(/Address 1/);
+      expect(streetAddress1[0]).toHaveAttribute('name', 'pickup.address.streetAddress1');
+      expect(streetAddress1[1]).toHaveAttribute('name', 'delivery.address.streetAddress1');
+
+      const streetAddress2 = await screen.findAllByLabelText(/Address 2/);
+      expect(streetAddress2[0]).toHaveAttribute('name', 'pickup.address.streetAddress2');
+      expect(streetAddress2[1]).toHaveAttribute('name', 'delivery.address.streetAddress2');
+
+      const city = screen.getAllByTestId('City');
+      expect(city[0]).toHaveAttribute('aria-label', 'pickup.address.city');
+      expect(city[1]).toHaveAttribute('aria-label', 'delivery.address.city');
+
+      const state = screen.getAllByTestId('State');
+      expect(state[0]).toHaveAttribute('aria-label', 'pickup.address.state');
+      expect(state[1]).toHaveAttribute('aria-label', 'delivery.address.state');
+
+      const zip = screen.getAllByTestId('ZIP');
+      expect(zip[0]).toHaveAttribute('aria-label', 'pickup.address.postalCode');
+      expect(zip[1]).toHaveAttribute('aria-label', 'delivery.address.postalCode');
     });
 
     it('renders a second address fieldset when the user has a delivery address', async () => {
@@ -1134,25 +1160,25 @@ describe('MtoShipmentForm component', () => {
       });
     });
 
-    it('renders a second address fieldset when the user has a second pickup address', async () => {
+    it('renders a second address fieldset when the user has a pickup address', async () => {
       renderUBShipmentForm();
 
       await userEvent.click(screen.getByTitle('Yes, I have a second pickup address'));
 
       const streetAddress1 = await screen.findAllByLabelText(/Address 1/);
-      expect(streetAddress1[1]).toHaveAttribute('name', 'secondaryPickup.address.streetAddress1');
+      expect(streetAddress1[0]).toHaveAttribute('name', 'pickup.address.streetAddress1');
 
       const streetAddress2 = await screen.findAllByLabelText(/Address 2/);
-      expect(streetAddress2[1]).toHaveAttribute('name', 'secondaryPickup.address.streetAddress2');
+      expect(streetAddress2[0]).toHaveAttribute('name', 'pickup.address.streetAddress2');
 
       const city = screen.getAllByTestId('City');
-      expect(city[1]).toHaveAttribute('aria-label', 'secondaryPickup.address.city');
+      expect(city[0]).toHaveAttribute('aria-label', 'pickup.address.city');
 
       const state = screen.getAllByTestId('State');
-      expect(state[1]).toHaveAttribute('aria-label', 'secondaryPickup.address.state');
+      expect(state[0]).toHaveAttribute('aria-label', 'pickup.address.state');
 
       const zip = screen.getAllByTestId('ZIP');
-      expect(zip[1]).toHaveAttribute('aria-label', 'secondaryPickup.address.postalCode');
+      expect(zip[0]).toHaveAttribute('aria-label', 'pickup.address.postalCode');
     });
 
     it('renders a second address fieldset when the user has a delivery address', async () => {
diff --git a/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.test.jsx b/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.test.jsx
index fa35741a231..5f7fd941cbf 100644
--- a/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.test.jsx
+++ b/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.test.jsx
@@ -184,23 +184,37 @@ describe('DateAndLocationForm component', () => {
           <DateAndLocationForm {...defaultProps} />
         </Provider>,
       );
-      const hasSecondaryDestinationAddress = await screen.getAllByLabelText('Yes')[1];
 
-      await userEvent.click(hasSecondaryDestinationAddress);
+      await userEvent.click(screen.getByLabelText('Use my current delivery address'));
+
       const postalCodes = screen.getAllByTestId(/ZIP/);
       const address1 = screen.getAllByLabelText(/Address 1/, { exact: false });
       const address2 = screen.getAllByLabelText('Address 2', { exact: false });
-      const address3 = screen.getAllByLabelText('Address 3', { exact: false });
       const state = screen.getAllByTestId(/State/);
       const city = screen.getAllByTestId(/City/);
+      expect(address1[1]).toHaveValue(defaultProps.destinationDutyLocation.address.streetAddress1);
+      expect(address2[1]).toHaveValue('');
+      expect(city[1]).toHaveTextContent(defaultProps.destinationDutyLocation.address.city);
+      expect(state[1]).toHaveTextContent(defaultProps.destinationDutyLocation.address.state);
+      expect(postalCodes[1]).toHaveTextContent(defaultProps.destinationDutyLocation.address.postalCode);
+
+      const hasSecondaryDestinationAddress = await screen.getAllByLabelText('Yes')[1];
+
+      await userEvent.click(hasSecondaryDestinationAddress);
+      const secondaryPostalCodes = screen.getAllByTestId(/ZIP/);
+      const secondaryAddress1 = screen.getAllByLabelText(/Address 1/, { exact: false });
+      const secondaryAddress2 = screen.getAllByLabelText('Address 2', { exact: false });
+      const secondaryAddress3 = screen.getAllByLabelText('Address 3', { exact: false });
+      const secondaryState = screen.getAllByTestId(/State/);
+      const secondaryCity = screen.getAllByTestId(/City/);
 
       await waitFor(() => {
-        expect(address1[2]).toBeInstanceOf(HTMLInputElement);
-        expect(address2[2]).toBeInstanceOf(HTMLInputElement);
-        expect(address3[2]).toBeInstanceOf(HTMLInputElement);
-        expect(state[2]).toBeInstanceOf(HTMLLabelElement);
-        expect(city[2]).toBeInstanceOf(HTMLLabelElement);
-        expect(postalCodes[2]).toBeInstanceOf(HTMLLabelElement);
+        expect(secondaryAddress1[2]).toBeInstanceOf(HTMLInputElement);
+        expect(secondaryAddress2[2]).toBeInstanceOf(HTMLInputElement);
+        expect(secondaryAddress3[2]).toBeInstanceOf(HTMLInputElement);
+        expect(secondaryState[2]).toBeInstanceOf(HTMLLabelElement);
+        expect(secondaryCity[2]).toBeInstanceOf(HTMLLabelElement);
+        expect(secondaryPostalCodes[2]).toBeInstanceOf(HTMLLabelElement);
       });
     });
   });

From a035e2e116737b9e285ec07f950eaeca0e19bdfb Mon Sep 17 00:00:00 2001
From: Jon Spight <Jonathan.Spight@caci.com>
Date: Mon, 17 Feb 2025 22:29:18 +0000
Subject: [PATCH 7/7] Updated third address validation on PPM shipments

---
 .../Booking/DateAndLocationForm/DateAndLocationForm.jsx   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.jsx b/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.jsx
index fe36c389eb7..4d23d8286d0 100644
--- a/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.jsx
+++ b/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.jsx
@@ -46,6 +46,12 @@ let validationShape = {
   secondaryDestinationAddress: Yup.object().shape({
     address: OptionalAddressSchema,
   }),
+  tertiaryPickupAddress: Yup.object().shape({
+    address: OptionalAddressSchema,
+  }),
+  tertiaryDestinationAddress: Yup.object().shape({
+    address: OptionalAddressSchema,
+  }),
 };
 
 const DateAndLocationForm = ({ mtoShipment, destinationDutyLocation, serviceMember, move, onBack, onSubmit }) => {
@@ -53,6 +59,7 @@ const DateAndLocationForm = ({ mtoShipment, destinationDutyLocation, serviceMemb
     useCurrentResidence: false,
     pickupAddress: {},
     secondaryPickupAddress: {},
+    tertiaryPickupAddress: {},
     hasSecondaryPickupAddress: mtoShipment?.ppmShipment?.secondaryPickupAddress ? 'true' : 'false',
     hasTertiaryPickupAddress: mtoShipment?.ppmShipment?.tertiaryPickupAddress ? 'true' : 'false',
     useCurrentDestinationAddress: false,
@@ -63,7 +70,6 @@ const DateAndLocationForm = ({ mtoShipment, destinationDutyLocation, serviceMemb
     sitExpected: mtoShipment?.ppmShipment?.sitExpected ? 'true' : 'false',
     expectedDepartureDate: mtoShipment?.ppmShipment?.expectedDepartureDate || '',
     closeoutOffice: move?.closeoutOffice || {},
-    tertiaryPickupAddress: {},
     tertiaryDestinationAddress: {},
   };