Merge branch 'develop' into web/task/display-name-validation

Author: nabramow

.gitignore

@@ -10,6 +10,6 @@
 pyrightconfig.json
 
 /private/
-.claude/*
-!.claude/tools/
-!.claude/tools/**
+**/.claude/*
+!/.claude/tools/
+!/.claude/tools/**

app/.gitlab-ci.yml

@@ -456,25 +456,24 @@ test:media:
 test:web:
   needs: ["build:web-dev"]
   stage: test
+  parallel: 3
   image: $WEB_DEV_TAG
   inherit:
     # no docker login
     default: false
+  variables:
+    NEXT_PUBLIC_API_BASE_URL: "http://localhost:8888"
+    TZ: "UTC"
   script:
-    - cd /app && yarn test-ci
+    - cd /app && yarn jest --runInBand --coverage --coverageDirectory=coverage-$CI_NODE_INDEX --reporters="default" --reporters="jest-junit" --shard=$CI_NODE_INDEX/$CI_NODE_TOTAL
   after_script:
-    - cp /app/junit.xml $CI_PROJECT_DIR/
-    - cp /app/coverage/cobertura-coverage.xml $CI_PROJECT_DIR/
-    - mkdir -p $CI_PROJECT_DIR/artifacts/lcov-report && cp -a /app/coverage/lcov-report $CI_PROJECT_DIR/artifacts/
-  coverage: '/^All files[^|]*\|[^|]*\s+([\d\.]+)/'
+    - cp /app/junit.xml $CI_PROJECT_DIR/junit-$CI_NODE_INDEX.xml
+    - mkdir -p $CI_PROJECT_DIR/coverage-$CI_NODE_INDEX && cp -a /app/coverage-$CI_NODE_INDEX/. $CI_PROJECT_DIR/coverage-$CI_NODE_INDEX/
   artifacts:
     reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: cobertura-coverage.xml
-      junit: junit.xml
+      junit: junit-$CI_NODE_INDEX.xml
     paths:
-      - artifacts/lcov-report
+      - coverage-$CI_NODE_INDEX
   rules:
     - if: ($BUILD_WEB == "true") && ($DO_CHECKS == "true") && ($CI_COMMIT_BRANCH == $RELEASE_BRANCH)
     - if: ($BUILD_WEB == "true") && ($DO_CHECKS == "true") && ($CI_COMMIT_BRANCH != $RELEASE_BRANCH)
@@ -727,8 +726,49 @@ preview:backend:
         - app/proto/**/*
         - app/backend/**/*
 
+preview:web-coverage:
+  needs:
+    - job: test:web
+      artifacts: true
+    - job: build:web-dev
+      artifacts: false
+  stage: preview
+  image: $WEB_DEV_TAG
+  inherit:
+    # no docker login
+    default: false
+  script:
+    - cd /app
+    # Install nyc for merging coverage
+    - npm install -g nyc
+    # Merge coverage JSON files from all parallel workers
+    - mkdir -p merged-coverage
+    - nyc merge $CI_PROJECT_DIR/coverage-1 merged-coverage/coverage-1.json || true
+    - nyc merge $CI_PROJECT_DIR/coverage-2 merged-coverage/coverage-2.json || true
+    - nyc merge $CI_PROJECT_DIR/coverage-3 merged-coverage/coverage-3.json || true
+    # Generate combined reports
+    - nyc merge merged-coverage .nyc_output/coverage.json
+    - nyc report --reporter=text --reporter=cobertura --reporter=lcov --report-dir=coverage
+    # Move lcov-report to artifacts location
+    - mkdir -p $CI_PROJECT_DIR/artifacts && mv coverage/lcov-report $CI_PROJECT_DIR/artifacts/
+    - cp coverage/cobertura-coverage.xml $CI_PROJECT_DIR/
+  coverage: '/^All files[^|]*\|[^|]*\s+([\d\.]+)/'
+  artifacts:
+    reports:
+      coverage_report:
+        coverage_format: cobertura
+        path: cobertura-coverage.xml
+    paths:
+      - artifacts/lcov-report
+  rules:
+    - if: ($BUILD_WEB == "true") && ($DO_CHECKS == "true") && ($CI_COMMIT_BRANCH == $RELEASE_BRANCH)
+    - if: ($BUILD_WEB == "true") && ($DO_CHECKS == "true") && ($CI_COMMIT_BRANCH != $RELEASE_BRANCH)
+      changes:
+        - app/proto/**/*
+        - app/web/**/*
+
 preview:wcov:
-  needs: ["test:web"]
+  needs: ["preview:web-coverage"]
   stage: preview
   image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
   inherit:
@@ -884,6 +924,9 @@ wait:before-release:
     - job: test:web
       artifacts: false
       optional: true
+    - job: preview:web-coverage
+      artifacts: false
+      optional: true
     - job: test:web-prettier
       artifacts: false
       optional: true
@@ -899,9 +942,6 @@ wait:before-release:
     - job: test:mobile-typecheck
       artifacts: false
       optional: true
-    - job: test:mobile-expo-doctor
-      artifacts: false
-      optional: true
 
 release:proxy:
   needs: ["wait:before-release"]
@@ -994,9 +1034,28 @@ release:nginx-next:
   rules:
     - if: $CI_COMMIT_BRANCH == $RELEASE_BRANCH
 
-release:deploy-info:
-  needs: ["wait:before-release", "build:deploy-manifest"]
-  stage: release
+deploy:deploy-info:
+  needs:
+    - job: build:deploy-manifest
+    - job: release:proxy
+      artifacts: false
+    - job: release:nginx
+      artifacts: false
+    - job: release:prometheus
+      artifacts: false
+    - job: release:backend
+      artifacts: false
+    - job: release:media
+      artifacts: false
+    - job: release:web
+      artifacts: false
+      optional: true
+    - job: release:web-next
+      artifacts: false
+      optional: true
+    - job: release:nginx-next
+      artifacts: false
+  stage: deploy
   image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
   inherit:
     # no docker login

app/backend/Makefile

@@ -1,7 +1,7 @@
 # Makefile for the backend of the application
 # Run 'make [command]' in app/backend to execute the specified command
 
-UV_VERSION=0.9.21
+UV_VERSION=0.10.9
 ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 PROTO_IMAGE=registry.gitlab.com/couchers/grpc
 
@@ -69,6 +69,25 @@ test:
 	uv run pytest $(if $(file),src/tests/$(file),src/tests)
 
 
+# Run backend tests in Docker
+# Usage:
+# make docker-test                    → runs all tests
+# make docker-test file=test_file.py → runs tests in a specific file
+docker-test:
+	$(eval COMPOSE_FILES := -f ../docker-compose.test.yml $(if $(filter Darwin,$(shell uname -s)),-f ../docker-compose.testmac.yml))
+	docker compose $(COMPOSE_FILES) up -d --wait postgres_tests
+	docker compose $(COMPOSE_FILES) run --rm --build \
+		-v $(ROOT_DIR):/app \
+		-v /app/.venv \
+		-e DATABASE_CONNECTION_STRING=postgresql://postgres:06b3890acd2c235c41be0bbfe22f1b386a04bf02eedf8c977486355616be2aa1@postgres_tests:6544/testdb \
+		--no-deps \
+		backend_test_runner \
+		pytest $(if $(file),src/tests/$(file),src/tests) --disable-warnings
+
+teardown-docker-test:
+	docker compose -f ../docker-compose.test.yml down
+
+
 run-deps:
 	docker compose -f ../docker-compose.local-backend.yml up -d --build --wait
 

app/backend/src/couchers/constants.py

@@ -111,3 +111,6 @@
 GALLERY_MAX_PHOTOS_VERIFIED = 4
 
 COMPLETED_PROFILE_MINIMUM_CHAR_LENGTH = 150
+
+# How long a container must run uninterrupted before /status reports stable=true
+STABLE_THRESHOLD_SECONDS = 15 * 60

app/backend/src/couchers/i18n/locales/de.json

@@ -68,7 +68,7 @@
     "event_not_found": "Event nicht gefunden.",
     "event_too_far_in_future": "Das Event muss innerhalb des nächsten Jahres beginnen.",
     "event_too_long": "Events dürfen nicht länger als 7 Tage dauern.",
