Merge branch 'main' into B-18191-Moved-Progear-Ticket-Query

.github/CODEOWNERS

@@ -6,4 +6,4 @@
 # owners will be requested for a review.
 # Add language specific code owners if it becomes relevant
 
-* @deandreJones @cameroncaci @josiahzimmerman-caci
+* @transcom/codeowners

migrations/app/migrations_manifest.txt

@@ -892,3 +892,4 @@
 20240124155759_20240124-homesafeconnect-cert.up.sql
 20240129153006_20240129-homesafeconnect-cert.up.sql
 20240201174442_20240201_homesafe_prd_cert.up.sql
+20240206173201_update_shipment_address_update_table_sit_and_distance_columns.up.sql

migrations/app/schema/20240206173201_update_shipment_address_update_table_sit_and_distance_columns.up.sql

@@ -0,0 +1,15 @@
+-- Adds new columns to shipment address update table
+ALTER TABLE shipment_address_updates
+ADD COLUMN sit_original_address_id uuid DEFAULT NULL,
+ADD COLUMN old_sit_distance_between INTEGER DEFAULT NULL,
+ADD COLUMN new_sit_distance_between INTEGER DEFAULT NULL;
+
+-- Add foreign key constraint
+ALTER TABLE shipment_address_updates
+ADD CONSTRAINT fk_sit_original_address
+FOREIGN KEY (sit_original_address_id) REFERENCES addresses(id);
+
+-- Comments on new columns
+COMMENT on COLUMN shipment_address_updates.sit_original_address_id IS 'SIT address at the original time of SIT approval';
+COMMENT on COLUMN shipment_address_updates.old_sit_distance_between IS 'Distance between original SIT address and previous shipment destination address';
+COMMENT on COLUMN shipment_address_updates.new_sit_distance_between IS 'Distance between original SIT address and new shipment destination address';

pkg/assets/notifications/templates/move_submitted_template.html

@@ -12,10 +12,10 @@
 
 <p>
   {{- if .OriginDutyLocationPhoneLine }}
-  To change any information about your move, or to add or cancel shipments, you should contact {{.OriginDutyLocationPhoneLine}} or visit your <a href="https://installations.militaryonesource.mil/search?program-service=2/view-by=ALL">local transportation office</a>.
+  To change any information about your move, or to add or cancel shipments, you should contact {{.OriginDutyLocationPhoneLine}} or visit your <a href="{{.MilitaryOneSourceLink}}">local transportation office</a>.
   {{- end }}
   {{- if not .OriginDutyLocationPhoneLine }}
-  To change any information about your move, or to add or cancel shipments, you should contact your nearest transportation office. You can find the contact information using the <a href="https://installations.militaryonesource.mil/search?program-service=2/view-by=ALL">directory of PCS-related contacts</a>.
+  To change any information about your move, or to add or cancel shipments, you should contact your nearest transportation office. You can find the contact information using the <a href="{{.MilitaryOneSourceLink}}">directory of PCS-related contacts</a>.
   {{- end }}
 </p>
 
@@ -55,7 +55,7 @@ <h4>
 
 {{- if not .ProvidesGovernmentCounseling }}
 <p>
-  Your move request will be reviewed by the responsible personal property shipping office and an move task order for services will be placed with HomeSafe Alliance.
+  Your move request will be reviewed by the responsible personal property shipping office and a move task order for services will be placed with HomeSafe Alliance.
 </p>
 <p>
   Once this order is placed, you will receive an invitation to create an account in HomeSafe Connect. This is the system you will use for your counseling session. You will also schedule your pre-move survey during this session.
@@ -66,6 +66,10 @@ <h4>
   HomeSafe is required to contact you within 24 hours of receiving your move task order. Once contact has been established, HomeSafe is your primary point of contact. If any information about your move changes at any point during the move, immediately notify your HomeSafe Customer Care Representative of the changes.
 </p>
 
+<p>
+  If you have requested a PPM, <strong>DO NOT</strong> start your PPM until your counselor has approved it in MilMove. You will receive an email when that is complete.
+</p>
+
 <h4>
   IMPORTANT: Take the Customer Satisfaction Survey
 </h4>
@@ -77,12 +81,8 @@ <h4>
   Taking the survey at each stage provides transparency and increases accountability of those assisting you with your relocation.
 </p>
 
+Thank you,<br>
+USTRANSCOM MilMove Team
 <p>
