From 9e190d483aaccd30f50dd25afc5ef50a420cfa26 Mon Sep 17 00:00:00 2001
From: ggurdin <46800240+ggurdin@users.noreply.github.com>
Date: Tue, 12 Aug 2025 15:34:57 -0400
Subject: [PATCH] chore: use activity IDs from the choreo response (#3706)

---
 lib/pangea/activity_generator/activity_generator.dart     | 1 +
 lib/pangea/activity_planner/activity_plan_model.dart      | 7 ++++---
 lib/pangea/activity_planner/activity_planner_builder.dart | 1 +
 lib/pangea/common/constants/model_keys.dart               | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/pangea/activity_generator/activity_generator.dart b/lib/pangea/activity_generator/activity_generator.dart
index 441b7344f..931ad542a 100644
--- a/lib/pangea/activity_generator/activity_generator.dart
+++ b/lib/pangea/activity_generator/activity_generator.dart
@@ -221,6 +221,7 @@ class ActivityGeneratorState extends State<ActivityGenerator> {
           vocab: activity.vocab,
           imageURL: imageUrl,
           roles: activity.roles,
+          bookmarkId: activity.bookmarkId,
         );
       }
     });
diff --git a/lib/pangea/activity_planner/activity_plan_model.dart b/lib/pangea/activity_planner/activity_plan_model.dart
index 3ce554b5d..c71471ef1 100644
--- a/lib/pangea/activity_planner/activity_plan_model.dart
+++ b/lib/pangea/activity_planner/activity_plan_model.dart
@@ -21,13 +21,12 @@ class ActivityPlanModel {
     required this.learningObjective,
     required this.instructions,
     required this.vocab,
+    required this.bookmarkId,
     Map<String, ActivityRole>? roles,
     this.imageURL,
     this.endAt,
     this.duration,
-  })  : bookmarkId =
-            "${title.hashCode ^ learningObjective.hashCode ^ instructions.hashCode ^ imageURL.hashCode ^ vocab.map((v) => v.hashCode).reduce((a, b) => a ^ b)}",
-        _roles = roles;
+  }) : _roles = roles;
 
   Map<String, ActivityRole> get roles {
     if (_roles != null) return _roles!;
@@ -62,6 +61,7 @@ class ActivityPlanModel {
       endAt: endAt ?? this.endAt,
       duration: duration ?? this.duration,
       roles: roles ?? _roles,
+      bookmarkId: bookmarkId,
     );
   }
 
@@ -102,6 +102,7 @@ class ActivityPlanModel {
             )
           : null,
       roles: roles,
+      bookmarkId: json[ModelKey.activityPlanBookmarkId],
     );
   }
 
diff --git a/lib/pangea/activity_planner/activity_planner_builder.dart b/lib/pangea/activity_planner/activity_planner_builder.dart
index df1bf4e4e..d05b047b1 100644
--- a/lib/pangea/activity_planner/activity_planner_builder.dart
+++ b/lib/pangea/activity_planner/activity_planner_builder.dart
@@ -103,6 +103,7 @@ class ActivityPlannerBuilderState extends State<ActivityPlannerBuilder> {
       vocab: vocab,
       imageURL: imageURL,
       roles: widget.initialActivity.roles,
+      bookmarkId: widget.initialActivity.bookmarkId,
     );
   }
 
diff --git a/lib/pangea/common/constants/model_keys.dart b/lib/pangea/common/constants/model_keys.dart
index 4edbc0213..d85fbdefa 100644
--- a/lib/pangea/common/constants/model_keys.dart
+++ b/lib/pangea/common/constants/model_keys.dart
@@ -163,7 +163,7 @@ class ModelKey {
   static const String activityPlanInstructions = "instructions";
   static const String activityPlanVocab = "vocab";
   static const String activityPlanImageURL = "image_url";
-  static const String activityPlanBookmarkId = "bookmark_id";
+  static const String activityPlanBookmarkId = "activity_id";
   static const String activityPlanEndAt = "end_at";
   static const String activityPlanDuration = "duration";