[EASI-4473] Notification: Data Exchange Approach Completed

pkg/graph/resolvers/data_exchange_approach_helper.go

@@ -110,7 +110,7 @@ func SendDataExchangeApproachCompletedNotification(
 		actorID,
 		np,
 		inAppPreferences,
-		approach,
+		approach.ID,
 		markedCompletedBy,
 	)
 	if err != nil {

pkg/graph/schema/types/activity.graphql

@@ -114,26 +114,10 @@ type DatesChangedActivityMeta {
   dateChanges: [DateChange!]!
 }
 
-# TODO: Change from this dummy type to the actual type when it is defined
-type DataExchangeApproach {
-  id: UUID!
-  name: String!
-  description: String
-  isComplete: Boolean!
-  modelPlanID: UUID!
-  modelPlan: ModelPlan!
-  createdBy: UUID!
-  createdByUserAccount: UserAccount!
-  createdDts: Time!
-  modifiedBy: UUID
-  modifiedByUserAccount: UserAccount
-  modifiedDts: Time
-}
-
 type DataExchangeApproachCompletedActivityMeta {
   version: Int!
   type: ActivityType!
-  dataExchangeApproach: DataExchangeApproach!
+  dataExchangeApproachID: UUID!
   markedCompleteBy: UUID!
   markedCompleteByUserAccount: UserAccount!
 }

pkg/models/data_exchange_approach_completed_activity_meta.go

@@ -10,27 +10,27 @@ import (
 // is relevant to completing a Data Exchange Approach
 type DataExchangeApproachCompletedActivityMeta struct {
 	ActivityMetaBaseStruct
-	DataExchangeApproach *DataExchangeApproach `json:"dataExchangeApproach"`
-	MarkedCompleteBy     uuid.UUID             `json:"markedCompleteBy"`
+	DataExchangeApproachID uuid.UUID `json:"dataExchangeApproachID"`
+	MarkedCompleteBy       uuid.UUID `json:"markedCompleteBy"`
 }
 
 // newDataExchangeApproachCompletedActivityMeta creates a new DataExchangeApproachCompletedActivityMeta
 func newDataExchangeApproachCompletedActivityMeta(
-	dataExchangeApproach *DataExchangeApproach,
+	dataExchangeApproachID uuid.UUID,
 	markedCompleteBy uuid.UUID,
 ) *DataExchangeApproachCompletedActivityMeta {
 	version := 0 // iterate this if this type ever updates
 	return &DataExchangeApproachCompletedActivityMeta{
 		ActivityMetaBaseStruct: NewActivityMetaBaseStruct(ActivityDataExchangeApproachCompleted, version),
-		DataExchangeApproach:   dataExchangeApproach,
+		DataExchangeApproachID: dataExchangeApproachID,
 		MarkedCompleteBy:       markedCompleteBy,
 	}
 }
 
 // NewDataExchangeApproachCompletedActivity creates a new Data Exchange Approach Complete type of Activity
 func NewDataExchangeApproachCompletedActivity(
 	actorID uuid.UUID,
-	dataExchangeApproach *DataExchangeApproach,
+	dataExchangeApproachID uuid.UUID,
 	markedCompleteBy uuid.UUID,
 ) *Activity {
 	return &Activity{
@@ -39,7 +39,7 @@ func NewDataExchangeApproachCompletedActivity(
 		EntityID:     markedCompleteBy,
 		ActivityType: ActivityDataExchangeApproachCompleted,
 		MetaData: newDataExchangeApproachCompletedActivityMeta(
-			dataExchangeApproach,
+			dataExchangeApproachID,
 			markedCompleteBy,
 		),
 	}

pkg/notifications/data_exchange_approach_completed.go

@@ -15,13 +15,13 @@ func ActivityDataExchangeApproachCompletedCreate(
 	actorID uuid.UUID,
 	np sqlutils.NamedPreparer,
 	receivers []*models.UserAccountAndNotificationPreferences,
-	approach *models.DataExchangeApproach,
+	approachID uuid.UUID,
 	markedCompletedBy uuid.UUID,
 ) (*models.Activity, error) {
 
 	activity := models.NewDataExchangeApproachCompletedActivity(
 		actorID,
-		approach,
+		approachID,
 		markedCompletedBy,
 	)
 

pkg/notifications/data_exchange_approach_completed_test.go

@@ -36,7 +36,7 @@ func (suite *NotificationsSuite) TestActivityDataExchangeApproachCompletedCreate
 		actorID,
 		suite.testConfigs.Store,
 		receivers,
-		approach,
+		approach.ID,
 		approachMarkedCompleteBy.Account().ID,
 	)
 

src/gql/gen/graphql.ts

@@ -292,25 +292,9 @@ export type DailyDigestCompleteActivityMeta = {
   version: Scalars['Int']['output'];
 };
 
-export type DataExchangeApproach = {
-  __typename: 'DataExchangeApproach';
-  createdBy: Scalars['UUID']['output'];
-  createdByUserAccount: UserAccount;
-  createdDts: Scalars['Time']['output'];
-  description?: Maybe<Scalars['String']['output']>;
-  id: Scalars['UUID']['output'];
-  isComplete: Scalars['Boolean']['output'];
-  modelPlan: ModelPlan;
-  modelPlanID: Scalars['UUID']['output'];
-  modifiedBy?: Maybe<Scalars['UUID']['output']>;
-  modifiedByUserAccount?: Maybe<UserAccount>;
-  modifiedDts?: Maybe<Scalars['Time']['output']>;
-  name: Scalars['String']['output'];
-};
-
 export type DataExchangeApproachCompletedActivityMeta = {
   __typename: 'DataExchangeApproachCompletedActivityMeta';
-  dataExchangeApproach: DataExchangeApproach;
+  dataExchangeApproachID: Scalars['UUID']['output'];
   markedCompleteBy: Scalars['UUID']['output'];
   markedCompleteByUserAccount: UserAccount;
   type: ActivityType;