Merge branch 'main' into Improve-NestBot-/users-command

Author: Naveen-Pal

.github/labeler.yml

@@ -31,7 +31,7 @@ docker:
           - 'docker-*.yaml'
           - '**/Dockerfile.*'
 
-documentation:
+docs:
   - changed-files:
       - any-glob-to-any-file:
           - '**/*.md'
@@ -67,11 +67,12 @@ nginx:
           - 'nginx/**'
 
 schema:
-  - changed-files:
-      - any-glob-to-any-file:
-          - 'schema/**'
-      - all-globs-to-all-files:
-          - '!schema/tests/**'
+  - all:
+    - changed-files:
+        - any-glob-to-any-file:
+            - 'schema/**'
+        - all-globs-to-all-files:
+            - '!schema/tests/**'
 
 schema-tests:
   - changed-files:

.pre-commit-config.yaml

@@ -34,8 +34,3 @@ repos:
         entry: djlint --reformat
         types:
           - html
-
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort

CONTRIBUTING.md

@@ -106,7 +106,7 @@ Follow these steps to set up the OWASP Nest application:
       ```
 
     - Leave this terminal session running and wait until you see that [Nest local](http://localhost:8000/api/v1) is responding.
-    - Please note as we use containerazed approach this command must be run in parallel to other Nest commands you may want to use. You need to keep it running in the current terminal and use another terminal session for your work.
+    - Please note as we use containerized approach this command must be run in parallel to other Nest commands you may want to use. You need to keep it running in the current terminal and use another terminal session for your work.
 
 1. **Load Initial Data**:
     - Open a new terminal session and run the following command to populate the database with initial data from fixtures:
@@ -185,7 +185,7 @@ To setup NestBot development environment, follow these steps:
             hostname: <your-static-domain>
       ```
 
