Issue 178 healy: Upsert user email to database

config.py

@@ -97,3 +97,4 @@ def get_env_var(name: str) -> str:
 UNIQUE_ISSUE_ID = "O/gitautoai/test#1"
 USER_ID = -1
 USER_NAME = "username-test"
+EMAIL = "test@gitauto.com"

services/gitauto_handler.py

@@ -27,6 +27,7 @@
     create_comment,
     update_comment,
     add_reaction_to_issue,
+    get_user_public_email,
 )
 from services.github.github_types import (
     BaseArgs,
@@ -49,7 +50,6 @@
 
 supabase_manager = SupabaseManager(url=SUPABASE_URL, key=SUPABASE_SERVICE_ROLE_KEY)
 
-
 async def handle_gitauto(payload: GitHubLabeledPayload, trigger_type: str) -> None:
     """Core functionality to create comments on issue, create PRs, and update progress."""
     current_time: float = time.time()
@@ -84,6 +84,7 @@ async def handle_gitauto(payload: GitHubLabeledPayload, trigger_type: str) -> No
     sender_id: int = payload["sender"]["id"]
     is_automation: bool = sender_id == GITHUB_APP_USER_ID
     sender_name: str = payload["sender"]["login"]
+    email: str = get_user_public_email(username=sender_name)
 
     # Extract other information
     github_urls, other_urls = extract_urls(text=issue_body)
@@ -140,6 +141,7 @@ async def handle_gitauto(payload: GitHubLabeledPayload, trigger_type: str) -> No
         user_id=sender_id,
         installation_id=installation_id,
         unique_issue_id=unique_issue_id,
+        email=email,
     )
     add_reaction_to_issue(
         issue_number=issue_number, content="eyes", base_args=base_args
@@ -253,5 +255,7 @@ async def handle_gitauto(payload: GitHubLabeledPayload, trigger_type: str) -> No
         token_input=token_input,
         token_output=token_output,
         total_seconds=int(end_time - current_time),
+        user_id=sender_id,
+        email=email,
     )
     return

services/github/github_manager.py

@@ -237,6 +237,7 @@ def create_comment_on_issue_with_gitauto_button(payload: GitHubLabeledPayload) -
     issue_number: int = payload["issue"]["number"]
     user_id: int = payload["sender"]["id"]
     user_name: str = payload["sender"]["login"]
+    email: str = get_user_public_email(username=user_name)
 
     supabase_manager = SupabaseManager(url=SUPABASE_URL, key=SUPABASE_SERVICE_ROLE_KEY)
 
@@ -247,6 +248,7 @@ def create_comment_on_issue_with_gitauto_button(payload: GitHubLabeledPayload) -
             user_id=user_id,
             user_name=user_name,
             installation_id=installation_id,
