fix(replies): show other members replies with no answer

gruprsvp · Nov 15, 2024 · 1d61500 · 1d61500
1 parent 217942d
commit 1d61500
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/lib/models/default_reply.g.dart b/lib/models/default_reply.g.dart
diff --git a/lib/models/enum.dart b/lib/models/enum.dart
@@ -9,6 +9,8 @@ enum InviteMethods {
 enum ReplyOptions {
   yes,
   no,
+  maybe,
+  none,
 }
 
 /// The different roles a user can have in a group

diff --git a/lib/models/reply.g.dart b/lib/models/reply.g.dart
diff --git a/lib/selectors/selectors.dart b/lib/selectors/selectors.dart
@@ -88,21 +88,24 @@ ScheduleEventDetails? selectScheduleForDate(
 
   if (scheduleSummary == null) return null;
 
-  Member getMember(int memberId) {
-    final member = state.members.entities[memberId.toString()]!;
+  Member getMember(Member member) {
     final profile = state.profiles.entities[member.profileId.toString()];
 
     return member.copyWith(
         displayNameOverride:
             member.displayNameOverride ?? profile?.displayName);
   }
 
-  final memberReplies = scheduleSummary.memberReplies.entries
-      .map((e) => (getMember(e.key), e.value))
-      .whereNot((e) =>
-          e.$1.id ==
-          scheduleSummary
-              .targetMemberId) // Remove target user from the list below
+  final members =
+      groupMembersSelector(state, scheduleSummary.groupId.toString());
+  final memberReplies = members
+      // Fill in the blanks for members who haven't replied
+      .map((m) {
+        final reply = scheduleSummary.memberReplies[m.id];
+        return (getMember(m), reply ?? ReplyOptions.none);
+      })
+      // Remove target user from the list below
+      .whereNot((e) => e.$1.id == scheduleSummary.targetMemberId)
       .toList();
 
   // TODO This should be a selector and memoized
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,8 @@ enum InviteMethods { @@
     enum ReplyOptions {
       yes,
       no,
+      maybe,
+      none,
     }
     /// The different roles a user can have in a group
@@ Expand Down @@