Merge pull request #13579 from transcom/B-19191-Email-Template-not-lo…

…cating-all-duty-location-names

B-19191: Email Template not locating all duty location names

pkg/notifications/move_submitted.go

@@ -72,7 +72,8 @@ func (m MoveSubmitted) emails(appCtx appcontext.AppContext) ([]emailContent, err
 	if originDSTransportInfo != nil {
 		originDutyLocationName = &originDSTransportInfo.Name
 		originDutyLocationPhoneLine = &originDSTransportInfo.PhoneLine
-
+	} else if originDutyLocation != nil {
+		originDutyLocationName = &originDutyLocation.Name
 	}
 
 	totalEntitlement := models.GetWeightAllotment(*orders.Grade)

pkg/notifications/move_submitted_test.go

@@ -26,6 +26,30 @@ func (suite *NotificationSuite) TestMoveSubmitted() {
 	suite.NotEmpty(email.textBody)
 }
 
+func (suite *NotificationSuite) TestMoveSubmittedoriginDSTransportInfoIsNil() {
+	move := factory.BuildMove(suite.DB(), nil, nil)
+	notification := NewMoveSubmitted(move.ID)
+
+	move.Orders.OriginDutyLocationID = nil
+
+	emails, err := notification.emails(suite.AppContextWithSessionForTest(&auth.Session{
+		ServiceMemberID: move.Orders.ServiceMember.ID,
+		ApplicationName: auth.MilApp,
+	}))
+	subject := "Thank you for submitting your move details"
+
+	suite.NoError(err)
+	suite.Equal(len(emails), 1)
+
+	email := emails[0]
+	sm := move.Orders.ServiceMember
+	suite.Equal(email.recipientEmail, *sm.PersonalEmail)
+	suite.Equal(email.subject, subject)
+	suite.NotEmpty(email.htmlBody)
+	suite.NotEmpty(email.textBody)
+	suite.Contains(email.textBody, move.Orders.OriginDutyLocation.Name)
+}
+
 func (suite *NotificationSuite) TestMoveSubmittedHTMLTemplateRenderWithGovCounseling() {
 	approver := factory.BuildUser(nil, nil, nil)
 	move := factory.BuildMove(suite.DB(), nil, nil)