Made Inactive and archived entities to indexable

backend/apps/github/index/repository.py

@@ -32,11 +32,13 @@ class RepositoryIndex(AlgoliaIndex, IndexBase):
         "idx_subscribers_count",
         "idx_top_contributors",
         "idx_topics",
+        "idx_is_archived",
     )
 
     settings = {
         "minProximity": 4,
         "customRanking": [
+            "asc(idx_is_archived)",
             "desc(idx_stars_count)",
             "desc(idx_forks_count)",
             "desc(idx_pushed_at)",

backend/apps/github/models/mixins/repository.py

@@ -115,3 +115,8 @@ def idx_top_contributors(self):
     def idx_topics(self):
         """Return topics for indexing."""
         return self.topics
+
+    @property
+    def idx_is_archived(self):
+        """Return URL for indexing."""
+        return self.is_archived

backend/apps/github/models/repository.py

@@ -104,12 +104,7 @@ def __str__(self):
     @property
     def is_indexable(self):
         """Repositories to index."""
-        return (
-            not self.is_archived
-            and not self.is_empty
-            and not self.is_template
-            and self.project_set.exists()
-        )
+        return not self.is_empty and not self.is_template and self.project_set.exists()
 
     @property
     def latest_release(self):

backend/apps/owasp/index/chapter.py

@@ -28,6 +28,8 @@ class ChapterIndex(AlgoliaIndex):
         "idx_tags",
         "idx_updated_at",
         "idx_url",
+        "idx_is_active",
+        "idx_is_chapter_archived",
     )
 
     geo_field = "idx_geo_location"
@@ -41,6 +43,8 @@ class ChapterIndex(AlgoliaIndex):
         ],
         "indexLanguages": ["en"],
         "customRanking": [
+            "desc(idx_is_active)",
+            "asc(idx_is_chapter_archived)",
             "asc(idx_created_at)",
             "desc(idx_updated_at)",
         ],

backend/apps/owasp/index/project.py

@@ -40,6 +40,7 @@ class ProjectIndex(AlgoliaIndex, IndexBase):
         "idx_type",
         "idx_updated_at",
         "idx_url",
+        "idx_is_active",
     )
 
     settings = {
@@ -51,6 +52,7 @@ class ProjectIndex(AlgoliaIndex, IndexBase):
         ],
         "indexLanguages": ["en"],
         "customRanking": [
+            "desc(idx_is_active)",
             "desc(idx_level_raw)",
             "desc(idx_stars_count)",
             "desc(idx_contributors_count)",

backend/apps/owasp/models/chapter.py

@@ -72,11 +72,9 @@ def active_chapters_count():
     def is_indexable(self):
         """Chapters to index."""
         return (
-            self.is_active
-            and self.latitude is not None
+            self.latitude is not None
             and self.longitude is not None
             and not self.owasp_repository.is_empty
-            and not self.owasp_repository.is_archived
         )
 
     def from_github(self, repository):
@@ -114,9 +112,6 @@ def generate_geo_location(self):
 
     def generate_suggested_location(self, open_ai=None, max_tokens=100):
         """Generate project summary."""
-        if not self.is_active:
-            return
-
         if not (prompt := Prompt.get_owasp_chapter_suggested_location()):
             return
 

backend/apps/owasp/models/common.py

@@ -52,7 +52,7 @@ class Meta:
     @property
     def is_indexable(self):
         """Entities to index."""
-        return self.is_active and self.has_active_repositories
+        return self.has_active_repositories
 
     @property
     def github_url(self):
@@ -105,7 +105,7 @@ def from_github(self, field_mapping, repository):
 
     def generate_summary(self, prompt, open_ai=None, max_tokens=500):
         """Generate entity summary."""
-        if not self.is_active or not prompt:
+        if not prompt:
             return
 
         open_ai = open_ai or OpenAi()

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

@@ -12,10 +12,8 @@ def get_queryset(self):
         return (
             super()
             .get_queryset()
-            .filter(is_active=True)
             .select_related("owasp_repository")
             .filter(
-                owasp_repository__is_archived=False,
                 owasp_repository__is_empty=False,
             )
         )

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

@@ -60,3 +60,13 @@ def idx_top_contributors(self):
     def idx_updated_at(self):
         """Return updated at for indexing."""
         return (self.updated_at or self.owasp_repository.updated_at).timestamp()
+
+    @property
+    def idx_is_active(self):
+        """Return URL for indexing."""
+        return self.is_active
+
+    @property
+    def idx_is_chapter_archived(self):
+        """Return URL for indexing."""
+        return self.owasp_repository.is_archived

backend/apps/owasp/models/mixins/project.py

@@ -160,4 +160,11 @@ def idx_type(self):
     @property
     def idx_updated_at(self):
         """Return updated at for indexing."""
+        if not self.updated_at:
+            return None
         return self.updated_at.timestamp()
+
+    @property
+    def idx_is_active(self):
+        """Return URL for indexing."""
+        return self.is_active

backend/apps/owasp/models/project.py

@@ -142,7 +142,7 @@ def is_tool_type(self):
     @property
     def is_indexable(self):
         """Projects to index."""
-        return self.is_active and self.has_active_repositories
+        return self.has_active_repositories
 
     @property
     def nest_key(self):

backend/tests/owasp/models/chapter_tests.py

@@ -85,16 +85,10 @@ def test_generate_suggested_location(
 
         assert chapter.suggested_location == (expected_location or "")
 
-        if is_active:
-            mock_open_ai.set_input.assert_called_once_with(geo_string)
-            mock_open_ai.set_max_tokens.assert_called_once_with(100)
-            mock_open_ai.set_prompt.assert_called_once_with("Tell me the location")
-            mock_open_ai.complete.assert_called_once()
-        else:
-            mock_open_ai.set_input.assert_not_called()
-            mock_open_ai.set_max_tokens.assert_not_called()
-            mock_open_ai.set_prompt.assert_not_called()
-            mock_open_ai.complete.assert_not_called()
+        mock_open_ai.set_input.assert_called_once_with(geo_string)
+        mock_open_ai.set_max_tokens.assert_called_once_with(100)
+        mock_open_ai.set_prompt.assert_called_once_with("Tell me the location")
+        mock_open_ai.complete.assert_called_once()
 
     @pytest.mark.parametrize(
         ("name", "key", "expected_str"),

backend/tests/owasp/models/common_tests.py

@@ -13,17 +13,14 @@ class Meta:
 
 class TestRepositoryBasedEntityModel:
     @pytest.mark.parametrize(
-        ("is_active", "has_active_repositories", "expected"),
+        ("has_active_repositories", "expected"),
         [
-            (True, True, True),
-            (True, False, False),
-            (False, True, False),
-            (False, False, False),
+            (True, True),
+            (False, False),
         ],
     )
-    def test_is_indexable(self, is_active, has_active_repositories, expected):
+    def test_is_indexable(self, has_active_repositories, expected):
         model = EntityModel()
-        model.is_active = is_active
         model.has_active_repositories = has_active_repositories
 
         assert model.is_indexable == expected