[#4433] Bug/Adding GH Org

- Resolved Github Org installation event issue - Updated Go version Signed-off-by: Harold Wanyama <[email protected]>
communitybridge · Sep 30, 2024 · 8d3999b · 8d3999b
1 parent b7d61b4
commit 8d3999b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20.1'
+          go-version: '1.23.1'
       - name: Go Version
         run: go version
       - name: Setup Node

diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20.1'
+          go-version: '1.23.1'
       - name: Go Version
         run: go version
       - name: Setup Node

diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20.1'
+          go-version: '1.23.1'
           check-latest: true
       - name: Go Version
         run: go version

diff --git a/cla-backend/cla/models/dynamo_models.py b/cla-backend/cla/models/dynamo_models.py
@@ -500,6 +500,20 @@ class Meta:
 
     organization_name_lower = UnicodeAttribute(hash_key=True)
 
+class OrganizationNameLowerSearchIndex(GlobalSecondaryIndex):
+    """
+    This class represents a global secondary index for querying organizations by Organization Name.
+    """
+
+    class Meta:
+        """Meta class for external ID github org index."""
+
+        index_name = "organization-name-lower-search-index"
+        write_capacity_units = int(cla.conf["DYNAMO_WRITE_UNITS"])
+        read_capacity_units = int(cla.conf["DYNAMO_READ_UNITS"])
+        projection = AllProjection()
+
+    organization_name_lower = UnicodeAttribute(hash_key=True)
 
 class GitlabExternalGroupIDIndex(GlobalSecondaryIndex):
     """
@@ -3817,7 +3831,8 @@ class Meta:
     project_sfid = UnicodeAttribute()
     organization_sfid_index = GitlabOrgSFIndex()
     project_sfid_organization_name_index = GitlabOrgProjectSfidOrganizationNameIndex()
-    organization_name_lowe_index = GitlabOrganizationNameLowerIndex()
+    organization_name_lower_index = GitlabOrganizationNameLowerIndex()
+    organization_name_lower_search_index = OrganizationNameLowerSearchIndex()
     organization_project_id = UnicodeAttribute(null=True)
     organization_company_id = UnicodeAttribute(null=True)
     auto_enabled = BooleanAttribute(null=True)
@@ -3964,7 +3979,7 @@ def get_organization_by_installation_id(self, installation_id):
         return None
 
     def get_organization_by_lower_name(self, organization_name):
-        org_generator = self.model.scan(organization_name_lower__eq=organization_name.lower())
+        org_generator = self.model.organization_name_lower_search_index.query(organization_name.lower())
         for org_model in org_generator:
             org = GitHubOrg()
             org.model = org_model

diff --git a/cla-backend/cla/tests/unit/test_gh_org_models.py b/cla-backend/cla/tests/unit/test_gh_org_models.py
@@ -35,6 +35,6 @@ def test_set_organization_name(gh_instance):
 def test_get_org_by_name_lower(gh_instance):
     """ Test getting GitHub org with case insensitive search """
     gh_org = cla.utils.get_github_organization_instance()
-    gh_org.model.scan = Mock(return_value=[gh_instance.model])
+    gh_org.model.organization_name_lower_search_index.query = Mock(return_value=[gh_instance.model])
     found_gh_org = gh_org.get_organization_by_lower_name(gh_instance.get_organization_name())
     assert found_gh_org.get_organization_name_lower() == gh_instance.get_organization_name_lower()