Merge branch 'main' into B-18184-Remove-PersonallyProcuredMoves-Incen…

…tive-endpoint
transcom · Feb 7, 2024 · a23acc0 · a23acc0
2 parents 5d16687 + 56ac313
commit a23acc0
Show file tree

Hide file tree

Showing 28 changed files with 91 additions and 3,068 deletions.
diff --git a/.github/CODEOWNERS b/.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
diff --git a/pkg/assets/notifications/templates/move_issued_to_prime_template.html b/pkg/assets/notifications/templates/move_issued_to_prime_template.html
@@ -8,18 +8,17 @@
 <p>
   What this means to you:
 </p>
-
+{{ if .ProvidesGovernmentCounseling }}
 <p>
-  Your government-arranged shipment(s) will be managed by HomeSafe Alliance, the DoD contractor under the
-  Global Household Goods Contract (GHC).
+  Your government-arranged shipment(s) will be managed by HomeSafe Alliance, the DoD contractor under the Global Household Goods Contract (GHC).
 </p>
 
 <h4>Next steps for your government-arranged shipment(s): </h4>
 
 <p>
   HomeSafe will send you an e-mail invitation (check your spam or junk folder) to log in to their system, HomeSafe Connect.
 </p>
-{{ if .ProvidesGovernmentCounseling }}
+
 <ul>
   <li>
     Log in to HomeSafe Connect as soon as possible to schedule your pre-move survey.
@@ -35,17 +34,27 @@ <h4>Next steps for your government-arranged shipment(s): </h4>
   </li>
   <li>
     Within 3-7 days of your receipt of this e-mail, contact you to provide a 7-day pickup date spread window.
-    This spread window must contain your requested pickup date. (What this means: your requested pickup date may
-    fall on the spread start date, the spread end date, or anywhere in between.)
+    This spread window must contain your requested pickup date.
+    (What this means: your requested pickup date may fall on the spread start date, the spread end date, or anywhere in between.)
   </li>
 </ul>
+{{- end }}
+{{- if not .ProvidesGovernmentCounseling }}
+<p>
+  If you have requested a Personally Procured Move (PPM), <strong>DO NOT</strong> start your PPM until it has been approved by your counselor.
+  You will receive an email when that is complete.
+</p>
 
 <p>
-  If you are requesting to move in 5 days or less, HomeSafe should assist you with scheduling within one day of your
-  receipt of this email.
+  Your government-arranged shipment(s) will be managed by HomeSafe Alliance, the DoD contractor under the Global Household Goods Contract (GHC).
 </p>
-{{- end }}
-{{- if not .ProvidesGovernmentCounseling }}
+
+<h4>Next steps for your government-arranged shipment(s): </h4>
+
+<p>
+  HomeSafe will send you an e-mail invitation (check your spam or junk folder) to log in to their system, HomeSafe Connect.
+</p>
+
 <ul>
   <li>
     Log in to HomeSafe Connect as soon as possible to complete counseling and schedule your pre-move survey.
@@ -60,18 +69,17 @@ <h4>Next steps for your government-arranged shipment(s): </h4>
     Reach out to you within one Government Business Day.
   </li>
   <li>
-    Within 3-7 days of your receipt of this e-mail, contact you to assist in completion of counseling and
-    provide a 7-day pickup date spread window. This spread window must contain your requested pickup date. (What this means:
-    your requested pickup date may fall on the spread start date, the spread end date, or anywhere in between.)
+    Within 3-7 days of your receipt of this e-mail, contact you to assist in completion of counseling
+    and provide a 7-day pickup date spread window. This spread window must contain your requested pickup date.
+    (What this means: your requested pickup date may fall on the spread start date, the spread end date, or anywhere in between.)
   </li>
 </ul>
+{{- end }}
 
 <p>
   If you are requesting to move in 5 days or less, HomeSafe should assist you with scheduling within one day of your
   receipt of this email.
 </p>
-{{- /* There is reference to PPM specific instructions in the example that I believe gets omitted for now. */ -}}
-{{- end }}
 
 <p>Utilize your HomeSafe Customer Care Representative:</p>
 <ul>
@@ -87,7 +95,7 @@ <h4>Next steps for your government-arranged shipment(s): </h4>
 
 <p>Thank you,</p>
 
-<p>Defense Personal Property Program’s MilMove Team</p>
+<p>USTRANSCOM MilMove Team</p>
 
 <p>
   The information contained in this email may contain Privacy Act information and is therefore protected under the

