From b2047d4b79e3af0f3785021eec6b2eb39000a7b1 Mon Sep 17 00:00:00 2001
From: amoghjalan <amoghjalan2005@gmail.com>
Date: Thu, 25 Apr 2024 12:04:26 +0530
Subject: [PATCH] Update bookmark updated at to check if sync was run

---
 .../analytics_server/mhq/service/code/sync/etl_handler.py    | 2 ++
 .../mhq/service/incidents/sync/etl_handler.py                | 5 +++--
 .../mhq/service/merge_to_deploy_broker/mtd_handler.py        | 2 ++
 .../mhq/service/workflows/sync/etl_handler.py                | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/backend/analytics_server/mhq/service/code/sync/etl_handler.py b/backend/analytics_server/mhq/service/code/sync/etl_handler.py
index 45daf9972..f4a575df9 100644
--- a/backend/analytics_server/mhq/service/code/sync/etl_handler.py
+++ b/backend/analytics_server/mhq/service/code/sync/etl_handler.py
@@ -15,6 +15,7 @@
 from mhq.store.models.code import OrgRepo, BookmarkType, Bookmark, PullRequest
 from mhq.store.repos.code import CodeRepoService
 from mhq.utils.log import LOG
+from mhq.utils.time import time_now
 
 
 class CodeETLHandler:
@@ -68,6 +69,7 @@ def _sync_repo_pull_requests_data(self, org_repo: OrgRepo) -> None:
             bookmark.bookmark = (
                 pull_requests[-1].state_changed_at.astimezone(tz=pytz.UTC).isoformat()
             )
+            bookmark.updated_at = time_now()
             self.code_repo_service.update_org_repo_bookmark(bookmark)
             self.mtd_broker.pushback_merge_to_deploy_bookmark(
                 str(org_repo.id), pull_requests
diff --git a/backend/analytics_server/mhq/service/incidents/sync/etl_handler.py b/backend/analytics_server/mhq/service/incidents/sync/etl_handler.py
index 358455573..12695ca75 100644
--- a/backend/analytics_server/mhq/service/incidents/sync/etl_handler.py
+++ b/backend/analytics_server/mhq/service/incidents/sync/etl_handler.py
@@ -50,7 +50,7 @@ def sync_org_incident_services(self, org_id: str):
 
     def _sync_service_incidents(self, service: OrgIncidentService):
         try:
-            bookmark = self.__get_incidents_bookmark(service)
+            bookmark: IncidentsBookmark = self.__get_incidents_bookmark(service)
             (
                 incidents,
                 incident_org_incident_service_map,
@@ -59,6 +59,7 @@ def _sync_service_incidents(self, service: OrgIncidentService):
             self.incident_repo_service.save_incidents_data(
                 incidents, incident_org_incident_service_map
             )
+            bookmark.updated_at = time_now()
             self.incident_repo_service.save_incidents_bookmark(bookmark)
 
         except Exception as e:
@@ -67,7 +68,7 @@ def _sync_service_incidents(self, service: OrgIncidentService):
 
     def __get_incidents_bookmark(
         self, service: OrgIncidentService, default_sync_days: int = 31
-    ):
+    ) -> IncidentsBookmark:
         bookmark = self.incident_repo_service.get_incidents_bookmark(
             str(service.id), IncidentBookmarkType.SERVICE, self.provider
         )
diff --git a/backend/analytics_server/mhq/service/merge_to_deploy_broker/mtd_handler.py b/backend/analytics_server/mhq/service/merge_to_deploy_broker/mtd_handler.py
index 95779770a..282789c50 100644
--- a/backend/analytics_server/mhq/service/merge_to_deploy_broker/mtd_handler.py
+++ b/backend/analytics_server/mhq/service/merge_to_deploy_broker/mtd_handler.py
@@ -13,6 +13,7 @@
 from mhq.store.repos.code import CodeRepoService
 from mhq.store.repos.workflows import WorkflowRepoService
 from mhq.utils.lock import RedisLockService, get_redis_lock_service
+from mhq.utils.time import time_now
 
 DEPLOYMENTS_TO_PROCESS = 500
 
@@ -84,6 +85,7 @@ def _process_deployments_for_merge_to_deploy_caching(self, repo_id: str):
                 )
                 conducted_at: datetime = repo_workflow_run.conducted_at
                 broker_bookmark.bookmark = conducted_at.isoformat()
+                broker_bookmark.updated_at = time_now()
                 self.code_repo_service.update_merge_to_deploy_broker_bookmark(
                     broker_bookmark
                 )
diff --git a/backend/analytics_server/mhq/service/workflows/sync/etl_handler.py b/backend/analytics_server/mhq/service/workflows/sync/etl_handler.py
index ad990d6d7..db5a15695 100644
--- a/backend/analytics_server/mhq/service/workflows/sync/etl_handler.py
+++ b/backend/analytics_server/mhq/service/workflows/sync/etl_handler.py
@@ -90,6 +90,7 @@ def _sync_repo_workflow(self, org_repo: OrgRepo, repo_workflow: RepoWorkflow):
                 org_repo, repo_workflow, bookmark
             )
             self.workflow_repo_service.save_repo_workflow_runs(repo_workflow_runs)
+            bookmark.updated_at = time_now()
             self.workflow_repo_service.update_repo_workflow_runs_bookmark(bookmark)
         except Exception as e:
             LOG.error(