+            email=email,
         )
         first_issue = True
     elif supabase_manager.is_users_first_issue(
@@ -829,3 +831,18 @@ def update_comment_for_raised_errors(
     update_comment(comment_url=comment_url, token=token, body=body)
 
     raise RuntimeError("Error occurred")
+
+@handle_exceptions(default_return_value=None, raise_on_error=False)
+def get_user_public_email(username: str):
+    url = f"https://api.github.com/users/{username}"
+    headers = {
+        "Accept": "application/vnd.github.v3+json"
+    }
+
+    response: requests.Response = requests.get(url, headers=headers)
+    response.raise_for_status()
+    user_data: dict = response.json()
+
+    email: str = user_data.get('email')
+
+    return email

services/supabase/gitauto_manager.py

@@ -2,7 +2,9 @@
 
 from datetime import datetime, timezone
 from supabase import Client
+from postgrest.base_request_builder import APIResponse
 from services.stripe.customer import create_stripe_customer, subscribe_to_free_plan
+from services.supabase.users_manager import UsersManager
 from utils.handle_exceptions import handle_exceptions
 
 
@@ -40,6 +42,7 @@ def create_installation(
         owner_id: int,
         user_id: int,
         user_name: str,
+        email: str,
     ) -> None:
         """Create owners record with stripe customerId, subscribe to free plan, create installation record, create users record on Installation Webhook event"""
         # If owner doesn't exist in owners table, insert owner and stripe customer
@@ -69,6 +72,26 @@ def create_installation(
                 json={"owner_id": owner_id, "stripe_customer_id": customer_id}
             ).execute()
 
+        users_manager = UsersManager(client=self.client)
+        email_to_store = None if str(email).lower().endswith("@users.noreply.github.com") else email
+
+        response: APIResponse = self.client.table("users").select("email").eq("user_id", user_id).execute()
+
+        if response.data and len(response.data[0]) > 0:
+            # Update the email if it's different from the stored one
+            if email_to_store != response.data[0].get('email'):
+                self.client.table("users").update(
+                    json={"email": email_to_store}
+                ).eq("user_id", user_id).execute()
+        else:
+            # Create the user if it doesn't exist
+            users_manager.create_user(
+                user_id=user_id,
+                user_name=user_name,
+                installation_id=installation_id,
+                email=email_to_store,
+            )
+
         # Insert installation record
         self.client.table(table_name="installations").insert(
             json={
@@ -78,14 +101,7 @@ def create_installation(
                 "owner_id": owner_id,
             }
         ).execute()
-
-        self.client.table(table_name="users").upsert(
-            json={
-                "user_id": user_id,
-                "user_name": user_name,
-            },
-            on_conflict="user_id",
-        ).execute()
+
         # Create User, and set is_selected to True if user has no selected account for this installation
         is_selected = True
         data, _ = (
@@ -108,7 +124,7 @@ def create_installation(
 
     @handle_exceptions(default_return_value=None, raise_on_error=True)
     def create_user_request(
-        self, user_id: int, installation_id: int, unique_issue_id: str
+        self, user_id: int, installation_id: int, unique_issue_id: str, email: str
     ) -> int:
         """Creates record in usage table for this user and issue."""
         # If issue doesn't exist, create one
@@ -118,6 +134,7 @@ def create_user_request(
             .eq(column="unique_id", value=unique_issue_id)
             .execute()
         )
+         # If no issue exists with that unique_issue_id, create one
         if not data[1]:
             self.client.table(table_name="issues").insert(
                 json={
@@ -137,6 +154,16 @@ def create_user_request(
             )
             .execute()
         )
+
+        if not str(email).lower().endswith("@users.noreply.github.com"):
+            response: APIResponse = self.client.table("users").select("email").eq("user_id", user_id).execute()
+
+            if response.data and len(response.data[0]) > 0:
+                if email != response.data[0].get('email'):
+                    self.client.table("users").update(
+                        json={"email": email}
+                    ).eq("user_id", user_id).execute()
+
         return data[1][0]["id"]
 
     @handle_exceptions(default_return_value=None, raise_on_error=False)

services/supabase/users_manager.py

@@ -23,13 +23,15 @@ def __init__(self, client: Client) -> None:
         self.client: Client = client
 
     @handle_exceptions(default_return_value=None, raise_on_error=False)
-    def create_user(self, user_id: int, user_name: str, installation_id: int) -> None:
+    def create_user(self, user_id: int, user_name: str, installation_id: int, email: str) -> None:
         """Creates an account for the user in the users table"""
         self.client.table(table_name="users").upsert(
             json={
                 "user_id": user_id,
                 "user_name": user_name,
-            }
+                "email": email,
+            },
+            on_conflict="user_id"
         ).execute()
 
         self.client.table(table_name="user_installations").insert(

services/webhook_handler.py

@@ -14,6 +14,7 @@
     create_comment_on_issue_with_gitauto_button,
     get_installation_access_token,
     # turn_on_issue,
+    get_user_public_email
 )
 from services.github.github_types import (
     GitHubEventPayload,
@@ -38,6 +39,7 @@ async def handle_installation_created(payload: GitHubInstallationPayload) -> Non
     user_id: int = payload["sender"]["id"]
     user_name: str = payload["sender"]["login"]
     token: str = get_installation_access_token(installation_id=installation_id)
+    email: str = get_user_public_email(username=user_name)
 
     # Create installation record in Supabase
     supabase_manager.create_installation(
@@ -47,6 +49,7 @@ async def handle_installation_created(payload: GitHubInstallationPayload) -> Non
         owner_id=owner_id,
         user_id=user_id,
         user_name=user_name,
+        email=email,
     )
 
     # Add issue templates to the repositories

tests/services/supabase/test_gitauto_manager.py

@@ -1,6 +1,6 @@
 # run this file locally with: python -m tests.services.supabase.test_gitauto_manager
 import os
-from config import OWNER_TYPE
+from config import (EMAIL, OWNER_TYPE)
 from services.supabase import SupabaseManager
 from tests.services.supabase.wipe_data import (
     wipe_installation_owner_user_data,
@@ -17,6 +17,7 @@ def test_create_update_user_request_works() -> None:
     # using -1 to not conflict with real data
     user_id = -1
     installation_id = -1
+    user_name = "test"
 
     # Clean up at the beginning just in case a prior test failed to clean
     wipe_installation_owner_user_data()
@@ -28,14 +29,16 @@ def test_create_update_user_request_works() -> None:
         owner_name="gitautoai",
         owner_id=-1,
         user_id=user_id,
-        user_name="test",
+        user_name=user_name,
+        email=EMAIL,
     )
 
     usage_record_id = supabase_manager.create_user_request(
         user_id=user_id,
         installation_id=installation_id,
         # fake issue creation
         unique_issue_id="U/gitautoai/test#01",
+        email=EMAIL,
     )
     assert isinstance(
         usage_record_id,
@@ -65,6 +68,8 @@ def test_complete_and_update_usage_record_only_updates_one_record() -> None:
     # using -1 to not conflict with real data
     user_id = -1
     installation_id = -1
+    user_name = "test"
+    unique_issue_id = "U/gitautoai/test#01"
 
     # Clean up at the beginning just in case a prior test failed to clean
     wipe_installation_owner_user_data()
@@ -76,7 +81,8 @@ def test_complete_and_update_usage_record_only_updates_one_record() -> None:
         owner_name="gitautoai",
         owner_id=-1,
         user_id=user_id,
-        user_name="test",
+        user_name=user_name,
+        email=EMAIL,
     )
 
     # Creating multiple usage records where is_completed = false.
@@ -85,14 +91,16 @@ def test_complete_and_update_usage_record_only_updates_one_record() -> None:
             user_id=user_id,
             installation_id=installation_id,
             # fake issue creation
-            unique_issue_id="U/gitautoai/test#01",
+            unique_issue_id=unique_issue_id,
+            email=EMAIL,
         )
 
     usage_record_id = supabase_manager.create_user_request(
         user_id=user_id,
         installation_id=installation_id,
         # fake issue creation
-        unique_issue_id="U/gitautoai/test#01",
+        unique_issue_id=unique_issue_id,
+        email=EMAIL,
     )
     assert isinstance(
         usage_record_id,

tests/services/supabase/test_users_manager.py

@@ -14,6 +14,7 @@
     INSTALLATION_ID,
     UNIQUE_ISSUE_ID,
     NEW_INSTALLATION_ID,
+    EMAIL,
 )
 from services.stripe.customer import get_subscription
 from services.supabase import SupabaseManager
@@ -47,12 +48,14 @@ def test_create_and_update_user_request_works() -> None:
         owner_id=OWNER_ID,
         user_id=USER_ID,
         user_name=USER_NAME,
+        email=EMAIL,
     )
 
     usage_record_id = supabase_manager.create_user_request(
         user_id=USER_ID,
         installation_id=INSTALLATION_ID,
         unique_issue_id="U/gitautoai/nextjs-website#52",
+        email=EMAIL,
     )
     assert isinstance(usage_record_id, int)
     assert (
@@ -83,6 +86,7 @@ def test_how_many_requests_left() -> None:
         owner_id=OWNER_ID,
         user_id=USER_ID,
         user_name=USER_NAME,
+        email=EMAIL,
     )
     # Testing 0 requests have been made on free tier
     requests_left, request_count, end_date = (
@@ -154,6 +158,7 @@ def test_is_users_first_issue() -> None:
         owner_id=OWNER_ID,
         user_id=USER_ID,
         user_name=USER_NAME,
+        email=EMAIL,
     )
     assert supabase_manager.is_users_first_issue(
         user_id=USER_ID, installation_id=INSTALLATION_ID
@@ -189,6 +194,7 @@ def test_parse_subscription_object() -> None:
         owner_id=OWNER_ID,
         user_id=USER_ID,
         user_name=USER_NAME,
+        email=EMAIL,
     )
 
     def assertion_test(customer_id: str, product_id: str):