fix: stabilize post-MVP travel-agent and itinerary workflows
This commit is contained in:
@@ -0,0 +1,104 @@
|
||||
import json
|
||||
from pathlib import Path
|
||||
|
||||
from django.core.management.base import BaseCommand, CommandError
|
||||
from django.core.serializers.json import DjangoJSONEncoder
|
||||
from django.utils import timezone
|
||||
|
||||
from adventures.models import Collection, CollectionItineraryItem
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = (
|
||||
"Export Collection and CollectionItineraryItem data to a JSON backup "
|
||||
"file before upgrades/migrations."
|
||||
)
|
||||
|
||||
def add_arguments(self, parser):
|
||||
parser.add_argument(
|
||||
"--output",
|
||||
type=str,
|
||||
help="Optional output file path (default: ./collections_backup_<timestamp>.json)",
|
||||
)
|
||||
|
||||
def handle(self, *args, **options):
|
||||
backup_timestamp = timezone.now()
|
||||
timestamp = backup_timestamp.strftime("%Y%m%d_%H%M%S")
|
||||
output_path = Path(
|
||||
options.get("output") or f"collections_backup_{timestamp}.json"
|
||||
)
|
||||
|
||||
if output_path.parent and not output_path.parent.exists():
|
||||
raise CommandError(f"Output directory does not exist: {output_path.parent}")
|
||||
|
||||
collections = list(
|
||||
Collection.objects.values(
|
||||
"id",
|
||||
"user_id",
|
||||
"name",
|
||||
"description",
|
||||
"is_public",
|
||||
"is_archived",
|
||||
"start_date",
|
||||
"end_date",
|
||||
"link",
|
||||
"primary_image_id",
|
||||
"created_at",
|
||||
"updated_at",
|
||||
)
|
||||
)
|
||||
|
||||
shared_with_map = {
|
||||
str(collection.id): list(
|
||||
collection.shared_with.values_list("id", flat=True)
|
||||
)
|
||||
for collection in Collection.objects.prefetch_related("shared_with")
|
||||
}
|
||||
for collection in collections:
|
||||
collection["shared_with_ids"] = shared_with_map.get(
|
||||
str(collection["id"]), []
|
||||
)
|
||||
|
||||
itinerary_items = list(
|
||||
CollectionItineraryItem.objects.select_related("content_type").values(
|
||||
"id",
|
||||
"collection_id",
|
||||
"content_type_id",
|
||||
"content_type__app_label",
|
||||
"content_type__model",
|
||||
"object_id",
|
||||
"date",
|
||||
"is_global",
|
||||
"order",
|
||||
"created_at",
|
||||
)
|
||||
)
|
||||
|
||||
backup_payload = {
|
||||
"backup_type": "collections_snapshot",
|
||||
"timestamp": backup_timestamp.isoformat(),
|
||||
"counts": {
|
||||
"collections": len(collections),
|
||||
"collection_itinerary_items": len(itinerary_items),
|
||||
},
|
||||
"collections": collections,
|
||||
"collection_itinerary_items": itinerary_items,
|
||||
}
|
||||
|
||||
try:
|
||||
with output_path.open("w", encoding="utf-8") as backup_file:
|
||||
json.dump(backup_payload, backup_file, indent=2, cls=DjangoJSONEncoder)
|
||||
except OSError as exc:
|
||||
raise CommandError(f"Failed to write backup file: {exc}") from exc
|
||||
except (TypeError, ValueError) as exc:
|
||||
raise CommandError(f"Failed to serialize backup data: {exc}") from exc
|
||||
|
||||
self.stdout.write(
|
||||
self.style.SUCCESS(
|
||||
"Exported collections backup to "
|
||||
f"{output_path} "
|
||||
f"at {backup_timestamp.isoformat()} "
|
||||
f"(collections: {len(collections)}, "
|
||||
f"itinerary_items: {len(itinerary_items)})."
|
||||
)
|
||||
)
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,16 +1,34 @@
|
||||
import json
|
||||
import tempfile
|
||||
import base64
|
||||
from datetime import timedelta
|
||||
from pathlib import Path
|
||||
from unittest.mock import Mock, patch
|
||||
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.core.cache import cache
|
||||
from django.core.files.uploadedfile import SimpleUploadedFile
|
||||
from django.core.management import call_command
|
||||
from django.core.management.base import CommandError
|
||||
from django.test import TestCase
|
||||
from django.utils import timezone
|
||||
from rest_framework.test import APIClient, APITestCase
|
||||
|
||||
from adventures.models import (
|
||||
Collection,
|
||||
CollectionItineraryItem,
|
||||
ContentImage,
|
||||
Lodging,
|
||||
Note,
|
||||
Transportation,
|
||||
)
|
||||
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class WeatherEndpointTests(APITestCase):
|
||||
class WeatherViewTests(APITestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create_user(
|
||||
username="weather-user",
|
||||
@@ -35,11 +53,38 @@ class WeatherEndpointTests(APITestCase):
|
||||
self.assertEqual(response.status_code, 400)
|
||||
self.assertIn("maximum", response.json().get("error", "").lower())
|
||||
|
||||
@patch("adventures.views.weather_view.requests.get")
|
||||
def test_daily_temperatures_future_date_returns_unavailable_without_external_call(
|
||||
self, mock_requests_get
|
||||
@patch("adventures.views.weather_view.WeatherViewSet._fetch_daily_temperature")
|
||||
def test_daily_temperatures_future_date_reaches_fetch_path(
|
||||
self, mock_fetch_temperature
|
||||
):
|
||||
future_date = (timezone.now().date() + timedelta(days=10)).isoformat()
|
||||
mock_fetch_temperature.return_value = {
|
||||
"date": future_date,
|
||||
"available": True,
|
||||
"temperature_c": 22.5,
|
||||
}
|
||||
|
||||
response = self.client.post(
|
||||
"/api/weather/daily-temperatures/",
|
||||
{"days": [{"date": future_date, "latitude": 12.34, "longitude": 56.78}]},
|
||||
format="json",
|
||||
)
|
||||
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertEqual(response.json()["results"][0]["date"], future_date)
|
||||
self.assertTrue(response.json()["results"][0]["available"])
|
||||
self.assertEqual(response.json()["results"][0]["temperature_c"], 22.5)
|
||||
mock_fetch_temperature.assert_called_once_with(future_date, 12.34, 56.78)
|
||||
|
||||
@patch("adventures.views.weather_view.requests.get")
|
||||
def test_daily_temperatures_far_future_returns_unavailable_when_upstream_has_no_data(
|
||||
self, mock_requests_get
|
||||
):
|
||||
future_date = (timezone.now().date() + timedelta(days=3650)).isoformat()
|
||||
mocked_response = Mock()
|
||||
mocked_response.raise_for_status.return_value = None
|
||||
mocked_response.json.return_value = {"daily": {}}
|
||||
mock_requests_get.return_value = mocked_response
|
||||
|
||||
response = self.client.post(
|
||||
"/api/weather/daily-temperatures/",
|
||||
@@ -52,7 +97,7 @@ class WeatherEndpointTests(APITestCase):
|
||||
response.json()["results"][0],
|
||||
{"date": future_date, "available": False, "temperature_c": None},
|
||||
)
|
||||
mock_requests_get.assert_not_called()
|
||||
self.assertEqual(mock_requests_get.call_count, 2)
|
||||
|
||||
@patch("adventures.views.weather_view.requests.get")
|
||||
def test_daily_temperatures_accepts_zero_lat_lon(self, mock_requests_get):
|
||||
@@ -106,3 +151,166 @@ class MCPAuthTests(APITestCase):
|
||||
unauthenticated_client = APIClient()
|
||||
response = unauthenticated_client.post("/api/mcp", {}, format="json")
|
||||
self.assertIn(response.status_code, [401, 403])
|
||||
|
||||
|
||||
class CollectionViewSetTests(APITestCase):
|
||||
def setUp(self):
|
||||
self.owner = User.objects.create_user(
|
||||
username="collection-owner",
|
||||
email="owner@example.com",
|
||||
password="password123",
|
||||
)
|
||||
self.shared_user = User.objects.create_user(
|
||||
username="collection-shared",
|
||||
email="shared@example.com",
|
||||
password="password123",
|
||||
)
|
||||
|
||||
def _create_test_image_file(self, name="test.png"):
|
||||
# 1x1 PNG
|
||||
png_bytes = base64.b64decode(
|
||||
"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO7Y9x8AAAAASUVORK5CYII="
|
||||
)
|
||||
return SimpleUploadedFile(name, png_bytes, content_type="image/png")
|
||||
|
||||
def _create_collection_with_non_location_images(self):
|
||||
collection = Collection.objects.create(
|
||||
user=self.owner,
|
||||
name="Image fallback collection",
|
||||
)
|
||||
|
||||
lodging = Lodging.objects.create(
|
||||
user=self.owner,
|
||||
collection=collection,
|
||||
name="Fallback lodge",
|
||||
)
|
||||
transportation = Transportation.objects.create(
|
||||
user=self.owner,
|
||||
collection=collection,
|
||||
type="car",
|
||||
name="Fallback ride",
|
||||
)
|
||||
|
||||
lodging_content_type = ContentType.objects.get_for_model(Lodging)
|
||||
transportation_content_type = ContentType.objects.get_for_model(Transportation)
|
||||
|
||||
ContentImage.objects.create(
|
||||
user=self.owner,
|
||||
content_type=lodging_content_type,
|
||||
object_id=lodging.id,
|
||||
image=self._create_test_image_file("lodging.png"),
|
||||
is_primary=True,
|
||||
)
|
||||
ContentImage.objects.create(
|
||||
user=self.owner,
|
||||
content_type=transportation_content_type,
|
||||
object_id=transportation.id,
|
||||
image=self._create_test_image_file("transport.png"),
|
||||
is_primary=True,
|
||||
)
|
||||
|
||||
return collection
|
||||
|
||||
def test_list_includes_lodging_transportation_images_when_no_location_images(self):
|
||||
collection = self._create_collection_with_non_location_images()
|
||||
|
||||
self.client.force_authenticate(user=self.owner)
|
||||
response = self.client.get("/api/collections/")
|
||||
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertGreater(len(response.data.get("results", [])), 0)
|
||||
|
||||
collection_payload = next(
|
||||
item
|
||||
for item in response.data["results"]
|
||||
if item["id"] == str(collection.id)
|
||||
)
|
||||
self.assertIn("location_images", collection_payload)
|
||||
self.assertGreater(len(collection_payload["location_images"]), 0)
|
||||
self.assertTrue(
|
||||
any(
|
||||
image.get("is_primary")
|
||||
for image in collection_payload["location_images"]
|
||||
)
|
||||
)
|
||||
|
||||
def test_shared_endpoint_includes_non_location_primary_images(self):
|
||||
collection = self._create_collection_with_non_location_images()
|
||||
collection.shared_with.add(self.shared_user)
|
||||
|
||||
self.client.force_authenticate(user=self.shared_user)
|
||||
response = self.client.get("/api/collections/shared/")
|
||||
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertGreater(len(response.data), 0)
|
||||
|
||||
collection_payload = next(
|
||||
item for item in response.data if item["id"] == str(collection.id)
|
||||
)
|
||||
self.assertEqual(str(collection.id), collection_payload["id"])
|
||||
self.assertIn("location_images", collection_payload)
|
||||
self.assertGreater(len(collection_payload["location_images"]), 0)
|
||||
first_image = collection_payload["location_images"][0]
|
||||
self.assertSetEqual(
|
||||
set(first_image.keys()),
|
||||
{"id", "image", "is_primary", "user", "immich_id"},
|
||||
)
|
||||
|
||||
|
||||
class ExportCollectionsBackupCommandTests(TestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create_user(
|
||||
username="backup-user",
|
||||
email="backup@example.com",
|
||||
password="password123",
|
||||
)
|
||||
self.collaborator = User.objects.create_user(
|
||||
username="collab-user",
|
||||
email="collab@example.com",
|
||||
password="password123",
|
||||
)
|
||||
self.collection = Collection.objects.create(
|
||||
user=self.user,
|
||||
name="My Trip",
|
||||
description="Backup test collection",
|
||||
)
|
||||
self.collection.shared_with.add(self.collaborator)
|
||||
|
||||
note = Note.objects.create(user=self.user, name="Test item")
|
||||
note_content_type = ContentType.objects.get_for_model(Note)
|
||||
CollectionItineraryItem.objects.create(
|
||||
collection=self.collection,
|
||||
content_type=note_content_type,
|
||||
object_id=note.id,
|
||||
date=timezone.now().date(),
|
||||
is_global=False,
|
||||
order=1,
|
||||
)
|
||||
|
||||
def test_export_collections_backup_writes_expected_payload(self):
|
||||
with tempfile.TemporaryDirectory() as temp_dir:
|
||||
output_file = Path(temp_dir) / "collections_snapshot.json"
|
||||
|
||||
call_command("export_collections_backup", output=str(output_file))
|
||||
|
||||
self.assertTrue(output_file.exists())
|
||||
payload = json.loads(output_file.read_text(encoding="utf-8"))
|
||||
|
||||
self.assertEqual(payload["backup_type"], "collections_snapshot")
|
||||
self.assertIn("timestamp", payload)
|
||||
self.assertEqual(payload["counts"]["collections"], 1)
|
||||
self.assertEqual(payload["counts"]["collection_itinerary_items"], 1)
|
||||
self.assertEqual(len(payload["collections"]), 1)
|
||||
self.assertEqual(len(payload["collection_itinerary_items"]), 1)
|
||||
self.assertEqual(
|
||||
payload["collections"][0]["shared_with_ids"],
|
||||
[self.collaborator.id],
|
||||
)
|
||||
|
||||
def test_export_collections_backup_raises_for_missing_output_directory(self):
|
||||
with tempfile.TemporaryDirectory() as temp_dir:
|
||||
missing_directory = Path(temp_dir) / "missing"
|
||||
output_file = missing_directory / "collections_snapshot.json"
|
||||
|
||||
with self.assertRaises(CommandError):
|
||||
call_command("export_collections_backup", output=str(output_file))
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -60,12 +60,6 @@ class WeatherViewSet(viewsets.ViewSet):
|
||||
)
|
||||
continue
|
||||
|
||||
if parsed_date > date_cls.today():
|
||||
results.append(
|
||||
{"date": date, "available": False, "temperature_c": None}
|
||||
)
|
||||
continue
|
||||
|
||||
try:
|
||||
lat = float(latitude)
|
||||
lon = float(longitude)
|
||||
|
||||
Reference in New Issue
Block a user