Refactor calendar sync to prioritize oldest synced employees with human-readable timestamps

This commit is contained in:
root
2025-10-26 08:58:48 +00:00
parent b18e770f12
commit 96eabe3db6
4 changed files with 59 additions and 26 deletions

View File

@@ -1,5 +1,8 @@
import json
import redis
import math
import time
from datetime import datetime
from config import Config
from services.advoware import AdvowareAPI
from .calendar_sync_utils import get_redis_client, get_advoware_employees, set_employee_lock
@@ -7,7 +10,7 @@ from .calendar_sync_utils import get_redis_client, get_advoware_employees, set_e
config = {
'type': 'event',
'name': 'Calendar Sync All Step',
'description': 'Nimmt sync-all Event auf und emittiert individuelle Events für jeden Mitarbeiter',
'description': 'Nimmt sync-all Event auf und emittiert individuelle Events für die ältesten Mitarbeiter',
'subscribes': ['calendar_sync_all'],
'emits': ['calendar_sync_employee'],
'flows': ['advoware']
@@ -16,7 +19,7 @@ config = {
async def handler(event_data, context):
try:
triggered_by = event_data.get('triggered_by', 'unknown')
context.logger.info(f"Calendar Sync All: Starting to emit events for all employees, triggered by {triggered_by}")
context.logger.info(f"Calendar Sync All: Starting to emit events for oldest employees, triggered by {triggered_by}")
# Initialize Advoware API
advoware = AdvowareAPI(context)
@@ -27,22 +30,40 @@ async def handler(event_data, context):
context.logger.error("Keine Mitarbeiter gefunden. All-Sync abgebrochen.")
return {'status': 500, 'body': {'error': 'Keine Mitarbeiter gefunden'}}
# Emit event for each employee
redis_client = get_redis_client(context)
# Collect last_synced timestamps
employee_timestamps = {}
for employee in employees:
kuerzel = employee.get('kuerzel')
if not kuerzel:
context.logger.warning(f"Mitarbeiter ohne Kürzel übersprungen: {employee}")
continue
employee_last_synced_key = f'calendar_sync_last_synced_{kuerzel}'
timestamp_str = redis_client.get(employee_last_synced_key)
timestamp = int(timestamp_str) if timestamp_str else 0 # 0 if no timestamp (very old)
employee_timestamps[kuerzel] = timestamp
# # DEBUG: Nur für konfigurierte Nutzer syncen
# if kuerzel not in Config.CALENDAR_SYNC_DEBUG_KUERZEL:
# context.logger.info(f"DEBUG: Überspringe {kuerzel}, nur {Config.CALENDAR_SYNC_DEBUG_KUERZEL} werden gesynct")
# continue
# Sort employees by last_synced (ascending, oldest first), then by kuerzel alphabetically
sorted_kuerzel = sorted(employee_timestamps.keys(), key=lambda k: (employee_timestamps[k], k))
# Log the sorted list with timestamps
def format_timestamp(ts):
if ts == 0:
return "never"
return datetime.fromtimestamp(ts).strftime('%Y-%m-%d %H:%M:%S')
sorted_list_str = ", ".join(f"{k} ({format_timestamp(employee_timestamps[k])})" for k in sorted_kuerzel)
context.logger.info(f"Calendar Sync All: Sorted employees by last synced: {sorted_list_str}")
# Calculate number to sync: ceil(N / 10)
num_to_sync = math.ceil(len(sorted_kuerzel) / 10)
context.logger.info(f"Calendar Sync All: Total employees {len(sorted_kuerzel)}, syncing {num_to_sync} oldest")
# Emit for the oldest num_to_sync employees, if not locked
emitted_count = 0
for kuerzel in sorted_kuerzel[:num_to_sync]:
employee_lock_key = f'calendar_sync_lock_{kuerzel}'
redis_client = get_redis_client(context)
if not set_employee_lock(redis_client, kuerzel, triggered_by, context):
context.logger.info(f"Calendar Sync All: Sync bereits aktiv für {kuerzel}, überspringe")
continue
@@ -55,12 +76,14 @@ async def handler(event_data, context):
"triggered_by": triggered_by
}
})
context.logger.info(f"Calendar Sync All: Emitted event for employee {kuerzel}")
context.logger.info(f"Calendar Sync All: Emitted event for employee {kuerzel} (last synced: {format_timestamp(employee_timestamps[kuerzel])})")
emitted_count += 1
context.logger.info("Calendar Sync All: Completed emitting events for employees")
context.logger.info(f"Calendar Sync All: Completed, emitted {emitted_count} events")
return {
'status': 'completed',
'triggered_by': triggered_by
'triggered_by': triggered_by,
'emitted_count': emitted_count
}
except Exception as e: