[MINT-2550] Data Exchange Approach Marked Complete Notification

cmd/dbseed/main.go

@@ -441,7 +441,7 @@ func (s *Seeder) SeedData() {
 			"cmmiGroups":      []string{"PATIENT_CARE_MODELS_GROUP", "SEAMLESS_CARE_MODELS_GROUP"},
 			"completeICIP":    "2020-05-13T20:47:50.12Z",
 			"phasedIn":        true,
-			"clearanceStarts": time.Now().AddDate(0, 3, 0),
+			"clearanceStarts": now.AddDate(0, 3, 0),
 			"highLevelNote":   "Some high level note",
 		},
 	)
@@ -461,7 +461,7 @@ func (s *Seeder) SeedData() {
 	// Use a test user to mark the data exchange approach as complete
 	testUser := s.getTestPrincipalByUsername("BTAL")
 
-	err = resolvers.SendDataExchangeApproachCompletedNotification(
+	err = resolvers.SendDataExchangeApproachMarkedCompleteNotification(
 		s.Config.Context,
 		s.Config.EmailService,
 		s.Config.EmailTemplateService,

cmd/test_email/main.go

@@ -34,7 +34,7 @@ func main() {
 	sendModelPlanShareTest(emailService, templateService, addressBook)
 	sendDateChangedEmailsTest(emailService, templateService, addressBook)
 	sendCollaboratorAddedEmailTest(emailService, templateService, addressBook)
-	sendDataExchangeApproachCompletedEmailNotificationTest(emailService, templateService, addressBook)
+	sendDataExchangeApproachMarkedCompleteEmailNotificationTest(emailService, templateService, addressBook)
 	sendFeedbackEmail(emailService, templateService, addressBook)
 	reportAProblemEmail(emailService, templateService, addressBook)
 
@@ -397,7 +397,7 @@ func sendCollaboratorAddedEmailTest(
 	noErr(err)
 }
 
-func sendDataExchangeApproachCompletedEmailNotificationTest(
+func sendDataExchangeApproachMarkedCompleteEmailNotificationTest(
 	emailService oddmail.EmailService,
 	templateService email.TemplateService,
 	addressBook email.AddressBook,
@@ -408,7 +408,7 @@ func sendDataExchangeApproachCompletedEmailNotificationTest(
 		"Retcon Plan",
 	)
 
-	err := resolvers.SendDataExchangeApproachCompletedEmailNotification(
+	err := resolvers.SendDataExchangeApproachMarkedCompleteEmailNotification(
 		emailService,
 		templateService,
 		addressBook,

migrations/V177__Add_Data_Exchange_Approach_Marked_Complete_Notification.sql

@@ -0,0 +1,15 @@
+CREATE TYPE DATA_EXCHANGE_APPROACH_MARKED_COMPLETE_NOTIFICATION_TYPE as enum (
+  'ALL_MODELS',
+  'FOLLOWED_MODELS',
+  'MY_MODELS'
+  );
+
+
+ALTER TYPE ACTIVITY_TYPE
+ADD VALUE 'DATA_EXCHANGE_APPROACH_MARKED_COMPLETE' AFTER 'NEW_MODEL_PLAN';
+
+ALTER TABLE user_notification_preferences
+  ADD COLUMN data_exchange_approach_marked_complete USER_NOTIFICATION_PREFERENCE_FLAG[] DEFAULT '{}'::USER_NOTIFICATION_PREFERENCE_FLAG[],
+  ADD COLUMN data_exchange_approach_marked_complete_notification_type DATES_CHANGED_NOTIFICATION_TYPE DEFAULT NULL;
+
+COMMENT ON COLUMN user_notification_preferences.data_exchange_approach_marked_complete IS 'Notification preference for when a data exchange approach is marked complete';

pkg/email/data_exchange_approach_completed.go

@@ -1,12 +1,12 @@
 package email
 
-// DataExchangeApproachCompletedSubjectContent defines the parameters necessary for the corresponding email subject
-type DataExchangeApproachCompletedSubjectContent struct {
+// DataExchangeApproachMarkedCompleteSubjectContent defines the parameters necessary for the corresponding email subject
+type DataExchangeApproachMarkedCompleteSubjectContent struct {
 	ModelName string
 }
 
-// DataExchangeApproachCompletedBodyContent defines the parameters necessary for the corresponding email body
-type DataExchangeApproachCompletedBodyContent struct {
+// DataExchangeApproachMarkedCompleteBodyContent defines the parameters necessary for the corresponding email body
+type DataExchangeApproachMarkedCompleteBodyContent struct {
 	ClientAddress                   string
 	ModelName                       string
 	ModelID                         string

pkg/email/template_service_impl.go

@@ -148,14 +148,14 @@ var modelPlanSuggestedPhaseSubjectTemplate string
 //go:embed templates/model_plan_suggested_phase_body.html
 var modelPlanSuggestedPhaseBodyTemplate string
 
-// DataExchangeApproachCompletedTemplateName is the template name for the data exchange approach completed email
-const DataExchangeApproachCompletedTemplateName string = "data_exchange_approach_completed"
+// DataExchangeApproachMarkedCompleteTemplateName is the template name for the data exchange approach completed email
+const DataExchangeApproachMarkedCompleteTemplateName string = "data_exchange_approach_marked_complete"
 
-//go:embed templates/data_exchange_approach_completed_body.html
-var dataExchangeApproachCompletedBodyTemplate string
+//go:embed templates/data_exchange_approach_marked_complete_body.html
+var dataExchangeApproachMarkedCompleteBodyTemplate string
 
-//go:embed templates/data_exchange_approach_completed_subject.html
-var dataExchangeApproachCompletedSubjectTemplate string
+//go:embed templates/data_exchange_approach_marked_complete_subject.html
+var dataExchangeApproachMarkedCompleteSubjectTemplate string
 
 // TemplateServiceImpl is an implementation-specific structure loading all resources necessary for server execution
 type TemplateServiceImpl struct {
@@ -249,7 +249,7 @@ func (t *TemplateServiceImpl) Load() error {
 		return err
 	}
 
-	err = t.loadEmailTemplate(DataExchangeApproachCompletedTemplateName, dataExchangeApproachCompletedSubjectTemplate, dataExchangeApproachCompletedBodyTemplate)
+	err = t.loadEmailTemplate(DataExchangeApproachMarkedCompleteTemplateName, dataExchangeApproachMarkedCompleteSubjectTemplate, dataExchangeApproachMarkedCompleteBodyTemplate)
 	if err != nil {
 		return err
 	}

pkg/email/templates/data_exchange_approach_marked_complete_body.html

@@ -0,0 +1,19 @@
+{{template "shared_header.html" "Data exchange approach complete:"}}
+
+<h3>{{.ModelName}}</h3>
+<p>Marked complete by {{.MarkedCompletedByUserCommonName}}</p>
+<br/>
+<p>
+  <a href="{{.ClientAddress}}/models/{{.ModelID}}/read-view/data-exchange-approach">View data exchange approach</a>
+</p>
+<br/>
+
+{{if .ShowFooter}}
+  <hr>
+  <br/>
+  <p>
+    You are currently subscribed to notifications when data exchange approaches are completed. If you no longer wish to receive these email notifications, please <a href="{{.ClientAddress}}/notifications/settings?unsubscribe_email=DATA_EXCHANGE_APPROACH_MARKED_COMPLETE">unsubscribe</a> or change your <a href="{{.ClientAddress}}/notifications/settings">notification settings</a>.
+  </p>
+{{end}}
+
+{{template "shared_footer.html"}}

pkg/email/templates/data_exchange_approach_marked_complete_subject.html

@@ -0,0 +1 @@
+Data exchange approach complete: {{.ModelName}}