-    - Now ngrok is all set, you access your local setup over internet, running the follwing command:
+    - Now ngrok is all set, you access your local setup over internet, running the following command:
 
       ```bash
       ngrok start NestBot

backend/apps/github/graphql/nodes/repository.py

@@ -0,0 +1,27 @@
+"""GitHub repository GraphQL node."""
+
+import graphene
+
+from apps.common.graphql.nodes import BaseNode
+from apps.github.models.repository import Repository
+
+
+class RepositoryNode(BaseNode):
+    """GitHub repository node."""
+
+    url = graphene.String()
+
+    class Meta:
+        model = Repository
+        fields = (
+            "name",
+            "forks_count",
+            "stars_count",
+            "open_issues_count",
+            "subscribers_count",
+            "contributors_count",
+        )
+
+    def resolve_url(self, info):
+        """Resolve URL."""
+        return self.url

backend/apps/github/index/issue.py

@@ -94,4 +94,4 @@ def get_queryset(self):
     @staticmethod
     def update_synonyms():
         """Update synonyms."""
-        return IssueIndex.reindex_synonyms("github", "issues")
+        return IssueIndex.reindex_synonyms("github", "issue")

backend/apps/github/index/synonyms/issues.txt backend/apps/github/index/synonyms/issue.txt

@@ -135,6 +135,11 @@ def top_languages(self):
             if v >= LANGUAGE_PERCENTAGE_THRESHOLD and k.lower() not in IGNORED_LANGUAGES
         )
 
+    @property
+    def url(self):
+        """Return repository URL."""
+        return f"https://github.com/{self.path}"
+
     def from_github(
         self,
         gh_repository,

backend/apps/github/models/repository.py

@@ -48,7 +48,7 @@ class ChapterAdmin(admin.ModelAdmin, GenericEntityAdminMixin):
     search_fields = ("name", "key")
 
 
-class CommetteeAdmin(admin.ModelAdmin):
+class CommitteeAdmin(admin.ModelAdmin):
     autocomplete_fields = ("owasp_repository",)
     search_fields = ("name",)
 
@@ -102,6 +102,6 @@ def custom_field_name(self, obj):
 
 
 admin.site.register(Chapter, ChapterAdmin)
-admin.site.register(Committee, CommetteeAdmin)
+admin.site.register(Committee, CommitteeAdmin)
 admin.site.register(Event, EventAdmin)
 admin.site.register(Project, ProjectAdmin)

backend/apps/owasp/admin.py

@@ -5,6 +5,7 @@
 from apps.common.graphql.nodes import BaseNode
 from apps.github.graphql.nodes.issue import IssueNode
 from apps.github.graphql.nodes.release import ReleaseNode
+from apps.github.graphql.nodes.repository import RepositoryNode
 from apps.owasp.models.project import Project
 
 RECENT_ISSUES_LIMIT = 10
@@ -16,6 +17,7 @@ class ProjectNode(BaseNode):
 
     recent_issues = graphene.List(IssueNode)
     recent_releases = graphene.List(ReleaseNode)
+    repositories = graphene.List(RepositoryNode)
 
     class Meta:
         model = Project
@@ -28,3 +30,7 @@ def resolve_recent_issues(self, info):
     def resolve_recent_releases(self, info):
         """Resolve project recent releases."""
         return self.published_releases.order_by("-published_at")[:RECENT_RELEASES_LIMIT]
+
+    def resolve_repositories(self, info):
+        """Resolve repositories."""
+        return self.repositories.order_by("-pushed_at", "-updated_at")

backend/apps/owasp/graphql/nodes/project.py

@@ -91,7 +91,7 @@ def get_queryset(self):
     @staticmethod
     def update_synonyms():
         """Update synonyms."""
-        return ProjectIndex.reindex_synonyms("owasp", "projects")
+        return ProjectIndex.reindex_synonyms("owasp", "project")
 
     @staticmethod
     def configure_replicas():

backend/apps/owasp/index/project.py

@@ -11,7 +11,7 @@
 from apps.common.utils import join_values
 from apps.core.models.prompt import Prompt
 from apps.owasp.models.common import GenericEntityModel, RepositoryBasedEntityModel
-from apps.owasp.models.managers.chapter import ActiveChaptertManager
+from apps.owasp.models.managers.chapter import ActiveChapterManager
 from apps.owasp.models.mixins.chapter import ChapterIndexMixin
 
 
@@ -25,7 +25,7 @@ class Chapter(
     """Chapter model."""
 
     objects = models.Manager()
-    active_chapters = ActiveChaptertManager()
+    active_chapters = ActiveChapterManager()
 
     class Meta:
         db_table = "owasp_chapters"

backend/apps/owasp/index/synonyms/projects.txt backend/apps/owasp/index/synonyms/project.txt

@@ -1,4 +1,4 @@
-"""OWASP app commettee model."""
+"""OWASP app committee model."""
 
 from functools import lru_cache
 

backend/apps/owasp/models/chapter.py

@@ -4,7 +4,7 @@
 from django.db.models import Q
 
 
-class ActiveChaptertManager(models.Manager):
+class ActiveChapterManager(models.Manager):
     """Active chapters."""
 
     def get_queryset(self):

backend/apps/owasp/models/committee.py

@@ -230,15 +230,6 @@ def bulk_save(projects, fields=None):
         """Bulk save projects."""
         BulkSaveModel.bulk_save(Project, projects, fields=fields)
 
-    @staticmethod
-    def get_gsoc_projects(year, attributes=None):
-        """Return GSoC projects."""
-        projects = Project.objects.filter(custom_tags__contains=[f"gsoc{year}"])
-        if attributes:
-            projects = projects.values(*attributes)
-
-        return projects
-
     @staticmethod
     def update_data(gh_repository, repository, save=True):
         """Update project data."""

backend/apps/owasp/models/managers/chapter.py

@@ -5,6 +5,7 @@
 from apps.common.constants import NL
 from apps.slack.apps import SlackConfig
 from apps.slack.blocks import markdown
+from apps.slack.utils import get_text
 
 COMMAND = "/board"
 
@@ -21,7 +22,11 @@ def board_handler(ack, command, client):
     ]
 
     conversation = client.conversations_open(users=command["user_id"])
-    client.chat_postMessage(channel=conversation["channel"]["id"], blocks=blocks)
+    client.chat_postMessage(
+        blocks=blocks,
+        channel=conversation["channel"]["id"],
+        text=get_text(blocks),
+    )
 
 
 if SlackConfig.app:

backend/apps/owasp/models/project.py

@@ -8,6 +8,7 @@
 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
 
 COMMAND = "/chapters"
 
@@ -45,7 +46,11 @@ def chapters_handler(ack, command, client):
         )
 
     conversation = client.conversations_open(users=command["user_id"])
-    client.chat_postMessage(channel=conversation["channel"]["id"], blocks=blocks)
+    client.chat_postMessage(
+        channel=conversation["channel"]["id"],
+        blocks=blocks,
+        text=get_text(blocks),
+    )
 
 
 if SlackConfig.app:

backend/apps/slack/commands/board.py

@@ -5,6 +5,7 @@
 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
 
 COMMAND = "/committees"
 
@@ -29,7 +30,11 @@ def committees_handler(ack, command, client):
         ),
     )
     conversation = client.conversations_open(users=command["user_id"])
-    client.chat_postMessage(channel=conversation["channel"]["id"], blocks=blocks)
+    client.chat_postMessage(
+        blocks=blocks,
+        channel=conversation["channel"]["id"],
+        text=get_text(blocks),
+    )
 
 
 if SlackConfig.app:

backend/apps/slack/commands/chapters.py

@@ -5,6 +5,7 @@
 from apps.common.constants import NL
 from apps.slack.apps import SlackConfig
 from apps.slack.blocks import markdown
+from apps.slack.utils import get_text
 
 COMMAND = "/community"
 
@@ -23,7 +24,11 @@ def community_handler(ack, command, client):
     ]
 
     conversation = client.conversations_open(users=command["user_id"])
-    client.chat_postMessage(channel=conversation["channel"]["id"], blocks=blocks)
+    client.chat_postMessage(
+        blocks=blocks,
+        channel=conversation["channel"]["id"],
+        text=get_text(blocks),
+    )
 
 
 if SlackConfig.app:

backend/apps/slack/commands/committees.py

@@ -5,6 +5,7 @@
 from apps.common.constants import NL
 from apps.slack.apps import SlackConfig
 from apps.slack.blocks import markdown
+from apps.slack.utils import get_text
 
 COMMAND = "/contact"
 
@@ -21,7 +22,11 @@ def contact_handler(ack, command, client):
     ]
 
     conversation = client.conversations_open(users=command["user_id"])
-    client.chat_postMessage(channel=conversation["channel"]["id"], blocks=blocks)
+    client.chat_postMessage(
+        blocks=blocks,
+        channel=conversation["channel"]["id"],
+        text=get_text(blocks),
+    )
 
 
 if SlackConfig.app:

backend/apps/slack/commands/community.py

@@ -8,6 +8,7 @@
 from apps.slack.common.constants import COMMAND_HELP, COMMAND_START
 from apps.slack.common.handlers.contribute import get_blocks
 from apps.slack.common.presentation import EntityPresentation
+from apps.slack.utils import get_text
 
 COMMAND = "/contribute"
 
@@ -44,7 +45,11 @@ def contribute_handler(ack, command, client):
         )
 
     conversation = client.conversations_open(users=command["user_id"])
-    client.chat_postMessage(channel=conversation["channel"]["id"], blocks=blocks)
+    client.chat_postMessage(
+        channel=conversation["channel"]["id"],
+        blocks=blocks,
+        text=get_text(blocks),
+    )
 
 
 if SlackConfig.app:

backend/apps/slack/commands/contact.py

@@ -5,6 +5,7 @@
 from apps.common.constants import NL, OWASP_WEBSITE_URL
 from apps.slack.apps import SlackConfig
 from apps.slack.blocks import markdown
+from apps.slack.utils import get_text
 
 COMMAND = "/donate"
 
@@ -39,7 +40,11 @@ def donate_handler(ack, command, client):
     ]
 
     conversation = client.conversations_open(users=command["user_id"])
-    client.chat_postMessage(channel=conversation["channel"]["id"], blocks=blocks)
+    client.chat_postMessage(
+        blocks=blocks,
+        channel=conversation["channel"]["id"],
+        text=get_text(blocks),
+    )
 
 
 if SlackConfig.app:

backend/apps/slack/commands/contribute.py

@@ -5,6 +5,7 @@
 from apps.common.constants import NL
 from apps.slack.apps import SlackConfig
 from apps.slack.blocks import markdown
+from apps.slack.utils import get_text
 
 COMMAND = "/events"
 
@@ -21,7 +22,11 @@ def events_handler(ack, command, client):
     ]
 
     conversation = client.conversations_open(users=command["user_id"])
-    client.chat_postMessage(channel=conversation["channel"]["id"], blocks=blocks)
+    client.chat_postMessage(
+        blocks=blocks,
+        channel=conversation["channel"]["id"],
+        text=get_text(blocks),
+    )
 
 
 if SlackConfig.app: