Update Backend Tests Coverage

backend/apps/common/open_ai.py

@@ -95,6 +95,8 @@ def complete(self):
 
             return response.choices[0].message.content
         except openai.APIConnectionError:
-            logger.exception("A connection error occurred during OpenAI API request.")
+            logger.exception("An error occurred during OpenAI API request.")
+            return None
         except Exception:
             logger.exception("An error occurred during OpenAI API request.")
+            return None

backend/apps/github/api/search/user.py

@@ -1,8 +1,10 @@
 """OWASP app user search API."""
 
-from algoliasearch_django import raw_search
+from __future__ import annotations
 
+from apps.github.constants import default_attributes
 from apps.github.models.user import User
+from apps.github.utils import raw_search
 
 
 def get_users(query, attributes=None, limit=25, page=1, searchable_attributes=None):
@@ -21,33 +23,14 @@ def get_users(query, attributes=None, limit=25, page=1, searchable_attributes=No
     """
     params = {
         "attributesToHighlight": [],
-        "attributesToRetrieve": attributes
-        or [
-            "idx_avatar_url",
-            "idx_bio",
-            "idx_company",
-            "idx_contributions",
-            "idx_created_at",
-            "idx_email",
-            "idx_followers_count",
-            "idx_following_count",
-            "idx_issues_count",
-            "idx_key",
-            "idx_location",
-            "idx_login",
-            "idx_name",
-            "idx_public_repositories_count",
-            "idx_title",
-            "idx_updated_at",
-            "idx_url",
-        ],
+        "attributesToRetrieve": attributes or default_attributes,
         "hitsPerPage": limit,
         "minProximity": 4,
-        "page": page - 1,
+        "page": page - 1,  # Algolia uses 0-based pagination
         "typoTolerance": "min",
     }
 
     if searchable_attributes:
         params["restrictSearchableAttributes"] = searchable_attributes
 
-    return raw_search(User, query, params)
+    return raw_search(User, query or "", params)

backend/apps/github/management/commands/github_update_project_related_repositories.py

@@ -44,32 +44,38 @@ def handle(self, *args, **options):
         offset = options["offset"]
         projects = []
         for idx, project in enumerate(active_projects[offset:]):
-            prefix = f"{idx + offset + 1} of {active_projects_count}"
-            print(f"{prefix:<10} {project.owasp_url}")
-
-            repository_urls = project.related_urls.copy()
-            for repository_url in repository_urls:
-                repository_path = get_repository_path(repository_url)
-                if not repository_path:
-                    logger.info("Couldn't get repository path for %s", repository_url)
-                    continue
-
-                try:
-                    gh_repository = gh.get_repo(repository_path)
-                except UnknownObjectException as e:
-                    if e.data["status"] == "404" and "Not Found" in e.data["message"]:
-                        project.invalid_urls.add(repository_url)
-                        project.related_urls.remove(repository_url)
-                        project.save(update_fields=("invalid_urls", "related_urls"))
-                        continue
-
-                organization, repository = sync_repository(gh_repository)
-                if organization is not None:
-                    organization.save()
-
-                project.repositories.add(repository)
-
-            projects.append(project)
-
-        # Bulk save data.
+            self.process_project(idx, offset, active_projects_count, project, gh, projects)
+
         Project.bulk_save(projects)
+
+    def process_project(self, idx, offset, active_projects_count, project, gh, projects):
+        prefix = f"{idx + offset + 1} of {active_projects_count}"
+        print(f"{prefix:<10} {project.owasp_url}")
+
+        repository_urls = project.related_urls.copy()
+        for repository_url in repository_urls:
+            self.process_repository_url(repository_url, project, gh)
+
+        projects.append(project)
+
+    def process_repository_url(self, repository_url, project, gh):
+        repository_path = get_repository_path(repository_url)
+        if not repository_path:
+            logger.info("Couldn't get repository path for %s", repository_url)
+            return
+
+        try:
+            gh_repository = gh.get_repo(repository_path)
+            organization, repository = sync_repository(gh_repository)
+
+            if organization:
+                organization.save()
+            project.repositories.add(repository)
+        except UnknownObjectException as e:
+            self.handle_unknown_object_exception(e, project, repository_url)
+
+    def handle_unknown_object_exception(self, exception, project, repository_url):
+        if exception.data["status"] == "404" and "Not Found" in exception.data["message"]:
+            project.invalid_urls.add(repository_url)
+            project.related_urls.remove(repository_url)
+            project.save(update_fields=("invalid_urls", "related_urls"))

backend/apps/github/models/label.py

@@ -55,6 +55,11 @@ def bulk_save(labels):
         """Bulk save labels."""
         BulkSaveModel.bulk_save(Label, labels)
 
+    @staticmethod
+    def get_node_id(gh_label):
+        """Get node ID from GitHub label."""
+        return gh_label.raw_data.get("node_id", "")
+
     @staticmethod
     def update_data(gh_label, save=True):
         """Update label data.

backend/apps/github/models/managers/repository_contributor.py

@@ -10,10 +10,12 @@ class RepositoryContributorQuerySet(models.QuerySet):
     """Repository contributor queryset."""
 
     def by_humans(self):
-        """Return human repository contributors only."""
-        return self.filter(user__is_bot=False).exclude(
-            user__login__in=User.get_non_indexable_logins()
-        )
+        """Filter out bots and non-indexable users."""
+        queryset = self.filter(user__is_bot=False)
+        non_indexable_logins = User.get_non_indexable_logins()
+        if non_indexable_logins:
+            queryset = queryset.exclude(user__login__in=non_indexable_logins)
+        return queryset
 
     def to_community_repositories(self):
         """Return community repositories contributors only."""

backend/apps/slack/commands/chapters.py

@@ -6,7 +6,6 @@
 from apps.slack.apps import SlackConfig
 from apps.slack.blocks import markdown
 from apps.slack.common.constants import COMMAND_HELP, COMMAND_START
-from apps.slack.common.handlers.chapters import get_blocks
 from apps.slack.common.presentation import EntityPresentation
 from apps.slack.utils import get_text
 
@@ -38,6 +37,8 @@ def chapters_handler(ack, command, client):
             ),
         ]
     else:
