Fix bug in mismatch between IDs

piket_server/aardbei_sync.py

@@ -453,7 +453,7 @@ def match_local_aardbei(aardbei_members: List[AardbeiMember]) -> AardbeiLink:
 
     for member in aardbei_members:
         p: Optional[Person] = Person.query.filter_by(
-            aardbei_id=member.aardbei_id
+            aardbei_id=member.person.aardbei_id
         ).one_or_none()
 
         if p is not None:
@@ -492,14 +492,14 @@ def link_matches(matches: List[AardbeiMatch]) -> None:
     """
 
     for match in matches:
-        match.local.aardbei_id = match.remote.aardbei_id
+        match.local.aardbei_id = match.remote.person.aardbei_id
         match.local.display_name = match.remote.display_name
         logging.info(
             "Linking local %s (%s) to remote %s (%s)",
             match.local.full_name,
             match.local.person_id,
             match.remote.display_name,
-            match.remote.aardbei_id,
+            match.remote.person.aardbei_id,
         )
 
         db.session.add(match.local)
@@ -516,14 +516,14 @@ def create_missing(missing: List[AardbeiMember]) -> None:
         pnew = Person(
             full_name=member.person.full_name,
             display_name=member.display_name,
-            aardbei_id=member.aardbei_id,
+            aardbei_id=member.person.aardbei_id,
             active=False,
         )
         logging.info(
             "Creating new person for %s / %s (%s)",
             member.person.full_name,
             member.display_name,
-            member.aardbei_id,
+            member.person.aardbei_id,
         )
         db.session.add(pnew)
 
@@ -603,7 +603,7 @@ def get_activities(
         for item in resp.json():
             result.append(SparseAardbeiActivity.from_aardbei_dict(item))
 
-    now = datetime.datetime.now()
+    now = datetime.datetime.now(datetime.timezone.utc)
     result.sort(key=lambda x: SparseAardbeiActivity.distance(x, now))
     return result
 
@@ -640,7 +640,7 @@ def match_activity(activity: AardbeiActivity) -> None:
     activity as active, and all other people as inactive.
     """
     ps = activity.participants
-    pids: List[PersonId] = [p.person.aardbei_id for p in ps]
+    pids: List[PersonId] = [p.person.aardbei_id for p in ps if p.attending]
 
     Person.query.update(values={"active": False})
     Person.query.filter(Person.aardbei_id.in_(pids)).update(