Memberships view: handle future members correctly (#481)

louking · Dec 24, 2021 · db6f856 · db6f856
1 parent df14c91
commit db6f856
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/members/version.py b/members/version.py
@@ -1,5 +1,5 @@
 # See https://packaging.python.org/guides/distributing-packages-using-setuptools/#semantic-versioning-preferred
-__version__ = '1.2.8.1'
+__version__ = '1.2.8.2.dev1'
 __docversion__ = __version__
 # uncomment for development
-# __docversion__ = 'latest'
+__docversion__ = 'latest'
diff --git a/scripts/membership_cli.py b/scripts/membership_cli.py
@@ -104,9 +104,10 @@ def doxform(ms):
             return membership
 
         with rsu:
-            # get current members from RunSignUp, and put into common format
-            rawmemberships = rsu.members(club_id)
-            memberships = [doxform(ms) for ms in rawmemberships]
+            # get current and future members from RunSignUp, and put into common format
+            rawmemberships = rsu.members(club_id, current_members_only='F')
+            currfuturememberships = [m for m in rawmemberships if m['membership_end'] >= datetime.today().date().isoformat()]
+            memberships = [doxform(ms) for ms in currfuturememberships]
 
     # membershipfile supplied
     else: