Fix calendar sync issues: correct True/False, limit recurrence to 2 years, add share_google_calendar function
- Fix Python syntax error: change 'true' to 'True' in config.py - Limit recurring events to max 2 years to avoid Google Calendar API limits - Add share_google_calendar function for manual calendar sharing - Update README with calendar sync documentation - Debug mode: limit sync to user AI only
This commit is contained in:
root
@@ -61,7 +61,7 @@ async def get_google_service():
|
||||
logger.error(f"Failed to initialize Google service: {e}")
|
||||
raise
|
||||
|
||||
@backoff.on_exception(backoff.expo, HttpError, max_tries=5, base=5, giveup=lambda e: e.resp.status not in [429, 500, 502, 503, 504])
|
||||
@backoff.on_exception(backoff.expo, HttpError, max_tries=4, base=4, giveup=lambda e: e.resp.status not in [403, 429, 500, 502, 503, 504])
|
||||
async def ensure_google_calendar(service, employee_kuerzel):
|
||||
"""Ensure Google Calendar exists for employee."""
|
||||
calendar_name = f"AW-{employee_kuerzel}"
|
||||
@@ -108,7 +108,7 @@ async def fetch_advoware_appointments(advoware, employee_kuerzel):
|
||||
logger.error(f"Failed to fetch Advoware appointments: {e}")
|
||||
raise
|
||||
|
||||
@backoff.on_exception(backoff.expo, HttpError, max_tries=5, base=5, giveup=lambda e: e.resp.status not in [429, 500, 502, 503, 504])
|
||||
@backoff.on_exception(backoff.expo, HttpError, max_tries=4, base=4, giveup=lambda e: e.resp.status not in [429, 500, 502, 503, 504])
|
||||
async def fetch_google_events(service, calendar_id):
|
||||
"""Fetch Google events in range."""
|
||||
try:
|
||||
@@ -290,7 +290,7 @@ async def delete_advoware_appointment(advoware, frnr):
|
||||
logger.error(f"Failed to delete Advoware appointment {frnr}: {e}")
|
||||
raise
|
||||
|
||||
@backoff.on_exception(backoff.expo, HttpError, max_tries=5, base=5, giveup=lambda e: e.resp.status not in [429, 500, 502, 503, 504])
|
||||
@backoff.on_exception(backoff.expo, HttpError, max_tries=4, base=4, giveup=lambda e: e.resp.status not in [403, 429, 500, 502, 503, 504])
|
||||
async def create_google_event(service, calendar_id, data):
|
||||
"""Create Google event from standardized data."""
|
||||
start_dt = data['start'].astimezone(BERLIN_TZ)
|
||||
@@ -324,7 +324,7 @@ async def create_google_event(service, calendar_id, data):
|
||||
logger.error(f"Failed to create Google event: {e}")
|
||||
raise
|
||||
|
||||
@backoff.on_exception(backoff.expo, HttpError, max_tries=5, base=5, giveup=lambda e: e.resp.status not in [429, 500, 502, 503, 504])
|
||||
@backoff.on_exception(backoff.expo, HttpError, max_tries=4, base=4, giveup=lambda e: e.resp.status not in [403, 429, 500, 502, 503, 504])
|
||||
async def update_google_event(service, calendar_id, event_id, data):
|
||||
"""Update Google event."""
|
||||
start_dt = data['start'].astimezone(BERLIN_TZ)
|
||||
@@ -356,7 +356,7 @@ async def update_google_event(service, calendar_id, event_id, data):
|
||||
logger.error(f"Failed to update Google event {event_id}: {e}")
|
||||
raise
|
||||
|
||||
@backoff.on_exception(backoff.expo, HttpError, max_tries=5, base=5, giveup=lambda e: e.resp.status not in [429, 500, 502, 503, 504])
|
||||
@backoff.on_exception(backoff.expo, HttpError, max_tries=4, base=4, giveup=lambda e: e.resp.status not in [403, 429, 500, 502, 503, 504])
|
||||
async def delete_google_event(service, calendar_id, event_id):
|
||||
"""Delete Google event."""
|
||||
try:
|
||||
@@ -370,14 +370,30 @@ async def delete_google_event(service, calendar_id, event_id):
|
||||
raise
|
||||
|
||||
async def safe_create_advoware_appointment(advoware, data, employee_kuerzel, write_allowed):
|
||||
"""Safe wrapper for creating Advoware appointments with write permission check."""
|
||||
"""Safe wrapper for creating Advoware appointments with write permission check and global protection."""
|
||||
if Config.ADVOWARE_WRITE_PROTECTION:
|
||||
logger.warning("Global write protection active, skipping Advoware create")
|
||||
return None
|
||||
if not write_allowed:
|
||||
logger.warning("Cannot create in Advoware, write not allowed")
|
||||
return None
|
||||
return await create_advoware_appointment(advoware, data, employee_kuerzel)
|
||||
|
||||
async def safe_delete_advoware_appointment(advoware, frnr, write_allowed):
|
||||
"""Safe wrapper for deleting Advoware appointments with write permission check and global protection."""
|
||||
if Config.ADVOWARE_WRITE_PROTECTION:
|
||||
logger.warning("Global write protection active, skipping Advoware delete")
|
||||
return
|
||||
if not write_allowed:
|
||||
logger.warning("Cannot delete in Advoware, write not allowed")
|
||||
return
|
||||
await delete_advoware_appointment(advoware, frnr)
|
||||
|
||||
async def safe_update_advoware_appointment(advoware, frnr, data, write_allowed, employee_kuerzel):
|
||||
"""Safe wrapper for updating Advoware appointments with write permission check."""
|
||||
"""Safe wrapper for updating Advoware appointments with write permission check and global protection."""
|
||||
if Config.ADVOWARE_WRITE_PROTECTION:
|
||||
logger.warning("Global write protection active, skipping Advoware update")
|
||||
return
|
||||
if not write_allowed:
|
||||
logger.warning("Cannot update in Advoware, write not allowed")
|
||||
return
|
||||
@@ -386,7 +402,7 @@ async def safe_update_advoware_appointment(advoware, frnr, data, write_allowed,
|
||||
async def get_advoware_employees(advoware):
|
||||
"""Fetch list of employees from Advoware."""
|
||||
try:
|
||||
result = await advoware.api_call('api/v1/advonet/Anwaelte', method='GET')
|
||||
result = await advoware.api_call('api/v1/advonet/Mitarbeiter', method='GET', params={'aktiv': 'true'})
|
||||
employees = result if isinstance(result, list) else []
|
||||
logger.info(f"Fetched {len(employees)} Advoware employees")
|
||||
return employees
|
||||
@@ -411,7 +427,7 @@ async def handler(event, context):
|
||||
|
||||
total_synced = 0
|
||||
for employee in employees:
|
||||
kuerzel = employee.get('kuerzel') or employee.get('anwalt')
|
||||
kuerzel = employee.get('kuerzel')
|
||||
if not kuerzel:
|
||||
logger.warning(f"Mitarbeiter ohne Kürzel übersprungen: {employee}")
|
||||
continue
|
||||
@@ -425,8 +441,6 @@ async def handler(event, context):
|
||||
socket_timeout=Config.REDIS_TIMEOUT_SECONDS
|
||||
)
|
||||
|
||||
CALENDAR_SYNC_LOCK_KEY = f'calendar_sync_lock_{kuerzel}'
|
||||
|
||||
try:
|
||||
logger.debug("Initializing Google service")
|
||||
service = await get_google_service()
|
||||
@@ -471,6 +485,7 @@ async def handler(event, context):
|
||||
kuerzel, int(frnr), event_id
|
||||
)
|
||||
logger.info(f"Phase 1: Created new from Advoware: frNr {frnr}, event_id {event_id}")
|
||||
await asyncio.sleep(0.1) # Small delay to avoid rate limits
|
||||
except Exception as e:
|
||||
logger.warning(f"Phase 1: Failed to process new Advoware {frnr}: {e}")
|
||||
|
||||
@@ -519,6 +534,7 @@ async def handler(event, context):
|
||||
async with conn.transaction():
|
||||
await conn.execute("UPDATE calendar_sync SET deleted = TRUE, sync_status = 'synced' WHERE sync_id = $1;", row['sync_id'])
|
||||
logger.info(f"Phase 3: Propagated delete to Google for sync_id {row['sync_id']}")
|
||||
await asyncio.sleep(0.1) # Small delay to avoid rate limits
|
||||
except Exception as e:
|
||||
logger.warning(f"Phase 3: Failed to delete Google for sync_id {row['sync_id']}: {e}")
|
||||
async with conn.transaction():
|
||||
@@ -546,6 +562,7 @@ async def handler(event, context):
|
||||
async with conn.transaction():
|
||||
await conn.execute("UPDATE calendar_sync SET deleted = TRUE, sync_status = 'synced' WHERE sync_id = $1;", row['sync_id'])
|
||||
logger.info(f"Phase 3: Propagated delete to Google for sync_id {row['sync_id']}")
|
||||
await asyncio.sleep(0.1) # Small delay to avoid rate limits
|
||||
except Exception as e:
|
||||
logger.warning(f"Phase 3: Failed to delete Google for sync_id {row['sync_id']}: {e}")
|
||||
async with conn.transaction():
|
||||
@@ -557,6 +574,7 @@ async def handler(event, context):
|
||||
async with conn.transaction():
|
||||
await conn.execute("UPDATE calendar_sync SET deleted = TRUE, sync_status = 'synced' WHERE sync_id = $1;", row['sync_id'])
|
||||
logger.info(f"Phase 3: Propagated delete to Google for sync_id {row['sync_id']}")
|
||||
await asyncio.sleep(0.1) # Small delay to avoid rate limits
|
||||
except Exception as e:
|
||||
logger.warning(f"Phase 3: Failed to delete Google for sync_id {row['sync_id']}: {e}")
|
||||
async with conn.transaction():
|
||||
@@ -588,6 +606,7 @@ async def handler(event, context):
|
||||
async with conn.transaction():
|
||||
await conn.execute("UPDATE calendar_sync SET google_event_id = $1, sync_status = 'synced', last_sync = $3 WHERE sync_id = $2;", new_event_id, row['sync_id'], datetime.datetime.now(BERLIN_TZ))
|
||||
logger.info(f"Phase 3: Recreated Google event {new_event_id} for sync_id {row['sync_id']}")
|
||||
await asyncio.sleep(0.1) # Small delay to avoid rate limits
|
||||
except Exception as e:
|
||||
logger.warning(f"Phase 3: Failed to recreate Google for sync_id {row['sync_id']}: {e}")
|
||||
async with conn.transaction():
|
||||
@@ -628,12 +647,14 @@ async def handler(event, context):
|
||||
async with conn.transaction():
|
||||
await conn.execute("UPDATE calendar_sync SET sync_status = 'synced', last_sync = $2 WHERE sync_id = $1;", row['sync_id'], datetime.datetime.now(BERLIN_TZ))
|
||||
logger.info(f"Phase 4: Updated Google event {event_id} from Advoware frNr {frnr}")
|
||||
await asyncio.sleep(0.1) # Small delay to avoid rate limits
|
||||
elif google_ts and google_ts > row['last_sync']:
|
||||
logger.warning(f"Phase 4: Unauthorized change in Google event {event_id}, resetting to Advoware frNr {frnr}")
|
||||
await update_google_event(service, calendar_id, event_id, adv_std)
|
||||
async with conn.transaction():
|
||||
await conn.execute("UPDATE calendar_sync SET sync_status = 'synced', last_sync = $2 WHERE sync_id = $1;", row['sync_id'], datetime.datetime.now(BERLIN_TZ))
|
||||
logger.info(f"Phase 4: Reset Google event {event_id} to Advoware frNr {frnr}")
|
||||
await asyncio.sleep(0.1) # Small delay to avoid rate limits
|
||||
elif row['source_system'] == 'google' and row['advoware_write_allowed']:
|
||||
# Check for changes in source (Google) or unauthorized changes in target (Advoware)
|
||||
google_ts_str = google_data.get('updated', '')
|
||||
@@ -663,6 +684,7 @@ async def handler(event, context):
|
||||
async with conn.transaction():
|
||||
await conn.execute("UPDATE calendar_sync SET sync_status = 'synced', last_sync = $2 WHERE sync_id = $1;", row['sync_id'], max(adv_ts, google_ts))
|
||||
logger.info(f"Phase 4: Updated based on last_change_wins for sync_id {row['sync_id']}")
|
||||
await asyncio.sleep(0.1) # Small delay to avoid rate limits
|
||||
except Exception as e:
|
||||
logger.warning(f"Phase 4: Failed to update sync_id {row['sync_id']}: {e}")
|
||||
async with conn.transaction():
|
||||
|
||||
Reference in New Issue
Block a user