From 68b4b10c515695fad7b14fbfc792a82140dffd98 Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Fri, 28 Oct 2022 15:54:58 -0400
Subject: [PATCH 1/4] Slightly simplify non-poetry invocation in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 55ea9c2..905e90f 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Many of the scripts use data from a `config.yaml` in the current working directo
 
 ## Scripts
 
-The primary entry points have scripts entries (`tool.poetry.scripts`) in [`pyproject.toml`](./pyproject.toml). They assume that they are being run from a module, so must be run with `poetry run <script>` or `python -m memberPlumbing.<script> main`.
+The primary entry points have scripts entries (`tool.poetry.scripts`) in [`pyproject.toml`](./pyproject.toml). They assume that they are being run from a module, so must be run with `poetry run <script>` or `python -m memberPlumbing.<script>`.
 
 ### `doorUpdater`
 

From d8b3958c8763e5b030367b8e3e570b08ff62662f Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Fri, 28 Oct 2022 17:36:17 -0400
Subject: [PATCH 2/4] upcomingEvents: Check for error on retrieving event list

---
 memberPlumbing/upcomingEvents.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/memberPlumbing/upcomingEvents.py b/memberPlumbing/upcomingEvents.py
index 3c042e2..c4da789 100644
--- a/memberPlumbing/upcomingEvents.py
+++ b/memberPlumbing/upcomingEvents.py
@@ -36,6 +36,10 @@ def main():
 
     membershipworks = config.membershipworks
     events = membershipworks.get_events_list(datetime.now())
+    if "error" in events:
+        print("Error:", events["error"])
+        return
+
     events_list = "\n<hr />\n\n".join(
         format_event(membershipworks, event)
         for event in events["evt"]

From 363be0ba8c22bff29a8e8bbc81fa777a7c1b2c35 Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Tue, 3 Jan 2023 16:20:52 -0500
Subject: [PATCH 3/4] sqlExport: Get folder membership and apply into
 memberflags

---
 memberPlumbing/sqlExport.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/memberPlumbing/sqlExport.py b/memberPlumbing/sqlExport.py
index a3d5cc3..1e04c03 100755
--- a/memberPlumbing/sqlExport.py
+++ b/memberPlumbing/sqlExport.py
@@ -22,6 +22,12 @@ def do_import(config):
         ]
     ).on_conflict(action="update", preserve=[Flag.name, Flag.type]).execute()
 
+    print("Getting folder membership...")
+    folders = {
+        folder_id: membershipworks.get_member_ids([folder_name])
+        for folder_name, folder_id in membershipworks._parse_flags()["folders"].items()
+    }
+
     print("Getting/Updating members...")
     members = membershipworks.get_all_members()
     for m in members:
@@ -41,13 +47,14 @@ def do_import(config):
 
         # update member's flags
         for type, flags in membershipworks._parse_flags().items():
-            if type != "folders":  # currently no way to retrieve this info
-                for flag, id in flags.items():
-                    ml = MemberFlag(uid=member["Account ID"], flag_id=id)
-                    if member[flag]:
-                        ml.magic_save()
-                    else:
-                        ml.delete_instance()
+            for flag, id in flags.items():
+                ml = MemberFlag(uid=member["Account ID"], flag_id=id)
+                if (type == "folders" and member["Account ID"] in folders[id]) or (
+                    type != "folders" and member[flag]
+                ):
+                    ml.magic_save()
+                else:
+                    ml.delete_instance()
 
     print("Getting/Updating transactions...")
     # Deduping these is hard, so just recreate the data every time

From 66853e1156e0edbed7ef6baf4197e7bc12cfa9b0 Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Sat, 7 Jan 2023 14:16:22 -0500
Subject: [PATCH 4/4] ucsAccounts: Strip leading/trailing periods

This fixes a member whose name ended with "Jr."
---
 memberPlumbing/ucsAccounts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/memberPlumbing/ucsAccounts.py b/memberPlumbing/ucsAccounts.py
index 310ea64..48ea239 100755
--- a/memberPlumbing/ucsAccounts.py
+++ b/memberPlumbing/ucsAccounts.py
@@ -29,7 +29,7 @@ def sanitize_group_name(name):
 
 # From an API error message: "Username must only contain numbers, letters and dots!"
 def sanitize_user_name(name):
-    return re.sub(r"[^0-9a-z.]", ".", name.lower())
+    return re.sub(r"[^0-9a-z.]", ".", name.lower()).strip(".")
 
 
 async def make_groups(group_mod, members):