Merge branch 'dev' of https://github.com/openstreetmap-polska/openaed…

…map-backend into dev

docker-compose.yml

@@ -24,6 +24,8 @@ services:
         "*",
       ]
 
+    shm_size: '2gb'
+
     ports:
       - ${LISTEN:-80}:8000
 

services/aed_service.py

@@ -141,7 +141,7 @@ async def get_intersecting(
 
 @trace
 async def _assign_country_codes(aeds: Sequence[AED]) -> None:
-    aed_ids: tuple[int, ...] = tuple(map(attrgetter('id'), aeds))
+    aed_ids: set[int] = set(map(attrgetter('id'), aeds))
 
     async with db_write() as session:
         for batch in batched(aed_ids, 10_000):
@@ -221,16 +221,21 @@ async def _update_db_diffs(last_update: float) -> None:
         logging.info('Nothing to update')
         return
 
-    aeds: list[AED] = []
+    # aeds need to be deduplicated to use ON CONFLICT
+    id_aed_map: dict[int, AED] = {}
     remove_ids: set[int] = set()
 
     for action in actions:
         for result in _process_action(action):
             if isinstance(result, AED):
-                aeds.append(result)
+                prev = id_aed_map.get(result.id)
+                if prev is None or prev.version < result.version:
+                    id_aed_map[result.id] = result
             else:
                 remove_ids.add(result)
 
+    aeds = id_aed_map.values()
+
     async with db_write() as session:
         if aeds:
             stmt = insert(AED).values(

services/photo_service.py

@@ -27,21 +27,19 @@ async def get_by_id(id: str, *, check_file: bool = True) -> Photo | None:
     @staticmethod
     @trace
     async def upload(node_id: int, user_id: int, file: UploadFile) -> Photo:
-        photo = Photo(
-            node_id=node_id,
-            user_id=user_id,
-        )
-
         img = Image.open(file.file)
         img = ImageOps.exif_transpose(img)
         img = _resize_image(img)
         img_bytes = _optimize_quality(img)
 
-        await photo.file_path.write_bytes(img_bytes)
-
         async with db_write() as session:
+            photo = Photo(
+                node_id=node_id,
+                user_id=user_id,
+            )
             session.add(photo)
 
+        await photo.file_path.write_bytes(img_bytes)
         return photo