[EASI-2713] Email Notification on Model Plan Dates Changed - Updates to Include All Fields

pkg/email/model_plan_date_changed.go

@@ -10,6 +10,7 @@ type ModelPlanDateChangedSubjectContent struct {
 // DateChange defines the parameters necessary for parsing date changes, both singular and ranges
 // If the OldRange and NewRange are both nil, then the change is singular
 type DateChange struct {
+	IsChanged                                              bool
 	Field                                                  string
 	IsRange                                                bool
 	OldDate, NewDate                                       *time.Time

pkg/email/templates/model_plan_date_changed_body.html

@@ -85,39 +85,38 @@ <h2 style="padding-top: 14pt;">Dates updated for {{.ModelName}}</h2>
 <br/>
 <br/>
 <h3>Anticipated high level timeline</h3>
-<br />
-
-{{define "oldDate"}}
-    {{if .}}
-      {{.Format "01/02/2006"}}
-    {{else}}
-      no date entered
-    {{end}}
-{{end}}
+<br/>
 
-{{define "newDate"}}
+{{define "date"}}
     {{if .}}
         {{.Format "01/02/2006"}}
     {{else}}
-      no date entered
+      <i>no date entered</i>
     {{end}}
 {{end}}
 
 {{range .DateChanges}}
   <p>
     <b>{{.Field}}:</b>
-    <br />
+    <br/>
       {{if .IsRange}}
-        <span style="color: red; text-decoration: line-through;">
-          {{template "oldDate" .OldRangeStart}} - {{template "oldDate" .OldRangeEnd}}<br/>
-        </span>
-        {{template "newDate" .NewRangeStart}} - {{template "newDate" .NewRangeEnd}}
+          {{if .IsChanged}}
+            <span style="color: #D54309; text-decoration: line-through;">
+              {{template "date" .OldRangeStart}} - {{template "date" .OldRangeEnd}}<br/>
+            </span>
+            {{template "date" .NewRangeStart}} - {{template "date" .NewRangeEnd}}
+          {{else}}
+            {{template "date" .OldRangeStart}} - {{template "date" .OldRangeEnd}}
+          {{end}}
       {{else}}
-        <span style="color: red; text-decoration: line-through;">{{template "oldDate" .OldDate}}</span><br/>
-          {{template "newDate" .NewDate}}
+          {{if .IsChanged}}
+            <span style="color: #D54309; text-decoration: line-through;">{{template "date" .OldDate}}</span> - {{template "date" .NewDate}}
+          {{else}}
+            {{template "date" .OldDate}}
+          {{end}}
       {{end}}
-    <br />
-    <br />
+    <br/>
+    <br/>
   </p>
 {{end}}
 

pkg/graph/resolvers/plan_basics.go

@@ -2,6 +2,7 @@ package resolvers
 
 import (
 	"context"
+	"time"
 
 	"github.com/cmsgov/mint-app/pkg/email"
 	"github.com/cmsgov/mint-app/pkg/shared/oddmail"
@@ -118,6 +119,14 @@ func extractChangedDates(changes map[string]interface{}, existing *models.PlanBa
 	return dateChanges, nil
 }
 
+func sanitizeZeroDate(date *time.Time) *time.Time {
+	if date == nil || (date != nil && date.IsZero()) {
+		return nil
+	}
+
+	return date
+}
+
 func sendDateChangedEmails(
 	emailService oddmail.EmailService,
 	emailTemplateService email.TemplateService,
@@ -138,8 +147,20 @@ func sendDateChangedEmails(
 	}
 
 	dateChangeSlice := make([]email.DateChange, 0, len(dateChanges))
-	for _, v := range dateChanges {
-		dateChangeSlice = append(dateChangeSlice, v)
+
+	// Loop over the field data map to ensure order of the date changes in the email
+	orderedCommonKeys := getOrderedCommonKeys()
+	for _, commonKey := range orderedCommonKeys {
+		dateChange := dateChanges[commonKey]
+
+		dateChange.OldDate = sanitizeZeroDate(dateChange.OldDate)
+		dateChange.NewDate = sanitizeZeroDate(dateChange.NewDate)
+		dateChange.OldRangeStart = sanitizeZeroDate(dateChange.OldRangeStart)
+		dateChange.NewRangeStart = sanitizeZeroDate(dateChange.NewRangeStart)
+		dateChange.OldRangeEnd = sanitizeZeroDate(dateChange.OldRangeEnd)
+		dateChange.NewRangeEnd = sanitizeZeroDate(dateChange.NewRangeEnd)
+
+		dateChangeSlice = append(dateChangeSlice, dateChange)
 	}
 
 	emailBody, err := emailTemplate.GetExecutedBody(email.ModelPlanDateChangedBodyContent{

pkg/graph/resolvers/plan_basics_helper.go

@@ -65,7 +65,6 @@ func (dp *DateProcessor) ExtractChangedDates() (map[string]email.DateChange, err
 	dateChanges := make(map[string]email.DateChange)
 
 	for fieldKey, fieldData := range fieldDataMap {
-
 		isFieldChanged, oldValue, newValue := dp.checkDateFieldChanged(fieldKey)
 		if isFieldChanged {
 			if fieldData.IsRange { // check if the field is a range
@@ -74,8 +73,9 @@ func (dp *DateProcessor) ExtractChangedDates() (map[string]email.DateChange, err
 				}
 
 				dateChangeValue := &email.DateChange{
-					Field:   fieldData.HumanReadableName,
-					IsRange: true,
+					IsChanged: true,
+					Field:     fieldData.HumanReadableName,
+					IsRange:   true,
 				}
 
 				// Determine the values for the other end of the range
@@ -126,12 +126,54 @@ func (dp *DateProcessor) ExtractChangedDates() (map[string]email.DateChange, err
 				dateChanges[fieldData.CommonKey] = *dateChangeValue
 			} else {
 				dateChanges[fieldKey] = email.DateChange{
-					Field:   fieldData.HumanReadableName,
-					IsRange: false,
-					OldDate: copyTime(oldValue),
-					NewDate: copyTime(newValue),
+					IsChanged: true,
+					Field:     fieldData.HumanReadableName,
+					IsRange:   false,
+					OldDate:   copyTime(oldValue),
+					NewDate:   copyTime(newValue),
+				}
+			}
+		}
+	}
+
+	if len(dateChanges) == 0 {
+		return dateChanges, nil
+	}
+
+	for fieldKey, fieldData := range fieldDataMap {
+		if _, isChanged := dateChanges[fieldData.CommonKey]; !isChanged {
+			// Only handle start of range in range dates to simplify logic
+			if fieldData.IsRange && !fieldData.IsRangeStart {
+				continue
+			}
+
+			dateChange := email.DateChange{
+				IsChanged: false,
+				Field:     fieldData.HumanReadableName,
+				IsRange:   fieldData.IsRange,
+			}
+
+			if fieldData.IsRange {
+				if dp.existing[fieldKey] != nil {
+					dateChange.OldRangeStart = copyTime(dp.existing[fieldKey].(*time.Time))
+				} else {
+					dateChange.OldRangeStart = nil
+				}
+
+				if dp.existing[fieldKey] != nil {
+					dateChange.OldRangeEnd = copyTime(dp.existing[fieldData.OtherRangeKey].(*time.Time))
+				} else {
+					dateChange.OldRangeEnd = nil
+				}
+			} else {
+				if dp.existing[fieldKey] != nil {
+					dateChange.OldDate = copyTime(dp.existing[fieldKey].(*time.Time))
+				} else {
+					dateChange.OldDate = nil
 				}
 			}
+
+			dateChanges[fieldData.CommonKey] = dateChange
 		}
 	}
 
@@ -203,6 +245,7 @@ func getFieldDataMap() map[string]dateFieldData {
 		"completeICIP": {
 			HumanReadableName: "Complete ICIP",
 			IsRange:           false,
+			CommonKey:         "completeICIP",
 		},
 		"clearanceStarts": {
 			HumanReadableName: "Clearance",
@@ -221,6 +264,7 @@ func getFieldDataMap() map[string]dateFieldData {
 		"announced": {
 			HumanReadableName: "Announce model",
 			IsRange:           false,
+			CommonKey:         "announced",
 		},
 		"applicationsStart": {
 			HumanReadableName: "Application period",
@@ -253,7 +297,19 @@ func getFieldDataMap() map[string]dateFieldData {
 		"wrapUpEnds": {
 			HumanReadableName: "Model wrap-up end date",
 			IsRange:           false,
+			CommonKey:         "wrapUpEnds",
 		},
 	}
 	return fieldData
 }
+
+func getOrderedCommonKeys() []string {
+	return []string{
+		"completeICIP",
+		"clearance",
+		"announced",
+		"applications",
+		"performancePeriod",
+		"wrapUpEnds",
+	}
+}