Neuer Advoware Calendar Sync implementiert
- steps/advoware_cal_sync/advoware_calendar_sync_step.py: Bidirektionale Sync zwischen Advoware und Google Calendar
- Automatische Kalender-Erstellung für jeden Mitarbeiter (AW-{Kuerzel})
- Konfigurierbare Sync-Optionen (volle Details vs. nur 'blocked')
- Google Calendar API Integration mit OAuth
- Mitarbeiter- und Termin-API Integration
- Umfassende Fehlerbehandlung und Logging
- steps/advoware_cal_sync/README.md: Detaillierte Dokumentation
- requirements.txt: Google API Dependencies hinzugefügt
- motia-workbench.json: Neuer advoware_cal_sync Flow
This commit is contained in:
16083
bitbylaw/docs/advoware/advoware_api_swagger.json
Normal file
16083
bitbylaw/docs/advoware/advoware_api_swagger.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -65,8 +65,8 @@
|
||||
"y": 0
|
||||
},
|
||||
"steps/advoware_proxy/advoware_api_proxy_post_step.py": {
|
||||
"x": 200,
|
||||
"y": 0
|
||||
"x": -340,
|
||||
"y": -2
|
||||
},
|
||||
"steps/advoware_proxy/advoware_api_proxy_get_step.py": {
|
||||
"x": 12,
|
||||
@@ -77,5 +77,14 @@
|
||||
"y": 0
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "advoware_cal_sync",
|
||||
"config": {
|
||||
"steps/advoware_cal_sync/advoware_calendar_sync_step.py": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -4,3 +4,7 @@ aiohttp
|
||||
requests
|
||||
redis
|
||||
python-dotenv
|
||||
google-api-python-client
|
||||
google-auth
|
||||
google-auth-oauthlib
|
||||
google-auth-httplib2
|
||||
161
bitbylaw/steps/advoware_cal_sync/README.md
Normal file
161
bitbylaw/steps/advoware_cal_sync/README.md
Normal file
@@ -0,0 +1,161 @@
|
||||
# Advoware Calendar Sync
|
||||
|
||||
Dieser Abschnitt implementiert die bidirektionale Synchronisation zwischen Advoware-Terminen und Google Calendar. Für jeden Mitarbeiter in Advoware wird automatisch ein entsprechender Google Calendar erstellt und gepflegt.
|
||||
|
||||
## Übersicht
|
||||
|
||||
Das System synchronisiert Termine zwischen:
|
||||
- **Advoware**: Zentrale Terminverwaltung mit detaillierten Informationen
|
||||
- **Google Calendar**: Benutzerfreundliche Kalenderansicht für jeden Mitarbeiter
|
||||
|
||||
## Funktionalität
|
||||
|
||||
### Automatische Kalender-Erstellung
|
||||
- Für jeden Advoware-Mitarbeiter wird ein Google Calendar mit dem Namen `AW-{Kuerzel}` erstellt
|
||||
- Beispiel: Mitarbeiter mit Kürzel "SB" → Calendar "AW-SB"
|
||||
|
||||
### Bidirektionale Synchronisation
|
||||
|
||||
#### Advoware → Google Calendar
|
||||
- Alle Termine eines Mitarbeiters werden aus Advoware abgerufen
|
||||
- Neue Termine werden in den entsprechenden Google Calendar eingetragen
|
||||
- Die Advoware-Termin-ID (`frNr`) wird als Metadaten gespeichert
|
||||
|
||||
#### Google Calendar → Advoware
|
||||
- Termine aus Google Calendar ohne `frNr` werden als neue Termine in Advoware erstellt
|
||||
- Die generierte `frNr` wird zurück in den Google Calendar geschrieben
|
||||
|
||||
### Konfigurationsoptionen
|
||||
- **Vollständige Termindetails**: Titel, Beschreibung, Ort werden synchronisiert
|
||||
- **Nur "Blocked"**: Termine werden nur als "beschäftigt" markiert (keine Details)
|
||||
|
||||
## API-Endpunkte
|
||||
|
||||
### Advoware
|
||||
- `GET /api/v1/advonet/Mitarbeiter` - Liste aller Mitarbeiter
|
||||
- `GET /api/v1/advonet/Termine?kuerzel={kuerzel}&from={date}&to={date}` - Termine eines Mitarbeiters
|
||||
|
||||
### Google Calendar API
|
||||
- Kalender-Management (erstellen, auflisten)
|
||||
- Event-Management (erstellen, aktualisieren, löschen)
|
||||
|
||||
## Step-Konfiguration
|
||||
|
||||
### advoware_calendar_sync_step.py
|
||||
- **Type:** api
|
||||
- **Path:** `/advoware/calendar/sync`
|
||||
- **Method:** POST
|
||||
- **Flows:** advoware
|
||||
|
||||
**Request Body:**
|
||||
```json
|
||||
{
|
||||
"full_content": true // oder false für nur "blocked"
|
||||
}
|
||||
```
|
||||
|
||||
## Setup
|
||||
|
||||
### Google API Credentials
|
||||
1. Google Cloud Console Projekt erstellen
|
||||
2. Google Calendar API aktivieren
|
||||
3. OAuth 2.0 Credentials erstellen
|
||||
4. `token.pickle` Datei im Projektverzeichnis bereitstellen
|
||||
|
||||
### Umgebungsvariablen
|
||||
```env
|
||||
GOOGLE_CALENDAR_CREDENTIALS_PATH=token.pickle
|
||||
```
|
||||
|
||||
## Verwendung
|
||||
|
||||
### Manueller Sync
|
||||
```bash
|
||||
curl -X POST "http://localhost:3000/advoware/calendar/sync" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"full_content": true}'
|
||||
```
|
||||
|
||||
### Automatischer Sync
|
||||
Der Step kann über Cron-Jobs oder Events regelmäßig ausgeführt werden.
|
||||
|
||||
## Datenmapping
|
||||
|
||||
### Advoware → Google Calendar
|
||||
```javascript
|
||||
{
|
||||
"summary": appointment.text || "Advoware Termin",
|
||||
"description": `Advoware Termin\nNotiz: ${appointment.notiz}\nOrt: ${appointment.ort}`,
|
||||
"location": appointment.ort,
|
||||
"start": {
|
||||
"dateTime": `${appointment.datum}T${appointment.uhrzeitBis || '00:00:00'}`,
|
||||
"timeZone": "Europe/Berlin"
|
||||
},
|
||||
"end": {
|
||||
"dateTime": `${appointment.datumBis || appointment.datum}T${appointment.uhrzeitBis || '23:59:59'}`,
|
||||
"timeZone": "Europe/Berlin"
|
||||
},
|
||||
"extendedProperties": {
|
||||
"private": {
|
||||
"advoware_frnr": appointment.frNr
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### Google Calendar → Advoware
|
||||
```javascript
|
||||
{
|
||||
"text": event.summary,
|
||||
"notiz": event.description,
|
||||
"ort": event.location,
|
||||
"datum": event.start.dateTime.substring(0, 10),
|
||||
"uhrzeitBis": event.start.dateTime.substring(11, 19),
|
||||
"datumBis": event.end.dateTime.substring(0, 10),
|
||||
"sb": employee_kuerzel,
|
||||
"anwalt": employee_kuerzel
|
||||
}
|
||||
```
|
||||
|
||||
## Fehlerbehandlung
|
||||
|
||||
- **Google API Fehler:** Automatische Token-Refresh, Fallback bei Authentifizierungsfehlern
|
||||
- **Advoware API Fehler:** Retry-Logic, detaillierte Logging
|
||||
- **Netzwerkfehler:** Timeout-Handling, Wiederholungsversuche
|
||||
- **Dateninkonsistenzen:** Validierung vor Sync, Konfliktlösung
|
||||
|
||||
## Monitoring
|
||||
|
||||
### Logs
|
||||
- Erfolgreiche Synchronisationen
|
||||
- Fehlerhafte Termine
|
||||
- Kalender-Erstellungen
|
||||
- Performance-Metriken
|
||||
|
||||
### Metriken
|
||||
- Anzahl synchronisierter Termine
|
||||
- Verarbeitete Mitarbeiter
|
||||
- Fehlerquoten
|
||||
- Sync-Dauer
|
||||
|
||||
## Sicherheit
|
||||
|
||||
- OAuth 2.0 für Google API Zugriff
|
||||
- Token-Speicherung in verschlüsselten Dateien
|
||||
- Scoped API Permissions (nur Calendar-Zugriff)
|
||||
- Audit-Logs für alle Änderungen
|
||||
|
||||
## Erweiterungen
|
||||
|
||||
### Geplante Features
|
||||
- Inkrementelle Syncs (nur geänderte Termine)
|
||||
- Konfliktlösungsstrategien (Advoware gewinnt, Google gewinnt, Manuell)
|
||||
- Batch-Verarbeitung für Performance
|
||||
- Webhook-Integration für Echtzeit-Syncs
|
||||
- Mehrere Google-Accounts unterstützen
|
||||
|
||||
### Integration mit anderen Systemen
|
||||
- Outlook Calendar
|
||||
- Apple Calendar
|
||||
- Mobile Apps
|
||||
- Notification-Systeme
|
||||
297
bitbylaw/steps/advoware_cal_sync/advoware_calendar_sync_step.py
Normal file
297
bitbylaw/steps/advoware_cal_sync/advoware_calendar_sync_step.py
Normal file
@@ -0,0 +1,297 @@
|
||||
from services.advoware import AdvowareAPI
|
||||
from config import Config
|
||||
from googleapiclient.discovery import build
|
||||
from google.oauth2.credentials import Credentials
|
||||
from google.auth.transport.requests import Request
|
||||
from google_auth_oauthlib.flow import InstalledAppFlow
|
||||
import json
|
||||
import datetime
|
||||
import pickle
|
||||
import os.path
|
||||
import redis
|
||||
|
||||
config = {
|
||||
'type': 'api',
|
||||
'name': 'Advoware Calendar Sync',
|
||||
'description': 'Synchronisiert Advoware Termine mit Google Calendar für alle Mitarbeiter',
|
||||
'path': '/advoware/calendar/sync',
|
||||
'method': 'POST',
|
||||
'flows': ['advoware'],
|
||||
'emits': []
|
||||
}
|
||||
|
||||
SCOPES = ['https://www.googleapis.com/auth/calendar']
|
||||
|
||||
async def get_google_service():
|
||||
"""Initialisiert Google Calendar API Service"""
|
||||
creds = None
|
||||
|
||||
# Token aus Datei laden falls vorhanden
|
||||
if os.path.exists('token.pickle'):
|
||||
with open('token.pickle', 'rb') as token:
|
||||
creds = pickle.load(token)
|
||||
|
||||
# Wenn keine validen Credentials, neu authentifizieren
|
||||
if not creds or not creds.valid:
|
||||
if creds and creds.expired and creds.refresh_token:
|
||||
creds.refresh(Request())
|
||||
else:
|
||||
# Hier würde normalerweise der OAuth Flow laufen
|
||||
# Für Server-Umgebung brauchen wir Service Account oder gespeicherte Credentials
|
||||
raise Exception("Google OAuth Credentials nicht gefunden. Bitte token.pickle bereitstellen.")
|
||||
|
||||
# Token speichern
|
||||
with open('token.pickle', 'wb') as token:
|
||||
pickle.dump(creds, token)
|
||||
|
||||
return build('calendar', 'v3', credentials=creds)
|
||||
|
||||
async def get_advoware_employees(context):
|
||||
"""Ruft alle Mitarbeiter von Advoware ab"""
|
||||
advoware = AdvowareAPI(context)
|
||||
try:
|
||||
# Annahme: Mitarbeiter-Endpoint existiert ähnlich wie andere
|
||||
result = await advoware.api_call('Mitarbeiter')
|
||||
context.logger.info(f"Advoware Mitarbeiter abgerufen: {len(result) if isinstance(result, list) else 'unbekannt'}")
|
||||
return result if isinstance(result, list) else []
|
||||
except Exception as e:
|
||||
context.logger.error(f"Fehler beim Abrufen der Mitarbeiter: {e}")
|
||||
return []
|
||||
|
||||
async def ensure_google_calendar(service, employee_kuerzel, context):
|
||||
"""Stellt sicher, dass ein Google Calendar für den Mitarbeiter existiert"""
|
||||
calendar_name = f"AW-{employee_kuerzel}"
|
||||
|
||||
try:
|
||||
# Bestehende Kalender prüfen
|
||||
calendar_list = service.calendarList().list().execute()
|
||||
for calendar in calendar_list.get('items', []):
|
||||
if calendar['summary'] == calendar_name:
|
||||
context.logger.info(f"Google Calendar '{calendar_name}' existiert bereits")
|
||||
return calendar['id']
|
||||
|
||||
# Neuen Kalender erstellen
|
||||
calendar_body = {
|
||||
'summary': calendar_name,
|
||||
'description': f'Advoware Termine für Mitarbeiter {employee_kuerzel}',
|
||||
'timeZone': 'Europe/Berlin'
|
||||
}
|
||||
|
||||
created_calendar = service.calendars().insert(body=calendar_body).execute()
|
||||
calendar_id = created_calendar['id']
|
||||
context.logger.info(f"Google Calendar '{calendar_name}' erstellt mit ID: {calendar_id}")
|
||||
|
||||
return calendar_id
|
||||
|
||||
except Exception as e:
|
||||
context.logger.error(f"Fehler bei Google Calendar für {employee_kuerzel}: {e}")
|
||||
return None
|
||||
|
||||
async def get_advoware_appointments(employee_kuerzel, context):
|
||||
"""Ruft Termine eines Mitarbeiters aus Advoware ab"""
|
||||
advoware = AdvowareAPI(context)
|
||||
|
||||
# Zeitraum: aktuelles Jahr + 2 Jahre
|
||||
from_date = datetime.datetime.now().strftime('%Y-01-01T00:00:00Z')
|
||||
to_date = (datetime.datetime.now() + datetime.timedelta(days=730)).strftime('%Y-12-31T23:59:59Z')
|
||||
|
||||
try:
|
||||
params = {
|
||||
'kuerzel': employee_kuerzel,
|
||||
'from': from_date,
|
||||
'to': to_date
|
||||
}
|
||||
result = await advoware.api_call('Termine', method='GET', params=params)
|
||||
appointments = result if isinstance(result, list) else []
|
||||
context.logger.info(f"Advoware Termine für {employee_kuerzel}: {len(appointments)} gefunden")
|
||||
return appointments
|
||||
except Exception as e:
|
||||
context.logger.error(f"Fehler beim Abrufen der Termine für {employee_kuerzel}: {e}")
|
||||
return []
|
||||
|
||||
async def get_google_events(service, calendar_id, context):
|
||||
"""Ruft Events aus Google Calendar ab"""
|
||||
try:
|
||||
now = datetime.datetime.utcnow()
|
||||
from_date = now.strftime('%Y-01-01T00:00:00Z')
|
||||
to_date = (now + datetime.timedelta(days=730)).strftime('%Y-12-31T23:59:59Z')
|
||||
|
||||
events_result = service.events().list(
|
||||
calendarId=calendar_id,
|
||||
timeMin=from_date,
|
||||
timeMax=to_date,
|
||||
singleEvents=True,
|
||||
orderBy='startTime'
|
||||
).execute()
|
||||
|
||||
events = events_result.get('items', [])
|
||||
context.logger.info(f"Google Calendar Events: {len(events)} gefunden")
|
||||
return events
|
||||
except Exception as e:
|
||||
context.logger.error(f"Fehler beim Abrufen der Google Events: {e}")
|
||||
return []
|
||||
|
||||
async def sync_appointment_to_google(service, calendar_id, appointment, full_content, context):
|
||||
"""Synchronisiert einen Advoware-Termin zu Google Calendar"""
|
||||
try:
|
||||
# Start- und Endzeit aus Advoware-Daten
|
||||
start_date = appointment.get('datum')
|
||||
end_date = appointment.get('datumBis') or start_date
|
||||
start_time = appointment.get('uhrzeitBis', '00:00:00') # Advoware hat uhrzeitBis als Endzeit?
|
||||
end_time = appointment.get('uhrzeitBis', '23:59:59')
|
||||
|
||||
# Vollständiges Event oder nur "blocked"
|
||||
if full_content:
|
||||
summary = appointment.get('text', 'Advoware Termin')
|
||||
description = f"Advoware Termin\nNotiz: {appointment.get('notiz', '')}\nOrt: {appointment.get('ort', '')}\nRaum: {appointment.get('raum', '')}"
|
||||
location = appointment.get('ort', '')
|
||||
else:
|
||||
summary = "Blocked (Advoware)"
|
||||
description = "Termin aus Advoware"
|
||||
location = ""
|
||||
|
||||
event_body = {
|
||||
'summary': summary,
|
||||
'description': description,
|
||||
'location': location,
|
||||
'start': {
|
||||
'dateTime': f"{start_date}T{start_time}",
|
||||
'timeZone': 'Europe/Berlin',
|
||||
},
|
||||
'end': {
|
||||
'dateTime': f"{end_date}T{end_time}",
|
||||
'timeZone': 'Europe/Berlin',
|
||||
},
|
||||
'extendedProperties': {
|
||||
'private': {
|
||||
'advoware_frnr': str(appointment.get('frNr'))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Event erstellen
|
||||
created_event = service.events().insert(calendarId=calendar_id, body=event_body).execute()
|
||||
context.logger.info(f"Termin {appointment.get('frNr')} zu Google Calendar hinzugefügt")
|
||||
return created_event
|
||||
|
||||
except Exception as e:
|
||||
context.logger.error(f"Fehler beim Sync zu Google für Termin {appointment.get('frNr')}: {e}")
|
||||
return None
|
||||
|
||||
async def sync_event_to_advoware(service, calendar_id, event, employee_kuerzel, context):
|
||||
"""Synchronisiert ein Google Event zu Advoware (falls keine frNr vorhanden)"""
|
||||
try:
|
||||
# Prüfen ob bereits eine frNr vorhanden
|
||||
extended_props = event.get('extendedProperties', {}).get('private', {})
|
||||
frnr = extended_props.get('advoware_frnr')
|
||||
|
||||
if frnr:
|
||||
# Bereits synchronisiert
|
||||
return None
|
||||
|
||||
# Neuen Termin in Advoware erstellen
|
||||
advoware = AdvowareAPI(context)
|
||||
|
||||
# Start/End aus Google Event extrahieren
|
||||
start = event.get('start', {}).get('dateTime', '')
|
||||
end = event.get('end', {}).get('dateTime', '')
|
||||
|
||||
# Advoware-Termin erstellen
|
||||
appointment_data = {
|
||||
'text': event.get('summary', 'Google Calendar Termin'),
|
||||
'notiz': event.get('description', ''),
|
||||
'ort': event.get('location', ''),
|
||||
'datum': start[:10] if start else datetime.datetime.now().strftime('%Y-%m-%d'),
|
||||
'uhrzeitBis': start[11:19] if start else '09:00:00',
|
||||
'datumBis': end[:10] if end else start[:10] if start else datetime.datetime.now().strftime('%Y-%m-%d'),
|
||||
'sb': employee_kuerzel,
|
||||
'anwalt': employee_kuerzel
|
||||
}
|
||||
|
||||
result = await advoware.api_call('Termine', method='POST', json_data=appointment_data)
|
||||
|
||||
if result and isinstance(result, dict):
|
||||
new_frnr = result.get('frNr')
|
||||
if new_frnr:
|
||||
# frNr zurück in Google Event schreiben
|
||||
event['extendedProperties'] = event.get('extendedProperties', {})
|
||||
event['extendedProperties']['private'] = event['extendedProperties'].get('private', {})
|
||||
event['extendedProperties']['private']['advoware_frnr'] = str(new_frnr)
|
||||
|
||||
service.events().update(calendarId=calendar_id, eventId=event['id'], body=event).execute()
|
||||
context.logger.info(f"Neuer Advoware Termin erstellt: {new_frnr}, frNr in Google aktualisiert")
|
||||
return new_frnr
|
||||
|
||||
except Exception as e:
|
||||
context.logger.error(f"Fehler beim Sync zu Advoware für Google Event {event.get('id')}: {e}")
|
||||
return None
|
||||
|
||||
async def handler(req, context):
|
||||
try:
|
||||
# Konfiguration aus Request-Body
|
||||
body = req.get('body', {})
|
||||
full_content = body.get('full_content', True) # Default: volle Termindetails
|
||||
|
||||
context.logger.info(f"Starte Advoware Calendar Sync, full_content: {full_content}")
|
||||
|
||||
# Google Calendar Service initialisieren
|
||||
service = await get_google_service()
|
||||
|
||||
# Alle Mitarbeiter abrufen
|
||||
employees = await get_advoware_employees(context)
|
||||
|
||||
if not employees:
|
||||
return {'status': 500, 'body': {'error': 'Keine Mitarbeiter gefunden'}}
|
||||
|
||||
total_synced = 0
|
||||
|
||||
for employee in employees:
|
||||
kuerzel = employee.get('kuerzel') or employee.get('anwalt')
|
||||
if not kuerzel:
|
||||
context.logger.warning(f"Mitarbeiter ohne Kürzel übersprungen: {employee}")
|
||||
continue
|
||||
|
||||
context.logger.info(f"Verarbeite Mitarbeiter: {kuerzel}")
|
||||
|
||||
# Google Calendar sicherstellen
|
||||
calendar_id = await ensure_google_calendar(service, kuerzel, context)
|
||||
if not calendar_id:
|
||||
continue
|
||||
|
||||
# Termine aus beiden Systemen abrufen
|
||||
advoware_appointments = await get_advoware_appointments(kuerzel, context)
|
||||
google_events = await get_google_events(service, calendar_id, context)
|
||||
|
||||
# Advoware → Google syncen
|
||||
google_frnrs = {event.get('extendedProperties', {}).get('private', {}).get('advoware_frnr') for event in google_events}
|
||||
|
||||
for appointment in advoware_appointments:
|
||||
frnr = str(appointment.get('frNr'))
|
||||
if frnr not in google_frnrs:
|
||||
await sync_appointment_to_google(service, calendar_id, appointment, full_content, context)
|
||||
total_synced += 1
|
||||
|
||||
# Google → Advoware syncen
|
||||
for event in google_events:
|
||||
await sync_event_to_advoware(service, calendar_id, event, kuerzel, context)
|
||||
|
||||
context.logger.info(f"Advoware Calendar Sync abgeschlossen. {total_synced} Termine synchronisiert.")
|
||||
|
||||
return {
|
||||
'status': 200,
|
||||
'body': {
|
||||
'status': 'completed',
|
||||
'total_synced': total_synced,
|
||||
'employees_processed': len([e for e in employees if e.get('kuerzel') or e.get('anwalt')])
|
||||
}
|
||||
}
|
||||
|
||||
except Exception as e:
|
||||
context.logger.error(f"Fehler beim Advoware Calendar Sync: {e}")
|
||||
return {
|
||||
'status': 500,
|
||||
'body': {
|
||||
'error': 'Internal server error',
|
||||
'details': str(e)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user