fix: prefer email over github and resolve git emails via username identity

Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>

Author: skwowet

services/apps/git_integration/src/crowdgit/database/crud.py

@@ -630,7 +630,7 @@ async def find_many_member_ids_by_identities(identities: list[dict]) -> list[dic
             ON mi.type = i.identity_type
             AND mi.verified = i.verified
             AND lower(mi.value) = lower(i.value)
-            AND (i.platform IS NULL OR mi.platform = i.platform)
+            AND mi.platform = i.platform
             AND mi."deletedAt" IS NULL
         ORDER BY i.idx
         """,

services/apps/git_integration/src/crowdgit/services/affiliation/affiliation_service.py

@@ -357,18 +357,18 @@ def group_parse_rows(
 
         for row in rows:
             raw_contributor = row.contributor
-            github = cls._strip(raw_contributor.github)
-            if github:
-                github = github.lstrip("@").lower()
             email = cls._strip(raw_contributor.email)
             if email:
                 email = email.replace("!", "@").lower()
+            github = cls._strip(raw_contributor.github)
+            if github:
+                github = github.lstrip("@").lower()
             name = cls._strip(raw_contributor.name)
 
-            if github:
-                contributor_key = ("github", github)
-            elif email:
+            if email:
                 contributor_key = ("email", email)
+            elif github:
+                contributor_key = ("github", github)
             else:
                 continue
 
@@ -584,10 +584,10 @@ def affiliation_stint_key(
         contributor: AffiliationContributor, domain: str
     ) -> tuple[str, str, str] | None:
         domain = domain.lower()
-        if contributor.github:
-            return ("github", contributor.github.lower(), domain)
         if contributor.email:
             return ("email", contributor.email.lower(), domain)
+        if contributor.github:
+            return ("github", contributor.github.lower(), domain)
         return None
 
     async def exclude_parent_repo_affiliations(
@@ -665,23 +665,23 @@ async def apply_affiliations(
         for entry in affiliations:
             contributor = entry.contributor
             member_idx: int | None = None
-            if contributor.github:
+            if contributor.email:
                 member_idx = len(member_identity_inputs)
                 member_identity_inputs.append(
                     {
                         "type": "username",
-                        "platform": "github",
-                        "value": contributor.github,
+                        "platform": "git",
+                        "value": contributor.email,
                         "verified": True,
                     }
                 )
-            elif contributor.email:
+            elif contributor.github:
                 member_idx = len(member_identity_inputs)
                 member_identity_inputs.append(
                     {
-                        "type": "email",
-                        "platform": None,
-                        "value": contributor.email,
+                        "type": "username",
+                        "platform": "github",
+                        "value": contributor.github,
                         "verified": True,
                     }
                 )