bsiggel/motia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: ACL-Prüfung bei existierenden Google-Kalendern

Browse Source 
- ensure_google_calendar prüft jetzt auch bei existierenden Kalendern die ACL-Regel
- Fügt fehlende ACL-Regel hinzu, falls sie nicht vorhanden ist
- Verhindert Sync-Abbruch bei unvollständigen Kalendern aus früheren Läufen
This commit is contained in:
root
2025-10-24 19:27:59 +00:00
parent 9d40f47e19
commit d154ba8172
1 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
bitbylaw/steps/advoware_cal_sync/calendar_sync_event_step.py
View File

@@ -88,26 +88,48 @@ async def get_google_service(context=None):
@backoff.on_exception(backoff.expo, HttpError, max_tries=4, base=3, giveup=lambda e: e.resp.status not in [403, 429, 500, 502, 503, 504]) @backoff.on_exception(backoff.expo, HttpError, max_tries=4, base=3, giveup=lambda e: e.resp.status not in [403, 429, 500, 502, 503, 504])
async def ensure_google_calendar(service, employee_kuerzel, context=None): async def ensure_google_calendar(service, employee_kuerzel, context=None):
"""Ensure Google Calendar exists for employee.""" """Ensure Google Calendar exists for employee and has correct ACL."""
calendar_name = f"AW-{employee_kuerzel}" calendar_name = f"AW-{employee_kuerzel}"
try: try:
calendar_list = service.calendarList().list().execute() calendar_list = service.calendarList().list().execute()
calendar_id = None
for calendar in calendar_list.get('items', []): for calendar in calendar_list.get('items', []):
if calendar['summary'] == calendar_name: if calendar['summary'] == calendar_name:
return calendar['id'] calendar_id = calendar['id']
# Create new break
calendar_body = {
'summary': calendar_name, if not calendar_id:
'timeZone': 'Europe/Berlin' # Create new calendar
} calendar_body = {
created = service.calendars().insert(body=calendar_body).execute() 'summary': calendar_name,
calendar_id = created['id'] 'timeZone': 'Europe/Berlin'
# Share with main account if needed }
created = service.calendars().insert(body=calendar_body).execute()
calendar_id = created['id']
log_operation('info', f"Created new Google calendar {calendar_name} with ID {calendar_id}", context=context)
# Ensure ACL rule exists
acl_rule = { acl_rule = {
'scope': {'type': 'user', 'value': 'lehmannundpartner@gmail.com'}, 'scope': {'type': 'user', 'value': 'lehmannundpartner@gmail.com'},
'role': 'owner' 'role': 'owner'
} }
service.acl().insert(calendarId=calendar_id, body=acl_rule).execute()
# Check existing ACL rules
acl_list = service.acl().list(calendarId=calendar_id).execute()
acl_exists = False
for rule in acl_list.get('items', []):
if (rule.get('scope', {}).get('type') == 'user' and
rule.get('scope', {}).get('value') == 'lehmannundpartner@gmail.com' and
rule.get('role') == 'owner'):
acl_exists = True
break
if not acl_exists:
service.acl().insert(calendarId=calendar_id, body=acl_rule).execute()
log_operation('info', f"Added ACL rule for calendar {calendar_name} (ID: {calendar_id})", context=context)
else:
log_operation('debug', f"ACL rule already exists for calendar {calendar_name} (ID: {calendar_id})", context=context)
return calendar_id return calendar_id
except HttpError as e: except HttpError as e:
log_operation('error', f"Google API error for calendar {employee_kuerzel}: {e}", context=context) log_operation('error', f"Google API error for calendar {employee_kuerzel}: {e}", context=context)