Added participants who have expressed interest in a specific issue in issue model .

backend/Makefile

@@ -1,5 +1,6 @@
 include backend/apps/ai/Makefile
 include backend/apps/github/Makefile
+include backend/apps/mentorship/Makefile
 include backend/apps/owasp/Makefile
 include backend/apps/slack/Makefile
 

backend/apps/github/admin/__init__.py

@@ -1,6 +1,7 @@
 """Github app admin."""
 
 from .issue import IssueAdmin
+from .issue_comment import IssueCommentAdmin
 from .label import LabelAdmin
 from .milestone import MilestoneAdmin
 from .organization import OrganizationAdmin

backend/apps/github/admin/issue.py

@@ -23,6 +23,7 @@ class IssueAdmin(admin.ModelAdmin):
     )
     list_filter = (
         "state",
+        "created_at",
         "is_locked",
     )
     search_fields = ("title",)

backend/apps/github/admin/issue_comment.py

@@ -0,0 +1,22 @@
+"""GitHub app Issue model admin."""
+
+from django.contrib import admin
+
+from apps.github.models import IssueComment
+
+
+class IssueCommentAdmin(admin.ModelAdmin):
+    """Admin for IssueComment model."""
+
+    list_display = (
+        "body",
+        "issue",
+        "author",
+        "created_at",
+        "updated_at",
+    )
+    list_filter = ("created_at", "updated_at")
+    search_fields = ("body", "issue__title")
+
+
+admin.site.register(IssueComment, IssueCommentAdmin)

backend/apps/github/common.py

@@ -3,12 +3,14 @@
 from __future__ import annotations
 
 import logging
+from datetime import UTC
 from datetime import timedelta as td
 
 from django.utils import timezone
 from github.GithubException import UnknownObjectException
 
 from apps.github.models.issue import Issue
+from apps.github.models.issue_comment import IssueComment
 from apps.github.models.label import Label
 from apps.github.models.milestone import Milestone
 from apps.github.models.organization import Organization
@@ -147,8 +149,6 @@ def sync_repository(
                         issue.labels.add(Label.update_data(gh_issue_label))
                     except UnknownObjectException:
                         logger.exception("Couldn't get GitHub issue label %s", issue.url)
-        else:
-            logger.info("Skipping issues sync for %s", repository.name)
 
         # GitHub repository pull requests.
         kwargs = {
@@ -227,3 +227,90 @@ def sync_repository(
     )
 
     return organization, repository
+
+
+def sync_issue_comments(gh_app, issue: Issue):
+    """Sync new comments for a mentorship program specific issue on-demand.
+
+    Args:
+        gh_app (Github): An authenticated PyGithub instance.
+        issue (Issue): The local database Issue object to sync comments for.
+
+    """
+    logger.info("Starting comment sync for issue #%s", issue.number)
+
+    try:
+        repo_full_name = f"{issue.repository.owner.login}/{issue.repository.name}"
+        logger.info("Fetching repository: %s", repo_full_name)
+
+        gh_repo = gh_app.get_repo(repo_full_name)
+        gh_issue = gh_repo.get_issue(number=issue.number)
+
+        last_comment = issue.comments.order_by("-created_at").first()
+        since = None
+
+        if last_comment:
+            # Convert Django datetime to naive datetime for GitHub API
+            since = last_comment.created_at
+            if timezone.is_aware(since):
+                since = timezone.make_naive(since, UTC)
+            logger.info("Found last comment at: %s, fetching newer comments", since)
+        else:
+            logger.info("No existing comments found, fetching all comments")
+
+        existing_github_ids = set(issue.comments.values_list("github_id", flat=True))
+
+        comments_synced = 0
+
+        gh_comments = gh_issue.get_comments(since=since) if since else gh_issue.get_comments()
+
+        for gh_comment in gh_comments:
+            if gh_comment.id in existing_github_ids:
+                logger.info("Skipping existing comment %s", gh_comment.id)
+                continue
+            if last_comment and gh_comment.created_at <= last_comment.created_at:
+                logger.info("Skipping comment %s - not newer than our last comment", gh_comment.id)
+                continue
+
+            author_obj = User.update_data(gh_comment.user)
+
+            if author_obj:
+                try:
+                    comment_obj = IssueComment.update_data(gh_comment, issue, author_obj)
+                    if comment_obj:
+                        comments_synced += 1
+                        logger.info(
+                            "Synced new comment %s for issue #%s", gh_comment.id, issue.number
+                        )
+                except Exception:
+                    logger.exception(
+                        "Failed to create comment %s for issue #%s",
+                        gh_comment.id,
+                        issue.number,
+                    )
+            else:
+                logger.warning("Could not sync author for comment %s", gh_comment.id)
+
+        if comments_synced > 0:
+            logger.info(
+                "Synced %d new comments for issue #%s in %s",
+                comments_synced,
+                issue.number,
+                issue.repository.name,
+            )
+        else:
+            logger.info("No new comments found for issue #%s", issue.number)
+
+    except UnknownObjectException as e:
+        logger.warning(
+            "Could not access issue #%s in %s/%s. Error: %s",
+            issue.number,
+            issue.repository.owner.login,
+            issue.repository.name,
+            str(e),
+        )
+    except Exception:
+        logger.exception(
+            "An unexpected error occurred during comment sync for issue #%s",
+            issue.number,
+        )

backend/apps/github/migrations/0034_issuecomment.py

@@ -0,0 +1,45 @@
+# Generated by Django 5.2.4 on 2025-08-14 19:16
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("github", "0033_alter_release_published_at"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="IssueComment",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                ("github_id", models.BigIntegerField(unique=True)),
+                ("body", models.TextField()),
+                ("created_at", models.DateTimeField()),
+                ("updated_at", models.DateTimeField()),
+                (
+                    "author",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="issue_comments",
+                        to="github.user",
+                    ),
+                ),
+                (
+                    "issue",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="comments",
+                        to="github.issue",
+                    ),
+                ),
+            ],
+        ),
+    ]

backend/apps/github/models/__init__.py

@@ -1,5 +1,6 @@
 """Github app."""
 
+from .issue_comment import IssueComment
 from .milestone import Milestone
 from .pull_request import PullRequest
 from .user import User

backend/apps/github/models/issue.py

@@ -69,7 +69,6 @@ class Meta:
         related_name="issues",
     )
 
-    # M2Ms.
     assignees = models.ManyToManyField(
         "github.User",
         verbose_name="Assignees",

backend/apps/github/models/issue_comment.py

@@ -0,0 +1,35 @@
+"""GitHub app issue comment model."""
+
+from django.db import models
+
+
+class IssueComment(models.Model):
+    """Represents a comment on a GitHub issue."""
+
+    github_id = models.BigIntegerField(unique=True)
+    issue = models.ForeignKey("github.Issue", on_delete=models.CASCADE, related_name="comments")
+    author = models.ForeignKey(
+        "github.User", on_delete=models.SET_NULL, null=True, related_name="issue_comments"
+    )
+    body = models.TextField()
+    created_at = models.DateTimeField()
+    updated_at = models.DateTimeField()
+
+    @classmethod
+    def update_data(cls, gh_comment, issue_obj, author_obj):
+        """Create or update an IssueComment instance from a GitHub API object."""
+        comment, _ = cls.objects.update_or_create(
+            github_id=gh_comment.id,
+            defaults={
+                "issue": issue_obj,
+                "author": author_obj,
+                "body": gh_comment.body,
+                "created_at": gh_comment.created_at,
+                "updated_at": gh_comment.updated_at,
+            },
+        )
+        return comment
+
+    def __str__(self):
+        """Return a string representation of the issue comment."""
+        return f"{self.issue} - {self.author} - {self.body}"

backend/apps/mentorship/Makefile

@@ -0,0 +1,3 @@
+sync_mentorship_issue_comments:
+	@echo "Syncing Github Comments related to issues"
+	@CMD="python manage.py sync_mentorship_issue_comments" $(MAKE) exec-backend-command

backend/apps/mentorship/admin/interested_contributors.py

@@ -0,0 +1,24 @@
+"""Mentorship app interested contributors admin."""
+
+from django.contrib import admin
+
+from apps.mentorship.models import ParticipantInterest
+
+
+class ParticipantInterestAdmin(admin.ModelAdmin):
+    """ParticipantInterest admin."""
+
+    list_display = (
+        "program",
+        "user",
+        "issue",
+    )
+
+    search_fields = (
+        "program__name",
+        "user__username",
+        "issue__title",
+    )
+
+
+admin.site.register(ParticipantInterest, ParticipantInterestAdmin)