-    "event_transfer_permission_denied": "Du darfst dieses Ereignis nicht übertragen.",
+    "event_transfer_permission_denied": "Du darfst dieses Event nicht übertragen.",
     "friend_request_not_found": "Diese Freundschaftsanfrage konnte nicht gefunden werden.",
     "friends_already_or_pending": "Du bist bereits mit diesem Nutzer befreundet oder hast ihm eine Freundschaftsanfrage gesendet.",
     "group_not_found": "Gruppe nicht gefunden.",

app/backend/src/couchers/i18n/locales/it.json

@@ -1 +1,24 @@
-{}
+{
+  "errors": {
+    "account_suspended": "Il tuo account è stato sospeso.",
+    "admin_blog_title_too_long": "Il titolo del post è troppo lungo.",
+    "already_admin": "Questo utente é già amministratore.",
+    "already_have_dm": "Hai già uno scambio di messaggi con questo utente.",
+    "already_in_community": "Sei già iscritto a quella comunità.",
+    "already_in_group": "Sei già in quel gruppo.",
+    "already_left_host_request_feedback": "Hai già lasciato una recensione per questa richiesta di ospitalità!",
+    "at_least_two_users_required": "Devi specificare almeno 2 utenti",
+    "bug_tool_request_failed": "Richiesta fallita",
+    "cannot_create_discussion": "Non puoi creare una discussione in questo gruppo o comunità.",
+    "cannot_edit_that_notification_preference": "Questa preferenza di notifica non può essere modificata dall'utente.",
+    "cant_invite_self": "Non puoi invitare te stesso in una chat.",
+    "cant_message_in_chat": "Non puoi inviare un messaggio in questa chat.",
+    "cant_write_reference_for_request": "Non puoi scrivere una referenza per quella richiesta di ospitalità, oppure non é stata trovata.",
+    "chat_initiation_rate_limit": "Hai inviato messaggi a parecchi utenti nelle ultime {{hours}} ore. Per evitare spam non puoi contattare altri utenti, per ora.",
+    "country_required": "La Nazione é obbligatoria.",
+    "date_from_after_one_year": "La data di partenza deve essere entro un anno da oggi.",
+    "date_from_before_today": "La data di inizio deve essere oggi o più tardi.",
+    "date_to_after_one_year": "Non puoi chiedere di essere ospitato per più di un anno.",
+    "discussion_not_found": "Discussione non trovata."
+  }
+}

app/backend/src/couchers/notifications/background.py