-  Thank you,
-</p>
-<p>
-  Defense Personal Property Program’s MilMove Team
-</p>
-<p>
-  The information contained in this email may contain Privacy Act information and is therefore protected under the Privacy Act of 1974.  Failure to protect Privacy Act information could result in a $5,000 fine.
+  The information contained in this email may contain Privacy Act information and is therefore protected under the Privacy Act of 1974. Failure to protect Privacy Act information could result in a $5,000 fine.
 </p>

pkg/assets/notifications/templates/move_submitted_template.txt

@@ -4,7 +4,7 @@ This is a confirmation that you have submitted the details for your move {{if .O
 
 We have assigned you a move code: {{.Locator}}. You can use this code when talking to any representative about your move.
 
-{{ if .OriginDutyLocationPhoneLine -}} To change any information about your move, or to add or cancel shipments, you should contact {{.OriginDutyLocationPhoneLine}} or visit your local transportation office (https://installations.militaryonesource.mil/search?program-service=2/view-by=ALL) . {{- end }} {{- if not .OriginDutyLocationPhoneLine }} To change any information about your move, or to add or cancel shipments, you should contact your nearest transportation office. You can find the contact information using the directory of PCS-related contacts (https://installations.militaryonesource.mil/search?program-service=2/view-by=ALL) . {{- end }}
+{{ if .OriginDutyLocationPhoneLine -}} To change any information about your move, or to add or cancel shipments, you should contact {{.OriginDutyLocationPhoneLine}} or visit your local transportation office ({{.MilitaryOneSourceLink}}) . {{- end }} {{- if not .OriginDutyLocationPhoneLine }} To change any information about your move, or to add or cancel shipments, you should contact your nearest transportation office. You can find the contact information using the directory of PCS-related contacts ({{.MilitaryOneSourceLink}}) . {{- end }}
 
 Your weight allowance: {{.WeightAllowance}} pounds. That is how much combined weight the government will pay for all movements between authorized locations under your orders.
 
@@ -27,13 +27,15 @@ Your move counselor will, among other things:
 Once your counseling is complete, your request will be reviewed by the responsible personal property shipping office, and a move task order will be placed with HomeSafe Alliance. Once this order is placed, you will receive an invitation to create an account in HomeSafe Connect. This is the system you will use to schedule your pre-move survey.
 {{- end }} {{- if not .ProvidesGovernmentCounseling }}
 
-Your move request will be reviewed by the responsible personal property shipping office and an move task order for services will be placed with HomeSafe Alliance.
+Your move request will be reviewed by the responsible personal property shipping office and a move task order for services will be placed with HomeSafe Alliance.
 
 Once this order is placed, you will receive an invitation to create an account in HomeSafe Connect. This is the system you will use for your counseling session. You will also schedule your pre-move survey during this session.
 {{- end }}
 
 HomeSafe is required to contact you within 24 hours of receiving your move task order. Once contact has been established, HomeSafe is your primary point of contact. If any information about your move changes at any point during the move, immediately notify your HomeSafe Customer Care Representative of the changes.
 
+If you have requested a PPM, DO NOT start your PPM until your counselor has approved it in MilMove. You will receive an email when that is complete.
+
 
 ** IMPORTANT: Take the Customer Satisfaction Survey
 ------------------------------------------------------------
@@ -43,7 +45,6 @@ You will receive an invitation to take a quick customer satisfaction survey (CSS
 Taking the survey at each stage provides transparency and increases accountability of those assisting you with your relocation.
 
 Thank you,
-
-Defense Personal Property Program’s MilMove Team
+USTRANSCOM MilMove Team
 
 The information contained in this email may contain Privacy Act information and is therefore protected under the Privacy Act of 1974. Failure to protect Privacy Act information could result in a $5,000 fine.

pkg/gen/internalapi/configure_mymove.go

@@ -307,11 +307,6 @@ func configureAPI(api *internaloperations.MymoveAPI) http.Handler {
 			return middleware.NotImplemented("operation ppm.ShowPPMEstimate has not yet been implemented")
 		})
 	}
-	if api.PpmShowPPMIncentiveHandler == nil {
-		api.PpmShowPPMIncentiveHandler = ppm.ShowPPMIncentiveHandlerFunc(func(params ppm.ShowPPMIncentiveParams) middleware.Responder {
-			return middleware.NotImplemented("operation ppm.ShowPPMIncentive has not yet been implemented")
-		})
-	}
 	if api.PpmShowPPMSitEstimateHandler == nil {
 		api.PpmShowPPMSitEstimateHandler = ppm.ShowPPMSitEstimateHandlerFunc(func(params ppm.ShowPPMSitEstimateParams) middleware.Responder {
 			return middleware.NotImplemented("operation ppm.ShowPPMSitEstimate has not yet been implemented")