diff --git a/pkg/assets/notifications/templates/move_issued_to_prime_template.txt b/pkg/assets/notifications/templates/move_issued_to_prime_template.txt
@@ -4,39 +4,45 @@ This is a confirmation that a move task order has been placed for your move (Mov
 {{if .OriginDutyLocation}}from {{.OriginDutyLocation}} {{ end }}to {{.DestinationDutyLocation}}.
 
 What this means to you:
-
+{{ if .ProvidesGovernmentCounseling }}
 Your government-arranged shipment(s) will be managed by HomeSafe Alliance,
 the DoD contractor under the Global Household Goods Contract (GHC).
 
-** Next steps for your government-arranged shipment(s):
-------------------------------------------------------------
+*** Next steps for your government-arranged shipment(s): ***
 
 HomeSafe will send you an e-mail invitation (check your spam or junk folder) to log in to their system, HomeSafe Connect.
-{{ if .ProvidesGovernmentCounseling }}
+
 * Log in to HomeSafe Connect as soon as possible to schedule your pre-move survey. You can request either a virtual,
 or in-person pre-move survey.
 
 HomeSafe Customer Care is Required to:
 * Reach out to you within one Government Business Day.
 * Within 3-7 days of your receipt of this e-mail, contact you to provide a 7-day pickup date spread window.
-This spread window must contain your requested pickup date. (What this means:
-your requested pickup date may fall on the spread start date, the spread end date, or anywhere in between.)
-
-If you are requesting to move in 5 days or less, HomeSafe should assist you with scheduling within one day of your receipt of this email.
+This spread window must contain your requested pickup date.
+(What this means: your requested pickup date may fall on the spread start date, the spread end date, or anywhere in between.)
 {{- end -}}
 {{ if not .ProvidesGovernmentCounseling }}
+If you have requested a Personally Procured Move (PPM), DO NOT start your PPM until it has been approved by your counselor.
+You will receive an email when that is complete.
+
+Your government-arranged shipment(s) will be managed by HomeSafe Alliance,
+the DoD contractor under the Global Household Goods Contract (GHC).
+
+*** Next steps for your government-arranged shipment(s): ***
+
+HomeSafe will send you an e-mail invitation (check your spam or junk folder) to log in to their system, HomeSafe Connect.
+
 * Log in to HomeSafe Connect as soon as possible to complete counseling and schedule your pre-move survey.
 You can request either a virtual, or in-person pre-move survey.
 
 HomeSafe Customer Care is Required to:
 * Reach out to you within one Government Business Day.
-* Within 3-7 days of your receipt of this e-mail, contact you to assist in completion of counseling and provide a 7-day pickup date spread window.
-This spread window must contain your requested pickup date. (What this means:
-your requested pickup date may fall on the spread start date, the spread end date, or anywhere in between.)
+* Within 3-7 days of your receipt of this e-mail, contact you to assist in completion of counseling
+and provide a 7-day pickup date spread window. This spread window must contain your requested pickup date.
+(What this means: your requested pickup date may fall on the spread start date, the spread end date, or anywhere in between.)
+{{- end }}
 
 If you are requesting to move in 5 days or less, HomeSafe should assist you with scheduling within one day of your receipt of this email.
-{{- /* There is reference to PPM specific instructions in the example that I believe gets omitted for now. */ -}}
-{{- end }}
 
 Utilize your HomeSafe Customer Care Representative:
 * As your first contact if you have any questions during your move.
@@ -48,7 +54,7 @@ You can see a listing of transportation offices on Military One Source here:
 
 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.
diff --git a/pkg/gen/primeapi/configure_mymove.go b/pkg/gen/primeapi/configure_mymove.go
@@ -151,11 +151,6 @@ func configureAPI(api *primeoperations.MymoveAPI) http.Handler {
 			return middleware.NotImplemented("operation mto_shipment.UpdateReweigh has not yet been implemented")
 		})
 	}
-	if api.MtoShipmentUpdateSITDeliveryRequestHandler == nil {
-		api.MtoShipmentUpdateSITDeliveryRequestHandler = mto_shipment.UpdateSITDeliveryRequestHandlerFunc(func(params mto_shipment.UpdateSITDeliveryRequestParams) middleware.Responder {
-			return middleware.NotImplemented("operation mto_shipment.UpdateSITDeliveryRequest has not yet been implemented")
-		})
-	}
 	if api.MtoShipmentUpdateShipmentDestinationAddressHandler == nil {
 		api.MtoShipmentUpdateShipmentDestinationAddressHandler = mto_shipment.UpdateShipmentDestinationAddressHandlerFunc(func(params mto_shipment.UpdateShipmentDestinationAddressParams) middleware.Responder {
 			return middleware.NotImplemented("operation mto_shipment.UpdateShipmentDestinationAddress has not yet been implemented")