add initial reindexing statuses

Author: CarsonDavis

sde_collections/admin.py

@@ -10,7 +10,7 @@
 )
 
 from .models.candidate_url import CandidateURL, ResolvedTitle
-from .models.collection import Collection, WorkflowHistory
+from .models.collection import Collection, ReindexingHistory, WorkflowHistory
 from .models.delta_url import CuratedUrl, DeltaUrl, DumpUrl
 from .models.pattern import DivisionPattern, IncludePattern, TitlePattern
 from .tasks import fetch_and_replace_full_text, import_candidate_urls_from_api
@@ -215,6 +215,7 @@ class CollectionAdmin(admin.ModelAdmin, ExportCsvMixin, UpdateConfigMixin):
                     "source",
                     "turned_on",
                     "is_multi_division",
+                    "reindexing_status",
                 ),
             },
         ),
@@ -248,9 +249,17 @@ class CollectionAdmin(admin.ModelAdmin, ExportCsvMixin, UpdateConfigMixin):
         "division",
         "new_collection",
         "is_multi_division",
+        "reindexing_status",
     )
     readonly_fields = ("config_folder",)
-    list_filter = ("division", "curation_status", "workflow_status", "turned_on", "is_multi_division")
+    list_filter = (
+        "division",
+        "curation_status",
+        "workflow_status",
+        "turned_on",
+        "is_multi_division",
+        "reindexing_status",
+    )
     search_fields = ("name", "url", "config_folder")
     actions = [
         generate_deployment_message,
@@ -310,6 +319,12 @@ class WorkflowHistoryAdmin(admin.ModelAdmin):
     list_filter = ["workflow_status", "old_status"]
 
 
+class ReindexingHistoryAdmin(admin.ModelAdmin):
+    list_display = ("collection", "old_status", "reindexing_status", "created_at")
+    search_fields = ["collection__name"]
+    list_filter = ["reindexing_status", "old_status"]
+
+
 class ResolvedTitleAdmin(admin.ModelAdmin):
     list_display = ["title_pattern", "candidate_url", "resolved_title", "created_at"]
 
@@ -365,6 +380,7 @@ class CuratedUrlAdmin(admin.ModelAdmin):
     list_filter = ("collection",)
 
 
+admin.site.register(ReindexingHistory, ReindexingHistoryAdmin)
 admin.site.register(WorkflowHistory, WorkflowHistoryAdmin)
 admin.site.register(CandidateURL, CandidateURLAdmin)
 admin.site.register(TitlePattern, TitlePatternAdmin)

sde_collections/models/collection.py

@@ -23,6 +23,7 @@
     CurationStatusChoices,
     Divisions,
     DocumentTypes,
+    ReindexingStatusChoices,
     SourceChoices,
     UpdateFrequencies,
     WorkflowStatusChoices,
@@ -75,6 +76,11 @@ class Collection(models.Model):
         choices=WorkflowStatusChoices.choices,
         default=WorkflowStatusChoices.RESEARCH_IN_PROGRESS,
     )
+    reindexing_status = models.IntegerField(
+        choices=ReindexingStatusChoices.choices,
+        default=ReindexingStatusChoices.REINDEXING_NOT_NEEDED,
+        verbose_name="Reindexing Status",
+    )
     tracker = FieldTracker(fields=["workflow_status"])
 
     curated_by = models.ForeignKey(User, on_delete=models.DO_NOTHING, null=True, blank=True)
@@ -155,6 +161,12 @@ def migrate_dump_to_delta(self):
         # self.refresh_url_lists_for_all_patterns() # TODO: I'm pretty confident we shouldn't be running this
         self.apply_all_patterns()
 
