Fix installation id

Signed-off-by: Lukasz Gryglicki <[email protected]>

Assisted by [OpenAI](https://platform.openai.com/)

Assisted by [GitHub Copilot](https://github.com/features/copilot)

Author: lukaszgryglicki

cla-backend/cla/controllers/github.py

@@ -8,7 +8,6 @@
 import json
 import os
 import uuid
-import traceback
 from datetime import datetime
 from pprint import pprint
 from typing import Optional, List
@@ -320,34 +319,23 @@ def handle_installation_event(action: str, body: dict):
             return {'status': f'GitHub installation {action} event malformed.'}
 
         cla.log.debug(f'Locating organization using name: {org_name}')
-        try:
-            existing = get_organization(org_name)
-            cla.log.debug(
-                f"{func_name} - post-get_organization type={type(existing)} "
-                f"keys={list(existing.keys()) if isinstance(existing, dict) else '(n/a)'} "
-                f"values={list(existing.values()) if isinstance(existing, dict) else '(n/a)'}"
-            )
-            if 'errors' in existing:
-                cla.log.warning(f'{func_name} - Received github installation created event for organization: {org_name}, '
-                                'but the organization is not configured in EasyCLA')
-                # TODO: Need a way of keeping track of new organizations that don't have projects yet.
-                return {'status': 'Github Organization must be created through the Project Management Console.'}
-            elif not existing.get('organization_installation_id'):
-                cla.log.info(f'{func_name} - Setting installation ID for github organization: {existing.get("organization_name")} to {installation_id}')
-                update_organization(existing.get('organization_name'), existing.get('organization_sfid'), installation_id)
-                cla.log.info(f'{func_name} - Organization enrollment completed: {existing.get("organization_name")}')
-                return {'status': 'Organization Enrollment Completed. CLA System is operational'}
-            else:
-                cla.log.info(f'{func_name} - Organization already enrolled: {existing.get("organization_name")}')
-                cla.log.info(f'{func_name} - installation ID: {existing.get("organization_installation_id")}')
-                cla.log.info(f'{func_name} - Updating installation ID for github organization: {existing.get("organization_name")} to {installation_id}')
-                update_organization(existing.get('organization_name'), existing.get('organization_sfid'), installation_id)
-                return {'status': 'Already Enrolled Organization Updated. CLA System is operational'}
-        except Exception as e:
-            cla.log.error(f"{func_name} - exception entering/enforcing enrollment branches: {type(e).__name__}: {e}\n"
-                f"{traceback.format_exc()}"
-            )
-            raise
+        existing = get_organization(org_name)
+        if 'errors' in existing:
+            cla.log.warning(f'{func_name} - Received github installation created event for organization: {org_name}, '
+                            'but the organization is not configured in EasyCLA')
+            # TODO: Need a way of keeping track of new organizations that don't have projects yet.
+            return {'status': 'Github Organization must be created through the Project Management Console.'}
+        elif not existing.get('organization_installation_id'):
+            cla.log.info(f'{func_name} - Setting installation ID for github organization: {existing.get("organization_name")} to {installation_id}')
+            update_organization(existing.get('organization_name'), existing.get('organization_sfid'), installation_id)
+            cla.log.info(f'{func_name} - Organization enrollment completed: {existing.get("organization_name")}')
+            return {'status': 'Organization Enrollment Completed. CLA System is operational'}
+        else:
+            cla.log.info(f'{func_name} - Organization already enrolled: {existing.get("organization_name")}')
+            cla.log.info(f'{func_name} - installation ID: {existing.get("organization_installation_id")}')
+            cla.log.info(f'{func_name} - Updating installation ID for github organization: {existing.get("organization_name")} to {installation_id}')
+            update_organization(existing.get('organization_name'), existing.get('organization_sfid'), installation_id)
+            return {'status': 'Already Enrolled Organization Updated. CLA System is operational'}
 
     elif action == 'deleted':
         cla.log.debug(f'{func_name} - processing github installation activity for action: {action}')

cla-backend/cla/models/dynamo_models.py

@@ -4000,6 +4000,10 @@ def __str__(self):
         )
 
     def to_dict(self):
+        if getattr(self.model, 'skip_cla', None) is None:
+            self.model.skip_cla = {}
+        if getattr(self.model, 'enable_co_authors', None) is None:
+            self.model.enable_co_authors = {}
         ret = dict(self.model)
 
         if "organization_installation_id" not in ret:

cla-backend/cla/models/github_models.py

@@ -139,9 +139,6 @@ def received_activity(self, data):
         elif data["action"] == "checks_requested":
             cla.log.debug("github_models.received_activity - Handling checks requested pull request")
             return self.process_checks_requested_merge_group(data)
-        elif data["action"] == "enqueued":
-            cla.log.debug("github_models.received_activity - Handling enqueued pull request")
-            return self.process_enqueued_pull_request(data)
         else:
             cla.log.debug("github_models.received_activity - Ignoring unsupported action: {}".format(data["action"]))
 
@@ -459,30 +456,6 @@ def process_opened_pull_request(self, data):
         installation_id = data["installation"]["id"]
         self.update_change_request(installation_id, github_repository_id, pull_request_id)
 
-    def process_enqueued_pull_request(self, data):
-        """
-        Helper method to handle a webhook fired from GitHub for an enqueued PR.
-
-        :param data: The data returned from GitHub on this webhook.
-        :type data: dict
-        """
-        merge_group_sha = data.get("pull_request", {}).get("merge_commit_sha")
-        github_repository_id = data.get("repository", {}).get("id")
-        installation_id = data.get("installation", {}).get("id")
-        pull_request_id = data.get("pull_request", {}).get("number")
-        if None in (installation_id, github_repository_id, merge_group_sha, pull_request_id):
-            cla.log.warning(
-                "process_enqueued_pull_request: Missing required field(s): "
-                f"installation_id={installation_id}, "
-                f"github_repository_id={github_repository_id}, "
-                f"merge_group_sha={merge_group_sha}, "
-                f"pull_request_id={pull_request_id}. "
-                "Aborting update_merge_group."
-            )
-            return
-
-        self.update_merge_group(installation_id, github_repository_id, merge_group_sha, pull_request_id)
-
     def process_checks_requested_merge_group(self, data):
         """
         Helper method to handle a webhook fired from GitHub for a merge group event.