+        from apps.slack.common.handlers.chapters import get_blocks
+
         search_query = "" if command_text in COMMAND_START else command_text
         blocks = get_blocks(
             search_query=search_query,

backend/apps/slack/commands/committees.py

@@ -3,7 +3,6 @@
 from django.conf import settings
 
 from apps.slack.apps import SlackConfig
-from apps.slack.common.handlers.committees import get_blocks
 from apps.slack.common.presentation import EntityPresentation
 from apps.slack.utils import get_text
 
@@ -24,6 +23,9 @@ def committees_handler(ack, command, client):
         return
 
     search_query = command["text"].strip()
+
+    from apps.slack.common.handlers.committees import get_blocks
+
     blocks = get_blocks(
         search_query=search_query,
         limit=10,

backend/apps/slack/commands/events.py

@@ -26,7 +26,10 @@ def events_handler(ack, command, client):
 
     events_data = get_events_data()
 
-    valid_events = [event for event in events_data if event.start_date]
+    valid_events = []
+    if events_data:
+        valid_events = [event for event in events_data if event.start_date]
+
     sorted_events = sorted(valid_events, key=lambda x: x.start_date)
 
     categorized_events = {}

backend/apps/slack/models/event.py

@@ -42,14 +42,22 @@ def from_slack(self, context, payload):
 
         command = payload.get("command", "")
         text = payload.get("text", "")
+        self.command = command.lstrip("/")
+
         if command and command == OWASP_COMMAND:
             try:
-                command, *args = text.strip().split()
-                text = " ".join(args)
+                parts = text.strip().split(maxsplit=1)
+                if parts and parts[0]:
+                    self.command = parts[0]
+                    self.text = parts[1] if len(parts) > 1 else ""
+                else:
+                    self.command = OWASP_COMMAND.lstrip("/")
+                    self.text = text
             except ValueError:
-                pass
-        self.command = command.lstrip("/")
-        self.text = text
+                self.command = OWASP_COMMAND.lstrip("/")
+                self.text = text
+        else:
+            self.text = text
 
         # In this order.
         self.trigger = self.command or payload.get("action_id", "") or payload.get("type", "")

backend/apps/slack/utils.py

@@ -190,32 +190,33 @@ def get_text(blocks):
                 if "text" in block and block["text"].get("type") == "mrkdwn":
                     text.append(strip_markdown(block["text"]["text"]))
                 elif "fields" in block:
-                    text.append(
-                        NL.join(
-                            strip_markdown(field["text"])
-                            for field in block["fields"]
-                            if field.get("type") == "mrkdwn"
-                        )
-                    )
+                    field_texts = [
+                        strip_markdown(field["text"])
+                        for field in block["fields"]
+                        if field.get("type") == "mrkdwn"
+                    ]
+                    if field_texts:
+                        text.append(NL.join(field_texts))
             case "divider":
                 text.append("---")
             case "context":
-                text.append(
-                    NL.join(
-                        strip_markdown(element["text"])
-                        for element in block["elements"]
-                        if element.get("type") == "mrkdwn"
-                    )
-                )
+                context_texts = [
+                    strip_markdown(element["text"])
+                    for element in block.get("elements", [])
+                    if element.get("type") == "mrkdwn" and "text" in element
+                ]
+                if context_texts:
+                    text.append(NL.join(context_texts))
             case "actions":
-                text.append(
-                    NL.join(
-                        strip_markdown(element["text"]["text"])
-                        for element in block["elements"]
-                        if element.get("type") == "button"
-                    )
-                )
-            # TODO(arkid15r): consider removing this.
+                button_texts = [
+                    strip_markdown(element["text"]["text"])
+                    for element in block.get("elements", [])
+                    if element.get("type") == "button"
+                    and "text" in element
+                    and "text" in element["text"]
+                ]
+                if button_texts:
+                    text.append(NL.join(button_texts))
             case "image":
                 text.append(f"Image: {block.get('image_url', '')}")
             case "header":
@@ -236,4 +237,5 @@ def strip_markdown(text):
 
     """
     slack_link_pattern = re.compile(r"<(https?://[^|]+)\|([^>]+)>")
-    return slack_link_pattern.sub(r"\2 (\1)", text).replace("*", "")
+    text = slack_link_pattern.sub(r"\2 (\1)", text)
+    return text.replace("*", "")