Neue Verwaltung der Gruppenzuordnung 1:n
This commit is contained in:
1 parent
fa02a7ade0
commit
02c017d53d
34 files changed
+1306
-251
No files matched your search
+57
-16
@@ -7,6 +7,8 @@ die Nachricht zu.
|
||||
|
||||
Wichtige Regeln aus der Spezifikation:
|
||||
- Code < 100: rein interne Nachrichten (z. B. Authentifizierung, Heartbeat).
|
||||
Code 99 ist eine serverinterne Aufforderung an alle Clients, die Seite
|
||||
wegen geänderter Daten neu zu laden.
|
||||
- Code 100/200/300: State- bzw. Positionsänderungen an Dispatcher, Beobachter
|
||||
und die jeweils betroffene Gruppe.
|
||||
- Code 1000/1100/2000: Chat-/Broadcast-Nachrichten. Diese werden persistiert,
|
||||
@@ -57,10 +59,13 @@ class WebSocketBroker:
|
||||
role = account['role']
|
||||
|
||||
# Für Gruppen-Accounts die zugehörige Gruppe ermitteln. Ein Account der
|
||||
# Rolle "Gruppe" ist genau einer Gruppe zugeordnet.
|
||||
# Rolle "Gruppe" ist höchstens einer Gruppe zugeordnet.
|
||||
if group_id is None and role == 'Gruppe':
|
||||
group = db.execute(
|
||||
'SELECT id FROM groups WHERE account_id = ? AND tenant_id = ?',
|
||||
'''SELECT g.id FROM groups g
|
||||
JOIN group_accounts ga
|
||||
ON ga.group_id = g.id AND ga.tenant_id = g.tenant_id
|
||||
WHERE ga.account_id = ? AND g.tenant_id = ?''',
|
||||
(account_id, tenant_id)
|
||||
).fetchone()
|
||||
group_id = group['id'] if group else None
|
||||
@@ -226,7 +231,10 @@ class WebSocketBroker:
|
||||
return True
|
||||
if role == 'Gruppe':
|
||||
group = db.execute(
|
||||
'SELECT id FROM groups WHERE account_id = ? AND tenant_id = ?',
|
||||
'''SELECT g.id FROM groups g
|
||||
JOIN group_accounts ga
|
||||
ON ga.group_id = g.id AND ga.tenant_id = g.tenant_id
|
||||
WHERE ga.account_id = ? AND g.tenant_id = ?''',
|
||||
(account_id, tenant_id)
|
||||
).fetchone()
|
||||
return bool(group and msg_row['receiver_id'] == group['id'])
|
||||
@@ -238,7 +246,10 @@ class WebSocketBroker:
|
||||
return True
|
||||
if role == 'Gruppe':
|
||||
group = db.execute(
|
||||
'SELECT id FROM groups WHERE account_id = ? AND tenant_id = ?',
|
||||
'''SELECT g.id FROM groups g
|
||||
JOIN group_accounts ga
|
||||
ON ga.group_id = g.id AND ga.tenant_id = g.tenant_id
|
||||
WHERE ga.account_id = ? AND g.tenant_id = ?''',
|
||||
(account_id, tenant_id)
|
||||
).fetchone()
|
||||
payload = self._payload(msg_row)
|
||||
@@ -293,6 +304,14 @@ class WebSocketBroker:
|
||||
self._deliver(tenant_id, message, sender)
|
||||
return
|
||||
|
||||
# Code 99 ist eine serverinterne Aufforderung zum Neuladen. Clients
|
||||
# dürfen diesen Code nicht selbst auslösen.
|
||||
if code == 99:
|
||||
if apply_business:
|
||||
return
|
||||
self._deliver(tenant_id, message, sender)
|
||||
return
|
||||
|
||||
# Sonstige interne Codes (< 100) werden nicht an die Oberfläche gegeben.
|
||||
if code < 100:
|
||||
return
|
||||
@@ -444,8 +463,14 @@ class WebSocketBroker:
|
||||
return False
|
||||
|
||||
# Ein Gruppen-Account darf nur den Zustand seiner eigenen Gruppe ändern.
|
||||
if sender['role'] == 'Gruppe' and group['account_id'] != sender['id']:
|
||||
return False
|
||||
if sender['role'] == 'Gruppe':
|
||||
linked = db.execute(
|
||||
'''SELECT 1 FROM group_accounts
|
||||
WHERE tenant_id = ? AND group_id = ? AND account_id = ?''',
|
||||
(tenant_id, group_id, sender['id'])
|
||||
).fetchone()
|
||||
if not linked:
|
||||
return False
|
||||
|
||||
new_state = payload.get('state')
|
||||
if new_state not in ('offen', 'unterwegs', 'online', 'pausierend', 'fertig'):
|
||||
@@ -495,8 +520,14 @@ class WebSocketBroker:
|
||||
if not group:
|
||||
return False
|
||||
|
||||
if sender['role'] == 'Gruppe' and group['account_id'] != sender['id']:
|
||||
return False
|
||||
if sender['role'] == 'Gruppe':
|
||||
linked = db.execute(
|
||||
'''SELECT 1 FROM group_accounts
|
||||
WHERE tenant_id = ? AND group_id = ? AND account_id = ?''',
|
||||
(tenant_id, group_id, sender['id'])
|
||||
).fetchone()
|
||||
if not linked:
|
||||
return False
|
||||
|
||||
try:
|
||||
lat = float(payload.get('lat'))
|
||||
@@ -583,7 +614,10 @@ class WebSocketBroker:
|
||||
}
|
||||
if sender and sender['role'] == 'Gruppe':
|
||||
group = db.execute(
|
||||
'SELECT id, aliasname FROM groups WHERE account_id = ? AND tenant_id = ?',
|
||||
'''SELECT g.id, g.aliasname FROM groups g
|
||||
JOIN group_accounts ga
|
||||
ON ga.group_id = g.id AND ga.tenant_id = g.tenant_id
|
||||
WHERE ga.account_id = ? AND g.tenant_id = ?''',
|
||||
(sender['id'], tenant_id)
|
||||
).fetchone()
|
||||
if group:
|
||||
@@ -723,14 +757,18 @@ class WebSocketBroker:
|
||||
def add_group_account(group_id):
|
||||
if not group_id:
|
||||
return
|
||||
group = db.execute(
|
||||
'SELECT account_id FROM groups WHERE id = ? AND tenant_id = ?',
|
||||
rows = db.execute(
|
||||
'''SELECT account_id FROM group_accounts
|
||||
WHERE group_id = ? AND tenant_id = ?''',
|
||||
(group_id, tenant_id)
|
||||
).fetchone()
|
||||
if group and group['account_id']:
|
||||
recipients.add(group['account_id'])
|
||||
).fetchall()
|
||||
recipients.update(row['account_id'] for row in rows)
|
||||
|
||||
if code == 100:
|
||||
if code == 99:
|
||||
# Alle verbundenen Clients des Mandanten müssen die Seite neu laden.
|
||||
add_accounts(('Gast', 'Beobachter', 'Gruppe', 'Dispatcher', 'Administrator'))
|
||||
|
||||
elif code == 100:
|
||||
# Dispatcher, Gast, Beobachter + die mit der Straße verknüpfte
|
||||
# Gruppe. Bei einem Gruppenwechsel werden sowohl die alte als auch
|
||||
# die neue Gruppe benachrichtigt.
|
||||
@@ -836,7 +874,10 @@ class WebSocketBroker:
|
||||
if group_id is None and sender is not None and message.code in (200, 300, 2000):
|
||||
# Bei Gruppen-Nachrichten ist der Absender die Gruppe selbst.
|
||||
group = get_db().execute(
|
||||
'SELECT id FROM groups WHERE account_id = ? AND tenant_id = ?',
|
||||
'''SELECT g.id FROM groups g
|
||||
JOIN group_accounts ga
|
||||
ON ga.group_id = g.id AND ga.tenant_id = g.tenant_id
|
||||
WHERE ga.account_id = ? AND g.tenant_id = ?''',
|
||||
(sender['id'], tenant_id)
|
||||
).fetchone()
|
||||
group_id = group['id'] if group else None
|
||||
|
||||
Reference in new issue
Block a user