@@ -123,8 +123,9 @@ def _send_push_notification(session: Session, user: User, notification: Notifica
 
 def handle_notification(payload: jobs_pb2.HandleNotificationPayload) -> None:
     with session_scope() as session:
+        # Select and lock the row.
         notification = session.execute(
-            select(Notification).where(Notification.id == payload.notification_id)
+            select(Notification).where(Notification.id == payload.notification_id).with_for_update()
         ).scalar_one()
 
         # Check moderation visibility if this notification is linked to moderated content

app/backend/src/couchers/notifications/locales/ca.json

@@ -1 +1,88 @@
-{}
+{
+  "topic_action_descriptions": {
+    "host_request": {
+      "missed_messages": "Et falten missatges en una sol·licitud d'amfitrió",
+      "create": "Algú t'envia una sol·licitud d'allotjament",
+      "accept": "Algú accepta la teva sol·licitud d'allotjament",
+      "reject": "Algú rebutja la teva sol·licitud d'allotjament",
+      "message": "Algú envia un missatge en una sol·licitud d'allotjament",
+      "confirm": "Algú confirma la seva sol·licitud d'allotjament",
+      "cancel": "Algú cancel·la la seva sol·licitud d'allotjament",
+      "reminder": "No has respost a una sol·licitud d'allotjament pendent"
+    },
+    "chat": {
+      "message": "Algú t'envia un missatge",
+      "missed_messages": "Et perds missatges en un xat"
+    },
+    "general": {
+      "new_blog_post": "S'ha publicat una nova entrada al blog"
+    },
+    "reference": {
+      "receive_hosted": "Reps una referència d’algú que t’ha allotjat",
+      "receive_friend": "Has rebut una referència d’un amic",
+      "reminder_hosted": "Recordatori d’escriure una referència per a algú que vas allotjar",
+      "reminder_surfed": "Recorda escriure una referència per a algú amb qui et vas allotjar",
+      "receive_surfed": "Reps una referència d’algú a qui vas allotjar"
+    },
+    "friend_request": {
+      "create": "Algú t'ha enviat una sol·licitud d'amistat",
+      "accept": "Algú accepta la teva sol·licitud d'amistat"
+    },
+    "event": {
+      "create_any": "Un usuari crea qualsevol esdeveniment a la teva comunitat (no revisat per un administrador)",
+      "update": "S'ha actualitzat un esdeveniment al qual assisteixes",
+      "cancel": "S'ha cancel·lat un esdeveniment al qual assisties",
+      "invite_organizer": "Algú et convida a coorganitzar un esdeveniment",
+      "comment": " Un usuari comenta un esdeveniment al qual assistiràs",
+      "reminder": "Recordatori que un esdeveniment al qual assistiràs tindrà lloc aviat",
+      "create_approved": "Un esdeveniment aprovat pels moderadors es crea a la teva comunitat",
+      "delete": "S'ha eliminat un esdeveniment al qual assisties"
+    },
+    "onboarding": {
+      "reminder": "Recorda completar el teu perfil després de registrar-te"
+    },
+    "badge": {
+      "add": "S'ha afegit una insígnia al teu compte",
+      "remove": "S'ha eliminat una insígnia del teu compte"
+    },
+    "donation": {
+      "received": "La teva donació ha estat rebuda"
+    },
+    "password": {
+      "change": "La teva contrasenya s'ha canviat"
+    },
+    "password_reset": {
+      "start": "S'ha iniciat el restabliment de la contrasenya",
+      "complete": "La contrasenya s'ha restablert correctament"
+    },
+    "account_deletion": {
+      "recovered": "El teu compte ha estat recuperat (restaurat)",
+      "complete": "El teu compte ha estat eliminat",
+      "start": "Inicies l'eliminació del compte"
+    },
+    "api_key": {
+      "create": "S'ha creat una clau d'API per al teu compte"
+    },
+    "phone_number": {
+      "change": "El teu número de telèfon ha canviat",
+      "verify": "El teu número de telèfon està verificat"
+    },
+    "birthdate": {
+      "change": "La teva data de naixement ha estat canviada"
+    },
+    "discussion": {
+      "create": "Algú crea una discussió en una comunitat de la qual formes part",
+      "comment": "Algú comenta en una discussió que estàs seguint"
+    },
+    "thread": {
+      "reply": "Algú respon al teu comentari"
+    },
+    "email_address": {
+      "change": "S'ha iniciat el canvi de correu electrònic",
+      "verify": "El teu nou correu electrònic està verificat"
+    },
+    "gender": {
+      "change": "El gènere que es mostra al teu perfil s'ha canviat"
+    }
+  }
+}

app/backend/src/couchers/notifications/locales/cs.json

@@ -58,5 +58,29 @@
     "donation__received": {
       "title": "Dar přijat"
     }
+  },
+  "topic_action_descriptions": {
+    "host_request": {
+      "cancel": "Někdo zruší žádost o ubytování",
+      "reject": "Někdo odmítne tvou žádost o ubytování",
+      "confirm": "Někdo potvrdí žádost o ubytování",
+      "accept": "Někdo přijme tvou žádost o ubytování",
+      "message": "Někdo ti pošle zprávu v žádosti o ubytování",
+      "create": "Někdo ti zašle žádost o ubytování",
+      "missed_messages": "Utekla ti zpráva v žádosti o ubytování"
+    },
+    "chat": {
+      "missed_messages": "Utekly ti zprávy v chatu",
+      "message": "Někdo ti pošle zprávu"
+    },
+    "general": {
+      "new_blog_post": "Byl zveřejněn nový blogový příspěvek"
+    },
+    "phone_number": {
+      "verify": "Tvé telefonní číslo je ověřeno."
+    },
+    "reference": {
+      "receive_friend": "Přišla ti reference od přítele."
+    }
   }
 }