From 34254ccd66cf155eb43eaf86c7010848f11a9354 Mon Sep 17 00:00:00 2001
From: JaminenB <44093931+JaminenB@users.noreply.github.com>
Date: Fri, 29 Aug 2025 15:22:49 -0600
Subject: [PATCH] Update app.py for ADD_MEMBER attribute

More information in issue:
- https://github.com/3rd-party-integrations/github-team-sync/issues/214

CHANGES:
- ADD: if-statement to check if ADD_MEMBER attribute is `true` and if the user is not a member of the organization
  - Uses the org.add_or_update_membership function to add the user to the organization
- CHANGE: if-statement to add a user to a GitHub team only if they are a member of the organization already
---
 app.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app.py b/app.py
index 2d84d41..f14b59b 100644
--- a/app.py
+++ b/app.py
@@ -211,8 +211,19 @@ def execute_sync(org, team, slug, state):
         raise AssertionError(message)
     else:
         for user in state["action"]["add"]:
-            # Validate that user is in org
-            if org.is_member(user) or ADD_MEMBER:
+            # Add user to org if they are not already a member and the ADD_MEMBER attribute is "true"
+            if not org.is_member(user) and ADD_MEMBER:
+                try:
+                    print(f"User: {user} is not in the {org.login} organization. Attempting to add.")
+                    org.add_or_update_membership(user)
+                except Exception as e:
+                    print(f"Error adding {user} to {org.login}: {e}")
+                    pass
+            else:
+                print(f"User: {user} is already a member of the {org.login} organization or ADD_MEMBER is false")
+
+            # Add user to team if they are a member of the org
+            if org.is_member(user):
                 try:
                     print(f"Adding {user} to {slug}")
                     team.add_or_update_membership(user)