Resolved as per suggestions

Author: abhayymishraa

backend/apps/github/common.py

@@ -1,7 +1,11 @@
 """GitHub app common module."""
 
 import logging
+import os
+from urllib.parse import urlparse
 
+from django.core.exceptions import ValidationError
+from github import Github
 from github.GithubException import UnknownObjectException
 
 from apps.github.models.issue import Issue
@@ -13,9 +17,64 @@
 from apps.github.models.user import User
 from apps.github.utils import check_owasp_site_repository
 
+INVALID_ISSUE_LINK_FORMAT = "Invalid GitHub issue link format."
+FETCH_ISSUE_ERROR = "Failed to fetch issue from GitHub: {error}"
+MIN_PARTS_LENGTH = 4
+
+
 logger = logging.getLogger(__name__)
 
 
+def sync_issue(issue_link):
+    """Sync GitHub issue data."""
+    try:
+        return Issue.objects.get(url=issue_link)
+    except Issue.DoesNotExist:
+        pass
+
+    parsed_url = urlparse(issue_link)
+    path_parts = parsed_url.path.strip("/").split("/")
+    if len(path_parts) < MIN_PARTS_LENGTH or path_parts[2] != "issues":
+        raise ValidationError(INVALID_ISSUE_LINK_FORMAT)
+
+    github_token = os.getenv("GITHUB_TOKEN")
+    github_client = Github(github_token)
+
+    issue_number = int(path_parts[3])
+    owner = path_parts[0]
+    repo_name = path_parts[1]
+
+    gh_repo = github_client.get_repo(f"{owner}/{repo_name}")
+    gh_issue = gh_repo.get_issue(issue_number)
+    try:
+        author = User.objects.get(login=gh_issue.user.login)
+    except User.DoesNotExist:
+        author = User.update_data(gh_issue.user)
+
+    try:
+        repository = Repository.objects.get(node_id=gh_repo.id)
+    except Repository.DoesNotExist:
+        try:
+            owner = User.objects.get(login=gh_repo.owner.login)
+        except User.DoesNotExist:
+            owner = User.update_data(gh_repo.owner)
+        try:
+            organization = Organization.objects.get(node_id=gh_repo.organization.id)
+        except Organization.DoesNotExist:
+            organization = Organization.update_data(gh_repo.organization)
+
+        repository = Repository.update_data(
+            gh_repository=gh_repo,
+            commits=gh_repo.get_commits(),
+            contributors=gh_repo.get_contributors(),
+            languages=gh_repo.get_languages(),
+            organization=organization,
+            user=owner,
+        )
+
+    return Issue.update_data(gh_issue, author=author, repository=repository)
+
+
 def sync_repository(gh_repository, organization=None, user=None):
     """Sync GitHub repository data."""
     entity_key = gh_repository.name.lower()

backend/apps/github/models/issue.py

@@ -151,7 +151,7 @@ def generate_summary(self, open_ai=None, max_tokens=500):
 
         prompt = (
             Prompt.get_github_issue_documentation_project_summary()
-            if self.project.is_documentation_type
+            if self.project and self.project.is_documentation_type
             else Prompt.get_github_issue_project_summary()
         )
         if not prompt:

backend/apps/nest/constants.py

@@ -0,0 +1,13 @@
+"""Nest app constants."""
+
+ISSUES_INDEX = 5
+GITHUB_COM_INDEX = 2
+MIN_PARTS_LENGTH = 4
+
+DEADLINE_FORMAT_ERROR = "Invalid deadline format. Use YYYY-MM-DD or YYYY-MM-DD HH:MM."
+DEADLINE_FUTURE_ERROR = "Deadline must be in the future."
+FETCH_ISSUE_ERROR = "Failed to fetch issue from GitHub: {error}"
+INVALID_ISSUE_LINK_FORMAT = "Invalid GitHub issue link format."
+ISSUE_LINK_ERROR = "Issue link must belong to an OWASP repository."
+PRICE_POSITIVE_ERROR = "Price must be a positive value."
+PRICE_VALID_ERROR = "Price must be a valid number."

backend/apps/nest/models/sponsorship.py

@@ -1,14 +1,29 @@
 """Nest app sponsorship model."""
 
+from datetime import datetime
+
+from django.core.exceptions import ValidationError
 from django.db import models
+from django.utils import timezone
 
 from apps.common.models import BulkSaveModel, TimestampedModel
 from apps.github.models.issue import Issue
+from apps.nest.constants import (
+    DEADLINE_FORMAT_ERROR,
+    DEADLINE_FUTURE_ERROR,
+    ISSUE_LINK_ERROR,
+    PRICE_POSITIVE_ERROR,
+    PRICE_VALID_ERROR,
+)
 
 
 class Sponsorship(BulkSaveModel, TimestampedModel):
     """Sponsorship model."""
 
