Respect GroupMemberStatus for services list (#56)

daniel-lerch · Jan 21, 2024 · 5493207 · 5493207
1 parent 1f762ac
commit 5493207
Show file tree

Hide file tree

Showing 12 changed files with 682 additions and 8 deletions.
diff --git a/server/src/Korga.Core/ChurchTools/Api/GroupMember.cs b/server/src/Korga.Core/ChurchTools/Api/GroupMember.cs
@@ -2,16 +2,18 @@
 
 public class GroupMember : IIdentifiable<long>
 {
-	public GroupMember(int personId, int groupId, int groupTypeRoleId)
+	public GroupMember(int personId, int groupId, int groupTypeRoleId, string groupMemberStatus)
 	{
 		PersonId = personId;
 		GroupId = groupId;
 		GroupTypeRoleId = groupTypeRoleId;
+        GroupMemberStatus = groupMemberStatus;
 	}
 
 	public int PersonId { get; set; }
     public int GroupId { get; set; }
     public int GroupTypeRoleId { get; set; }
+    public string GroupMemberStatus { get; set; }
 
 	long IIdentifiable<long>.Id => (((long)PersonId) << 32) | (long)GroupId;
 }
diff --git a/server/src/Korga.Core/ChurchTools/Entities/GroupMember.cs b/server/src/Korga.Core/ChurchTools/Entities/GroupMember.cs
@@ -2,7 +2,7 @@
 
 public class GroupMember : IIdentifiable<long>
 {
-	public int PersonId { get; set; }
+    public int PersonId { get; set; }
 	public Person? Person { get; set; }
 
 	public int GroupId { get; set; }
@@ -11,5 +11,7 @@ public class GroupMember : IIdentifiable<long>
 	public int GroupRoleId { get; set; }
 	public GroupRole? GroupRole { get; set; }
 
+    public GroupMemberStatus GroupMemberStatus { get; set; }
+
 	long IIdentifiable<long>.Id => (((long)PersonId) << 32) | (long)GroupId;
 }
diff --git a/server/src/Korga.Core/ChurchTools/GroupMemberStatus.cs b/server/src/Korga.Core/ChurchTools/GroupMemberStatus.cs
@@ -0,0 +1,8 @@
+namespace Korga.ChurchTools;
+
+public enum GroupMemberStatus
+{
+    Active,
+    Requested,
+    ToDelete
+}
diff --git a/server/src/Korga.Core/DatabaseContext.cs b/server/src/Korga.Core/DatabaseContext.cs
@@ -63,6 +63,7 @@ private void CreateChurchTools(ModelBuilder modelBuilder)
         groupMember.HasOne(gm => gm.Person).WithMany().HasForeignKey(gm => gm.PersonId);
         groupMember.HasOne(gm => gm.Group).WithMany().HasForeignKey(gm => gm.GroupId);
         groupMember.HasOne(gm => gm.GroupRole).WithMany().HasForeignKey(gm => gm.GroupRoleId);
+        groupMember.Property(gm => gm.GroupMemberStatus).HasConversion<int>();
 
         var groupType = modelBuilder.Entity<GroupType>();
         groupType.HasKey(x => x.Id);

diff --git a/server/src/Korga.Server/ChurchTools/ChurchToolsSyncService.cs b/server/src/Korga.Server/ChurchTools/ChurchToolsSyncService.cs
@@ -102,8 +102,18 @@ await Synchronize<GroupMember, DbGroupMember, long>(
             await churchTools.GetGroupMembers(cancellationToken),
             database.GroupMembers,
             await database.GroupMembers.OrderBy(x => x.PersonId).ThenBy(x => x.GroupId).ToListAsync(cancellationToken),
-            x => new() { PersonId = x.PersonId, GroupId = x.GroupId, GroupRoleId = x.GroupTypeRoleId },
-            (response, entity) => entity.GroupRoleId = response.GroupTypeRoleId,
+            x => new()
+            {
+                PersonId = x.PersonId,
+                GroupId = x.GroupId,
+                GroupRoleId = x.GroupTypeRoleId,
+                GroupMemberStatus = ParseGroupMemberStatus(x.GroupMemberStatus),
+            },
+            (response, entity) =>
+            {
+                entity.GroupRoleId = response.GroupTypeRoleId;
+                entity.GroupMemberStatus = ParseGroupMemberStatus(response.GroupMemberStatus);
+            },
             cancellationToken
         );
     }
@@ -170,4 +180,15 @@ private void LogChanges<T>(int rowsAffected, DbSet<T> table) where T : class
         else
             logger.LogDebug("No changes for {EntityDisplayName} entities", table.EntityType.DisplayName());
     }
+
+    private static GroupMemberStatus ParseGroupMemberStatus(string groupMemberStatus)
+    {
+        return groupMemberStatus switch
+        {
+            "active" => GroupMemberStatus.Active,
+            "requested" => GroupMemberStatus.Requested,
+            "to_delete" => GroupMemberStatus.ToDelete,
+            _ => throw new ArgumentException($"Unknown GroupMemberStatus {groupMemberStatus}")
+        };
+    }
 }
diff --git a/server/src/Korga.Server/Controllers/ServiceController.cs b/server/src/Korga.Server/Controllers/ServiceController.cs
@@ -62,7 +62,8 @@ join person in database.People on member.PersonId equals person.Id
              {
                  PersonId = person.Id,
                  FirstName = person.FirstName,
-                 LastName = person.LastName
+                 LastName = person.LastName,
+                 GroupMemberStatus = member.GroupMemberStatus,
              })
             .Distinct()
             .ToDictionaryAsync(x => x.PersonId);