+        # After migrating, check if we should update reindexing status
+        curated_urls_count = self.curated_urls.count()
+        if curated_urls_count > 0:
+            self.reindexing_status = ReindexingStatusChoices.REINDEXING_READY_FOR_CURATION
+            self.save()
+
     def create_or_update_delta_url(self, url_instance, to_delete=False):
         """
         Creates or updates a DeltaUrl entry based on the given DumpUrl or CuratedUrl object.
@@ -224,6 +236,12 @@ def promote_to_curated(self):
         # Step 4: Reapply patterns to DeltaUrls
         self.refresh_url_lists_for_all_patterns()
 
+        # After promoting, check if we should update reindexing status
+        curated_urls_count = self.curated_urls.count()
+        if curated_urls_count > 0:
+            self.reindexing_status = ReindexingStatusChoices.REINDEXING_CURATED
+            self.save()
+
     def add_to_public_query(self):
         """Add the collection to the public query."""
         if self.workflow_status not in [
@@ -349,6 +367,18 @@ def workflow_status_button_color(self) -> str:
         }
         return color_choices[self.workflow_status]
 
+    @property
+    def reindexing_status_button_color(self) -> str:
+        color_choices = {
+            1: "btn-light",  # NOT_NEEDED
+            2: "btn-warning",  # NEEDED
+            3: "btn-secondary",  # FINISHED
+            4: "btn-info",  # READY_FOR_CURATION
+            5: "btn-primary",  # CURATED
+            6: "btn-success",  # INDEXED_ON_PROD
+        }
+        return color_choices[self.reindexing_status]
+
     def _process_exclude_list(self):
         """Process the exclude list."""
         return [pattern._process_match_pattern() for pattern in self.excludepattern.all()]
@@ -654,6 +684,7 @@ def __init__(self, *args, **kwargs):
         # Create a cached version of the last workflow_status to compare against
         super().__init__(*args, **kwargs)
         self.old_workflow_status = self.workflow_status
+        self.old_reindexing_status = self.reindexing_status
 
 
 class RequiredUrls(models.Model):
@@ -734,6 +765,40 @@ def log_workflow_history(sender, instance, created, **kwargs):
             old_status=instance.old_workflow_status,
         )
 
+    if instance.reindexing_status != instance.old_reindexing_status:
+        ReindexingHistory.objects.create(
+            collection=instance,
+            reindexing_status=instance.reindexing_status,
+            curated_by=instance.curated_by,
+            old_status=instance.old_reindexing_status,
+        )
+
+
+class ReindexingHistory(models.Model):
+    collection = models.ForeignKey(Collection, on_delete=models.CASCADE, related_name="reindexing_history", null=True)
+    reindexing_status = models.IntegerField(
+        choices=ReindexingStatusChoices.choices,
+        default=ReindexingStatusChoices.REINDEXING_NOT_NEEDED,
+    )
+    old_status = models.IntegerField(choices=ReindexingStatusChoices.choices, null=True)
+    curated_by = models.ForeignKey(User, on_delete=models.DO_NOTHING, null=True, blank=True)
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return str(self.collection) + str(self.reindexing_status)
+
+    @property
+    def reindexing_status_button_color(self) -> str:
+        color_choices = {
+            1: "btn-light",  # REINDEXING_NOT_NEEDED
+            2: "btn-warning",  # REINDEXING_NEEDED_ON_DEV
+            3: "btn-secondary",  # REINDEXING_FINISHED_ON_DEV
+            4: "btn-info",  # REINDEXING_READY_FOR_CURATION
+            5: "btn-primary",  # REINDEXING_CURATED
+            6: "btn-success",  # REINDEXING_INDEXED_ON_PROD
+        }
+        return color_choices[self.reindexing_status]
+
 
 @receiver(post_save, sender=Collection)
 def create_configs_on_status_change(sender, instance, created, **kwargs):

sde_collections/models/collection_choice_fields.py

@@ -97,3 +97,19 @@ class WorkflowStatusChoices(models.IntegerChoices):
     PROD_MAJOR = 16, "Prod: Major Issues"
     MERGE_PENDING = 17, "Code Merge Pending"
     NEEDS_DELETE = 19, "Delete from Prod"
+
+
+class ReindexingStatusChoices(models.IntegerChoices):
+    REINDEXING_NOT_NEEDED = 1, "Reindexing Not Needed"
+    REINDEXING_NEEDED_ON_DEV = 2, "Reindexing Needed on LRM Dev"
+    REINDEXING_FINISHED_ON_DEV = 3, "Reindexing Finished on LRM Dev"
+    REINDEXING_READY_FOR_CURATION = 4, "Ready for Curation"
+    REINDEXING_CURATED = 5, "Curated"
+    REINDEXING_INDEXED_ON_PROD = 6, "Indexed on Prod"
+
+    @classmethod
+    def get_status_string(cls, value):
+        for choice in cls.choices:
+            if choice[0] == value:
+                return choice[1]
+        return "N/A"