refactor: extract common functions to utils
- Add get_redis_client() to calendar_sync_utils.py - Add get_advoware_employees() to calendar_sync_utils.py - Add set_employee_lock() and clear_employee_lock() to calendar_sync_utils.py - Update all step files to use shared utility functions - Remove duplicate code across calendar_sync_*.py files
This commit is contained in:
@@ -2,6 +2,7 @@ import json
|
||||
import redis
|
||||
from config import Config
|
||||
from services.advoware import AdvowareAPI
|
||||
from .calendar_sync_utils import get_redis_client, get_advoware_employees, set_employee_lock
|
||||
|
||||
config = {
|
||||
'type': 'event',
|
||||
@@ -12,17 +13,6 @@ config = {
|
||||
'flows': ['advoware']
|
||||
}
|
||||
|
||||
async def get_advoware_employees(context, advoware):
|
||||
"""Fetch list of employees from Advoware."""
|
||||
try:
|
||||
result = await advoware.api_call('api/v1/advonet/Mitarbeiter', method='GET', params={'aktiv': 'true'})
|
||||
employees = result if isinstance(result, list) else []
|
||||
context.logger.info(f"Fetched {len(employees)} Advoware employees")
|
||||
return employees
|
||||
except Exception as e:
|
||||
context.logger.error(f"Failed to fetch Advoware employees: {e}")
|
||||
raise
|
||||
|
||||
async def handler(event_data, context):
|
||||
try:
|
||||
triggered_by = event_data.get('triggered_by', 'unknown')
|
||||
@@ -32,7 +22,7 @@ async def handler(event_data, context):
|
||||
advoware = AdvowareAPI(context)
|
||||
|
||||
# Fetch employees
|
||||
employees = await get_advoware_employees(context, advoware)
|
||||
employees = await get_advoware_employees(advoware, context)
|
||||
if not employees:
|
||||
context.logger.error("Keine Mitarbeiter gefunden. All-Sync abgebrochen.")
|
||||
return {'status': 500, 'body': {'error': 'Keine Mitarbeiter gefunden'}}
|
||||
@@ -51,14 +41,9 @@ async def handler(event_data, context):
|
||||
|
||||
employee_lock_key = f'calendar_sync_lock_{kuerzel}'
|
||||
|
||||
redis_client = redis.Redis(
|
||||
host=Config.REDIS_HOST,
|
||||
port=int(Config.REDIS_PORT),
|
||||
db=int(Config.REDIS_DB_CALENDAR_SYNC),
|
||||
socket_timeout=Config.REDIS_TIMEOUT_SECONDS
|
||||
)
|
||||
redis_client = get_redis_client(context)
|
||||
|
||||
if redis_client.set(employee_lock_key, triggered_by, ex=1800, nx=True) is None:
|
||||
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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user