+    class Meta:
+        db_table = "nest_sponsorships"
+        verbose_name_plural = "Sponsorships"
+
     deadline_at = models.DateTimeField(null=True, blank=True)
     price_usd = models.FloatField()
     slack_user_id = models.CharField(max_length=100)
@@ -19,10 +34,6 @@ class Sponsorship(BulkSaveModel, TimestampedModel):
         related_name="sponsorships",
     )
 
-    class Meta:
-        db_table = "nest_sponsorships"
-        verbose_name_plural = "Sponsorships"
-
     def __str__(self):
         """Sponsorship human readable representation."""
         return f"Sponsorship for {self.issue.title} by {self.slack_user_id}"
@@ -36,3 +47,43 @@ def update_data(sponsorship, **kwargs):
                 setattr(sponsorship, field, kwargs[field])
         sponsorship.save()
         return sponsorship
+
+    @staticmethod
+    def validate_deadline(deadline_str):
+        """Validate that the deadline is in a valid datetime format."""
+        try:
+            # Try parsing the deadline in YYYY-MM-DD format
+            deadline = datetime.strptime(deadline_str, "%Y-%m-%d").replace(
+                tzinfo=timezone.get_current_timezone()
+            )
+        except ValueError:
+            try:
+                # Try parsing the deadline in YYYY-MM-DD HH:MM format
+                deadline = datetime.strptime(deadline_str, "%Y-%m-%d %H:%M").replace(
+                    tzinfo=timezone.get_current_timezone()
+                )
+            except ValueError as e:
+                raise ValidationError(DEADLINE_FORMAT_ERROR) from e
+
+        if deadline < timezone.now():
+            raise ValidationError(DEADLINE_FUTURE_ERROR)
+
+        return deadline
+
+    @staticmethod
+    def validate_github_issue_link(issue_link):
+        """Validate that the issue link belongs to a valid OWASP-related repository."""
+        if not issue_link.startswith("https://github.com/OWASP"):
+            raise ValidationError(ISSUE_LINK_ERROR)
+        return issue_link
+
+    @staticmethod
+    def validate_price(price):
+        """Validate that the price is a positive float value."""
+        try:
+            price = float(price)
+            if price <= 0:
+                raise ValidationError(PRICE_POSITIVE_ERROR)
+        except ValueError as e:
+            raise ValidationError(PRICE_VALID_ERROR) from e
+        return price

backend/apps/slack/commands/sponsor.py

@@ -8,13 +8,7 @@
 
 from apps.common.constants import NL
 from apps.slack.apps import SlackConfig
-from apps.slack.utils import (
-    get_or_create_issue,
-    get_text,
-    validate_deadline,
-    validate_github_issue_link,
-    validate_price,
-)
+from apps.slack.utils import get_text
 
 logger = logging.getLogger(__name__)
 
@@ -30,6 +24,7 @@
 
 def sponsor_handler(ack, command, client):
     """Slack /sponsor command handler."""
+    from apps.github.common import sync_issue
     from apps.nest.models.sponsorship import Sponsorship
 
     ack()
@@ -56,12 +51,12 @@ def validate_command_format(parts):
                 if len(parts) > TIME_INDEX:
                     deadline_str += " " + parts[TIME_INDEX]
 
-            validate_github_issue_link(issue_link)
-            validated_price = validate_price(price)
-            deadline = validate_deadline(deadline_str) if deadline_str else None
+            Sponsorship.validate_github_issue_link(issue_link)
+            validated_price = Sponsorship.validate_price(price)
+            deadline = Sponsorship.validate_deadline(deadline_str) if deadline_str else None
 
             with transaction.atomic():
-                issue = get_or_create_issue(issue_link)
+                issue = sync_issue(issue_link)
                 sponsorship, created = Sponsorship.objects.get_or_create(
                     issue=issue,
                     defaults={

backend/apps/slack/utils.py

@@ -2,17 +2,12 @@
 
 import logging
 import re
-from datetime import datetime
 from functools import lru_cache
 from html import escape as escape_html
 from urllib.parse import urljoin
 
 import requests
 import yaml
-from django.conf import settings
-from django.core.exceptions import ValidationError
-from django.utils import timezone
-from github import Github
 from lxml import html
 from requests.exceptions import RequestException
 
@@ -21,19 +16,6 @@
 logger = logging.getLogger(__name__)
 
 
-ISSUES_INDEX = 5
-GITHUB_COM_INDEX = 2
-MIN_PARTS_LENGTH = 4
-
-DEADLINE_FORMAT_ERROR = "Invalid deadline format. Use YYYY-MM-DD or YYYY-MM-DD HH:MM."
-DEADLINE_FUTURE_ERROR = "Deadline must be in the future."
-FETCH_ISSUE_ERROR = "Failed to fetch issue from GitHub: {error}"
-INVALID_ISSUE_LINK_FORMAT = "Invalid GitHub issue link format."
-ISSUE_LINK_ERROR = "Issue link must belong to an OWASP repository."
-PRICE_POSITIVE_ERROR = "Price must be a positive value."
-PRICE_VALID_ERROR = "Price must be a valid number."
-
-
 def escape(content):
     """Escape HTML content."""
     return escape_html(content, quote=False)
@@ -83,48 +65,6 @@ def get_news_data(limit=10, timeout=30):
     return items
 
 
-def get_or_create_issue(issue_link):
-    """Fetch or create an Issue instance from the GitHub API."""
-    from apps.github.models.issue import Issue
-    from apps.github.models.repository import Repository
-    from apps.github.models.user import User
-
-    logger.info("Fetching or creating issue for link: %s", issue_link)
-
-    # Extract repository owner, repo name, and issue number from the issue link
-    # Example: https://github.com/OWASP/Nest/issues/XYZ
-    parts = issue_link.strip("/").split("/")
-    if (
-        len(parts) < MIN_PARTS_LENGTH
-        or parts[GITHUB_COM_INDEX] != "github.com"
-        or parts[ISSUES_INDEX] != "issues"
-    ):
-        raise ValidationError(INVALID_ISSUE_LINK_FORMAT)
-
-    try:
-        return Issue.objects.get(url=issue_link)
-    except Issue.DoesNotExist:
-        pass
-
-    github_client = Github(settings.GITHUB_TOKEN)
-    issue_number = int(parts[6])
-    owner = parts[3]
-    repo_name = parts[4]
-
-    try:
-        # Fetch the repository and issue from GitHub
-        gh_repo = github_client.get_repo(f"{owner}/{repo_name}")
-        gh_issue = gh_repo.get_issue(issue_number)
-        repository = Repository.objects.get(name=repo_name)
-        author = User.objects.get(login=gh_issue.user.login)
-
-        # Update or create the issue in the database
-        return Issue.update_data(gh_issue, author=author, repository=repository)
-    except Exception as e:
-        logger.exception("Failed to fetch issue from GitHub: %s")
-        raise ValidationError(FETCH_ISSUE_ERROR.format(error=e)) from e
-
-
 @lru_cache
 def get_staff_data(timeout=30):
     """Get staff data."""
@@ -192,43 +132,3 @@ def strip_markdown(text):
     """Strip markdown formatting."""
     slack_link_pattern = re.compile(r"<(https?://[^|]+)\|([^>]+)>")
     return slack_link_pattern.sub(r"\2 (\1)", text).replace("*", "")
-
-
-def validate_deadline(deadline_str):
-    """Validate that the deadline is in a valid datetime format."""
-    try:
-        # Try parsing the deadline in YYYY-MM-DD format
-        deadline = datetime.strptime(deadline_str, "%Y-%m-%d").replace(
-            tzinfo=timezone.get_current_timezone()
-        )
-    except ValueError:
-        try:
-            # Try parsing the deadline in YYYY-MM-DD HH:MM format
-            deadline = datetime.strptime(deadline_str, "%Y-%m-%d %H:%M").replace(
-                tzinfo=timezone.get_current_timezone()
-            )
-        except ValueError as e:
-            raise ValidationError(DEADLINE_FORMAT_ERROR) from e
-
-    if deadline < timezone.now():
-        raise ValidationError(DEADLINE_FUTURE_ERROR)
-
-    return deadline
-
-
-def validate_github_issue_link(issue_link):
-    """Validate that the issue link belongs to a valid OWASP-related repository."""
-    if not issue_link.startswith("https://github.com/OWASP"):
-        raise ValidationError(ISSUE_LINK_ERROR)
-    return issue_link
-
-
-def validate_price(price):
-    """Validate that the price is a positive float value."""
-    try:
-        price = float(price)
-        if price <= 0:
-            raise ValidationError(PRICE_POSITIVE_ERROR)
-    except ValueError as e:
-        raise ValidationError(PRICE_VALID_ERROR) from e
-    return price

backend/settings/base.py

@@ -19,7 +19,6 @@ class Base(Configuration):
 
     ALLOWED_HOSTS = values.ListValue()
     DEBUG = False
-    GITHUB_TOKEN = values.Value(environ_name="GITHUB_TOKEN")
     RELEASE_VERSION = values.Value(environ_name="RELEASE_VERSION")
     SENTRY_DSN = values.SecretValue(environ_name="SENTRY_DSN")
     SITE_NAME = "localhost"