2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fix postgres compatibility

Browse source
This commit is contained in:
Laura Klünder 2023-10-20 14:43:00 +02:00
parent 499dc628bf
commit 4d21ebb78e
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/c3nav/mesh/models.py
View file

@ -34,11 +34,11 @@ class MeshNodeQuerySet(models.QuerySet):
if self._prefetch_last_messages and not self._prefetch_last_messages_done: if self._prefetch_last_messages and not self._prefetch_last_messages_done:
nodes = {node.pk: node for node in self._result_cache} nodes = {node.pk: node for node in self._result_cache}
try: try:
for message in NodeMessage.objects.order_by('-datetime', '-pk').filter( for message in NodeMessage.objects.order_by('message_type', 'src_node', '-datetime', '-pk').filter(
message_type__in=self._prefetch_last_messages, message_type__in=self._prefetch_last_messages,
src_node__in=nodes.keys(), src_node__in=nodes.keys(),
).prefetch_related("uplink_node").distinct('message_type', 'src_node'): ).prefetch_related("uplink_node").distinct('message_type', 'src_node'):
nodes[message.node].last_messages[message.message_type] = message nodes[message.src_node_id].last_messages[message.message_type] = message
for node in nodes.values(): for node in nodes.values():
node.last_messages["any"] = max(node.last_messages.values(), key=attrgetter("datetime")) node.last_messages["any"] = max(node.last_messages.values(), key=attrgetter("datetime"))
except NotSupportedError: except NotSupportedError:
@ -75,6 +75,9 @@ class LastMessagesByTypeLookup(UserDict):
return msg return msg
def __setitem__(self, key, item): def __setitem__(self, key, item):
if key == "any":
self.data["any"] = item
return
self.data[self._get_key(key)] = item self.data[self._get_key(key)] = item