Skip to content

Update bookmark updated at to check if sync was run #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2024
Merged

Update bookmark updated at to check if sync was run #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions backend/analytics_server/mhq/service/code/sync/etl_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions backend/analytics_server/mhq/service/incidents/sync/etl_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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:
Expand All @@ -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
)
Expand Down
2 changes: 2 additions & 0 deletions backend/analytics_server/mhq/service/merge_to_deploy_broker/mtd_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
)
Expand Down
1 change: 1 addition & 0 deletions backend/analytics_server/mhq/service/workflows/sync/etl_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down