Merge branch 'main' of github.com:seanmorley15/AdventureLog

backend/entrypoint.sh

@@ -39,4 +39,4 @@ python manage.py download-countries
 cat /code/adventurelog.txt
 
 # Start gunicorn
-gunicorn main.wsgi:application --bind 0.0.0.0:8000
+gunicorn main.wsgi:application --bind 0.0.0.0:8000 --timeout 120 --workers 2

backend/server/.env.example

@@ -20,4 +20,15 @@ EMAIL_BACKEND='console'
 # EMAIL_USE_SSL=True
 # EMAIL_HOST_USER='user'
 # EMAIL_HOST_PASSWORD='password'
-# DEFAULT_FROM_EMAIL='user@example.com'
+# DEFAULT_FROM_EMAIL='user@example.com'
+
+
+# ------------------- #
+# For Developers to start a Demo Database
+# docker run --name postgres-admin -e POSTGRES_USER=admin -e POSTGRES_PASSWORD=admin -e POSTGRES_DB=admin -p 5432:5432 -d postgis/postgis:15-3.3
+
+# PGHOST='localhost'
+# PGDATABASE='admin'
+# PGUSER='admin'
+# PGPASSWORD='admin'
+# ------------------- #

backend/server/adventures/admin.py

@@ -8,8 +8,6 @@ from allauth.account.decorators import secure_admin_login
 admin.autodiscover()
 admin.site.login = secure_admin_login(admin.site.login)
 
-
-
 class AdventureAdmin(admin.ModelAdmin):
     list_display = ('name', 'get_category', 'get_visit_count',  'user_id', 'is_public')
     list_filter = ( 'user_id', 'is_public')

backend/server/adventures/migrations/0015_transportation_destination_latitude_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 5.0.8 on 2024-12-19 17:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0014_alter_category_unique_together'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='transportation',
+            name='destination_latitude',
+            field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True),
+        ),
+        migrations.AddField(
+            model_name='transportation',
+            name='destination_longitude',
+            field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True),
+        ),
+        migrations.AddField(
+            model_name='transportation',
+            name='origin_latitude',
+            field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True),
+        ),
+        migrations.AddField(
+            model_name='transportation',
+            name='origin_longitude',
+            field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True),
+        ),
+    ]

backend/server/adventures/migrations/0016_alter_adventureimage_image.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.0.8 on 2025-01-01 21:40
+
+import adventures.models
+import django_resized.forms
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0015_transportation_destination_latitude_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='adventureimage',
+            name='image',
+            field=django_resized.forms.ResizedImageField(crop=None, force_format='WEBP', keep_meta=True, quality=75, scale=None, size=[1920, 1080], upload_to=adventures.models.PathAndRename('images/')),
+        ),
+    ]

backend/server/adventures/migrations/0017_adventureimage_is_primary.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.8 on 2025-01-03 04:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0016_alter_adventureimage_image'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='adventureimage',
+            name='is_primary',
+            field=models.BooleanField(default=False),
+        ),
+    ]

backend/server/adventures/models.py

@@ -1,7 +1,9 @@
 from collections.abc import Collection
+import os
 from typing import Iterable
 import uuid
 from django.db import models
+from django.utils.deconstruct import deconstructible
 
 from django.contrib.auth import get_user_model
 from django.contrib.postgres.fields import ArrayField
@@ -167,6 +169,10 @@ class Transportation(models.Model):
     end_date = models.DateTimeField(blank=True, null=True)
     flight_number = models.CharField(max_length=100, blank=True, null=True)
     from_location = models.CharField(max_length=200, blank=True, null=True)
+    origin_latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
+    origin_longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
+    destination_latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
+    destination_longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
     to_location = models.CharField(max_length=200, blank=True, null=True)
     is_public = models.BooleanField(default=False)
     collection = models.ForeignKey('Collection', on_delete=models.CASCADE, blank=True, null=True)
@@ -253,12 +259,28 @@ class ChecklistItem(models.Model):
     def __str__(self):
         return self.name
 
+@deconstructible
+class PathAndRename:
+    def __init__(self, path):
+        self.path = path
+
+    def __call__(self, instance, filename):
+        ext = filename.split('.')[-1]
+        # Generate a new UUID for the filename
+        filename = f"{uuid.uuid4()}.{ext}"
+        return os.path.join(self.path, filename)
+
 class AdventureImage(models.Model):
     id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
     user_id = models.ForeignKey(
         User, on_delete=models.CASCADE, default=default_user_id)
-    image = ResizedImageField(force_format="WEBP", quality=75, upload_to='images/')
+    image = ResizedImageField(
+        force_format="WEBP",
+        quality=75,
+        upload_to=PathAndRename('images/')  # Use the callable class here
+    )
     adventure = models.ForeignKey(Adventure, related_name='images', on_delete=models.CASCADE)
+    is_primary = models.BooleanField(default=False)
 
     def __str__(self):
         return self.image.url

backend/server/adventures/serializers.py

@@ -8,7 +8,7 @@ from main.utils import CustomModelSerializer
 class AdventureImageSerializer(CustomModelSerializer):
     class Meta:
         model = AdventureImage
-        fields = ['id', 'image', 'adventure']
+        fields = ['id', 'image', 'adventure', 'is_primary']
         read_only_fields = ['id']
 
     def to_representation(self, instance):
@@ -116,7 +116,7 @@ class AdventureSerializer(CustomModelSerializer):
         return False
 
     def create(self, validated_data):
-        visits_data = validated_data.pop('visits', [])
+        visits_data = validated_data.pop('visits', None)
         category_data = validated_data.pop('category', None)
         print(category_data)
         adventure = Adventure.objects.create(**validated_data)
@@ -131,6 +131,7 @@ class AdventureSerializer(CustomModelSerializer):
         return adventure
 
     def update(self, instance, validated_data):
+        has_visits = 'visits' in validated_data
         visits_data = validated_data.pop('visits', [])
         category_data = validated_data.pop('category', None)
 
@@ -142,24 +143,25 @@ class AdventureSerializer(CustomModelSerializer):
             instance.category = category
         instance.save()
 
-        current_visits = instance.visits.all()
-        current_visit_ids = set(current_visits.values_list('id', flat=True))
+        if has_visits:
+            current_visits = instance.visits.all()
+            current_visit_ids = set(current_visits.values_list('id', flat=True))
 
-        updated_visit_ids = set()
-        for visit_data in visits_data:
-            visit_id = visit_data.get('id')
-            if visit_id and visit_id in current_visit_ids:
-                visit = current_visits.get(id=visit_id)
-                for attr, value in visit_data.items():
-                    setattr(visit, attr, value)
-                visit.save()
-                updated_visit_ids.add(visit_id)
-            else:
-                new_visit = Visit.objects.create(adventure=instance, **visit_data)
-                updated_visit_ids.add(new_visit.id)
+            updated_visit_ids = set()
+            for visit_data in visits_data:
+                visit_id = visit_data.get('id')
+                if visit_id and visit_id in current_visit_ids:
+                    visit = current_visits.get(id=visit_id)
+                    for attr, value in visit_data.items():
+                        setattr(visit, attr, value)
+                    visit.save()
+                    updated_visit_ids.add(visit_id)
+                else:
+                    new_visit = Visit.objects.create(adventure=instance, **visit_data)
+                    updated_visit_ids.add(new_visit.id)
 
-        visits_to_delete = current_visit_ids - updated_visit_ids
-        instance.visits.filter(id__in=visits_to_delete).delete()
+            visits_to_delete = current_visit_ids - updated_visit_ids
+            instance.visits.filter(id__in=visits_to_delete).delete()
 
         return instance
 
@@ -170,7 +172,7 @@ class TransportationSerializer(CustomModelSerializer):
         fields = [
             'id', 'user_id', 'type', 'name', 'description', 'rating', 
             'link', 'date', 'flight_number', 'from_location', 'to_location', 
-            'is_public', 'collection', 'created_at', 'updated_at', 'end_date'
+            'is_public', 'collection', 'created_at', 'updated_at', 'end_date', 'origin_latitude', 'origin_longitude', 'destination_latitude', 'destination_longitude'
         ]
         read_only_fields = ['id', 'created_at', 'updated_at', 'user_id']
 

backend/server/adventures/views.py

@@ -1032,7 +1032,29 @@ class AdventureImageViewSet(viewsets.ModelViewSet):
     @action(detail=True, methods=['post'])
     def image_delete(self, request, *args, **kwargs):
         return self.destroy(request, *args, **kwargs)
+    
+    @action(detail=True, methods=['post'])
+    def toggle_primary(self, request, *args, **kwargs):
+        # Makes the image the primary image for the adventure, if there is already a primary image linked to the adventure, it is set to false and the new image is set to true. make sure that the permission is set to the owner of the adventure
+        if not request.user.is_authenticated:
+            return Response({"error": "User is not authenticated"}, status=status.HTTP_401_UNAUTHORIZED)
+        
+        instance = self.get_object()
+        adventure = instance.adventure
+        if adventure.user_id != request.user:
+            return Response({"error": "User does not own this adventure"}, status=status.HTTP_403_FORBIDDEN)
+        
+        # Check if the image is already the primary image
+        if instance.is_primary:
+            return Response({"error": "Image is already the primary image"}, status=status.HTTP_400_BAD_REQUEST)
+        
+        # Set the current primary image to false
+        AdventureImage.objects.filter(adventure=adventure, is_primary=True).update(is_primary=False)
 
+        # Set the new image to true
+        instance.is_primary = True
+        instance.save()
+        return Response({"success": "Image set as primary image"})
 
     def create(self, request, *args, **kwargs):
         if not request.user.is_authenticated:
@@ -1233,10 +1255,24 @@ class IcsCalendarGeneratorViewSet(viewsets.ViewSet):
         for adventure in serializer.data:
             if adventure['visits']:
                 for visit in adventure['visits']:
+                    # Skip if start_date is missing
+                    if not visit.get('start_date'):
+                        continue
+
+                    # Parse start_date and handle end_date
+                    try:
+                        start_date = datetime.strptime(visit['start_date'], '%Y-%m-%d').date()
+                    except ValueError:
+                        continue  # Skip if the start_date is invalid
+
+                    end_date = (
+                        datetime.strptime(visit['end_date'], '%Y-%m-%d').date() + timedelta(days=1)
+                        if visit.get('end_date') else start_date + timedelta(days=1)
+                    )
+                    
+                    # Create event
                     event = Event()
                     event.add('summary', adventure['name'])
-                    start_date = datetime.strptime(visit['start_date'], '%Y-%m-%d').date()
-                    end_date = datetime.strptime(visit['end_date'], '%Y-%m-%d').date() + timedelta(days=1) if visit['end_date'] else start_date + timedelta(days=1)
                     event.add('dtstart', start_date)
                     event.add('dtend', end_date)
                     event.add('dtstamp', datetime.now())

backend/server/integrations/admin.py

@@ -0,0 +1,9 @@
+from django.contrib import admin
+from allauth.account.decorators import secure_admin_login
+
+from .models import ImmichIntegration
+
+admin.autodiscover()
+admin.site.login = secure_admin_login(admin.site.login)
+
+admin.site.register(ImmichIntegration)

backend/server/integrations/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class IntegrationsConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'integrations'

backend/server/integrations/migrations/0001_initial.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.0.8 on 2025-01-02 23:16
+
+import django.db.models.deletion
+import uuid
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ImmichIntegration',
+            fields=[
+                ('server_url', models.CharField(max_length=255)),
+                ('api_key', models.CharField(max_length=255)),
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

backend/server/integrations/models.py

@@ -0,0 +1,15 @@
+from django.db import models
+from django.contrib.auth import get_user_model
+import uuid
+
+User = get_user_model()
+
+class ImmichIntegration(models.Model):
+    server_url = models.CharField(max_length=255)
+    api_key = models.CharField(max_length=255)
+    user = models.ForeignKey(
+        User, on_delete=models.CASCADE)
+    id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
+
+    def __str__(self):
+        return self.user.username + ' - ' + self.server_url

backend/server/integrations/serializers.py

@@ -0,0 +1,13 @@
+from .models import ImmichIntegration
+from rest_framework import serializers
+
+class ImmichIntegrationSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ImmichIntegration
+        fields = '__all__'
+        read_only_fields = ['id', 'user']
+
+    def to_representation(self, instance):
+        representation = super().to_representation(instance)
+        representation.pop('user', None)
+        return representation

backend/server/integrations/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

backend/server/integrations/urls.py

@@ -0,0 +1,14 @@
+from django.urls import path, include
+from rest_framework.routers import DefaultRouter
+from integrations.views import ImmichIntegrationView, IntegrationView, ImmichIntegrationViewSet
+
+# Create the router and register the ViewSet
+router = DefaultRouter()
+router.register(r'immich', ImmichIntegrationView, basename='immich')
+router.register(r'', IntegrationView, basename='integrations')
+router.register(r'immich', ImmichIntegrationViewSet, basename='immich_viewset')
+
+# Include the router URLs
+urlpatterns = [
+    path("", include(router.urls)),  # Includes /immich/ routes
+]

backend/server/integrations/views.py

@@ -0,0 +1,314 @@
+import os
+from rest_framework.response import Response
+from rest_framework import viewsets, status
+
+from .serializers import ImmichIntegrationSerializer
+from .models import ImmichIntegration
+from rest_framework.decorators import action
+from rest_framework.permissions import IsAuthenticated
+import requests
+from rest_framework.pagination import PageNumberPagination
+
+class IntegrationView(viewsets.ViewSet):
+    permission_classes = [IsAuthenticated]
+    def list(self, request):
+        """
+        RESTful GET method for listing all integrations.
+        """
+        immich_integrations = ImmichIntegration.objects.filter(user=request.user)
+
+        return Response(
+            {
+                'immich': immich_integrations.exists()
+            },
+            status=status.HTTP_200_OK
+        )
+
+
+class StandardResultsSetPagination(PageNumberPagination):
+    page_size = 25
+    page_size_query_param = 'page_size'
+    max_page_size = 1000
+
+class ImmichIntegrationView(viewsets.ViewSet):
+    permission_classes = [IsAuthenticated]
+    pagination_class = StandardResultsSetPagination
+    def check_integration(self, request):
+        """
+        Checks if the user has an active Immich integration.
+        Returns:
+            - None if the integration exists.
+            - A Response with an error message if the integration is missing.
+        """
+        user_integrations = ImmichIntegration.objects.filter(user=request.user)
+        if not user_integrations.exists():
+            return Response(
+                {
+                    'message': 'You need to have an active Immich integration to use this feature.',
+                    'error': True,
+                    'code': 'immich.integration_missing'
+                },
+                status=status.HTTP_403_FORBIDDEN
+            )
+        return ImmichIntegration.objects.first()
+
+    @action(detail=False, methods=['get'], url_path='search')
+    def search(self, request):
+        """
+        Handles the logic for searching Immich images.
+        """
+        # Check for integration before proceeding
+        integration = self.check_integration(request)
+        if isinstance(integration, Response):
+            return integration
+        
+        query = request.query_params.get('query', '')
+
+        if not query:
+            return Response(
+                {
+                    'message': 'Query is required.',
+                    'error': True,
+                    'code': 'immich.query_required'
+                },
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        
+        # check so if the server is down, it does not tweak out like a madman and crash the server with a 500 error code
+        try:
+            immich_fetch = requests.post(f'{integration.server_url}/search/smart', headers={
+                'x-api-key': integration.api_key
+            },
+            json = {
+                'query': query
+            }
+            )
+            res = immich_fetch.json()
+        except requests.exceptions.ConnectionError:
+            return Response(
+                {
+                    'message': 'The Immich server is currently down or unreachable.',
+                    'error': True,
+                    'code': 'immich.server_down'
+                },
+                status=status.HTTP_503_SERVICE_UNAVAILABLE
+            )
+        
+        if 'assets' in res and 'items' in res['assets']:
+            paginator = self.pagination_class()
+            # for each item in the items, we need to add the image url to the item so we can display it in the frontend
+            public_url = os.environ.get('PUBLIC_URL', 'http://127.0.0.1:8000').rstrip('/')
+            public_url = public_url.replace("'", "")
+            for item in res['assets']['items']:
+                item['image_url'] = f'{public_url}/api/integrations/immich/get/{item["id"]}'
+            result_page = paginator.paginate_queryset(res['assets']['items'], request)
+            return paginator.get_paginated_response(result_page)
+        else:
+            return Response(
+                {
+                    'message': 'No items found.',
+                    'error': True,
+                    'code': 'immich.no_items_found'
+                },
+                status=status.HTTP_404_NOT_FOUND
+            )
+    
+    @action(detail=False, methods=['get'], url_path='get/(?P<imageid>[^/.]+)')
+    def get(self, request, imageid=None):
+        """
+        RESTful GET method for retrieving a specific Immich image by ID.
+        """
+        # Check for integration before proceeding
+        integration = self.check_integration(request)
+        if isinstance(integration, Response):
+            return integration
+
+        if not imageid:
+            return Response(
+                {
+                    'message': 'Image ID is required.',
+                    'error': True,
+                    'code': 'immich.imageid_required'
+                },
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        
+        # check so if the server is down, it does not tweak out like a madman and crash the server with a 500 error code
+        try:
+            immich_fetch = requests.get(f'{integration.server_url}/assets/{imageid}/thumbnail?size=preview', headers={
+                'x-api-key': integration.api_key
+            })
+            # should return the image file
+            from django.http import HttpResponse
+            return HttpResponse(immich_fetch.content, content_type='image/jpeg', status=status.HTTP_200_OK)
+        except requests.exceptions.ConnectionError:
+            return Response(
+                {
+                    'message': 'The Immich server is currently down or unreachable.',
+                    'error': True,
+                    'code': 'immich.server_down'
+                },
+                status=status.HTTP_503_SERVICE_UNAVAILABLE
+            )
+        
+    @action(detail=False, methods=['get'])
+    def albums(self, request):
+        """
+        RESTful GET method for retrieving all Immich albums.
+        """
+        # Check for integration before proceeding
+        integration = self.check_integration(request)
+        if isinstance(integration, Response):
+            return integration
+
+        # check so if the server is down, it does not tweak out like a madman and crash the server with a 500 error code
+        try:
+            immich_fetch = requests.get(f'{integration.server_url}/albums', headers={
+                'x-api-key': integration.api_key
+            })
+            res = immich_fetch.json()
+        except requests.exceptions.ConnectionError:
+            return Response(
+                {
+                    'message': 'The Immich server is currently down or unreachable.',
+                    'error': True,
+                    'code': 'immich.server_down'
+                },
+                status=status.HTTP_503_SERVICE_UNAVAILABLE
+            )
+        
+        return Response(
+            res,
+            status=status.HTTP_200_OK
+        )
+
+    @action(detail=False, methods=['get'], url_path='albums/(?P<albumid>[^/.]+)')
+    def album(self, request, albumid=None):
+        """
+        RESTful GET method for retrieving a specific Immich album by ID.
+        """
+        # Check for integration before proceeding
+        integration = self.check_integration(request)
+        if isinstance(integration, Response):
+            return integration
+
+        if not albumid:
+            return Response(
+                {
+                    'message': 'Album ID is required.',
+                    'error': True,
+                    'code': 'immich.albumid_required'
+                },
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        
+        # check so if the server is down, it does not tweak out like a madman and crash the server with a 500 error code
+        try:
+            immich_fetch = requests.get(f'{integration.server_url}/albums/{albumid}', headers={
+                'x-api-key': integration.api_key
+            })
+            res = immich_fetch.json()
+        except requests.exceptions.ConnectionError:
+            return Response(
+                {
+                    'message': 'The Immich server is currently down or unreachable.',
+                    'error': True,
+                    'code': 'immich.server_down'
+                },
+                status=status.HTTP_503_SERVICE_UNAVAILABLE
+            )
+        
+        if 'assets' in res:
+            return Response(
+                res['assets'],
+                status=status.HTTP_200_OK
+            )
+        else:
+            return Response(
+                {
+                    'message': 'No assets found in this album.',
+                    'error': True,
+                    'code': 'immich.no_assets_found'
+                },
+                status=status.HTTP_404_NOT_FOUND
+            )
+
+class ImmichIntegrationViewSet(viewsets.ModelViewSet):
+    permission_classes = [IsAuthenticated]
+    serializer_class = ImmichIntegrationSerializer
+    queryset = ImmichIntegration.objects.all()
+
+    def get_queryset(self):
+        return ImmichIntegration.objects.filter(user=self.request.user)
+
+    def create(self, request):
+        """
+        RESTful POST method for creating a new Immich integration.
+        """
+
+        # Check if the user already has an integration
+        user_integrations = ImmichIntegration.objects.filter(user=request.user)
+        if user_integrations.exists():
+            return Response(
+                {
+                    'message': 'You already have an active Immich integration.',
+                    'error': True,
+                    'code': 'immich.integration_exists'
+                },
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        serializer = self.serializer_class(data=request.data)
+        if serializer.is_valid():
+            serializer.save(user=request.user)
+            return Response(
+                serializer.data,
+                status=status.HTTP_201_CREATED
+            )
+        return Response(
+            serializer.errors,
+            status=status.HTTP_400_BAD_REQUEST
+        )
+
+    def destroy(self, request, pk=None):
+        """
+        RESTful DELETE method for deleting an existing Immich integration.
+        """
+        integration = ImmichIntegration.objects.filter(user=request.user, id=pk).first()
+        if not integration:
+            return Response(
+                {
+                    'message': 'Integration not found.',
+                    'error': True,
+                    'code': 'immich.integration_not_found'
+                },
+                status=status.HTTP_404_NOT_FOUND
+            )
+        integration.delete()
+        return Response(
+            {
+                'message': 'Integration deleted successfully.'
+            },
+            status=status.HTTP_200_OK
+        )
+    
+    def list(self, request, *args, **kwargs):
+        # If the user has an integration, we only want to return that integration
+
+        user_integrations = ImmichIntegration.objects.filter(user=request.user)
+        if user_integrations.exists():
+            integration = user_integrations.first()
+            serializer = self.serializer_class(integration)
+            return Response(
+                serializer.data,
+                status=status.HTTP_200_OK
+            )
+        else:
+            return Response(
+                {
+                    'message': 'No integration found.',
+                    'error': True,
+                    'code': 'immich.integration_not_found'
+                },
+                status=status.HTTP_404_NOT_FOUND
+            )

backend/server/main/settings.py

@@ -56,6 +56,7 @@ INSTALLED_APPS = (
     'adventures',
     'worldtravel',
     'users',
+    'integrations',
     'django.contrib.gis',
 )
 
@@ -164,9 +165,6 @@ TEMPLATES = [
 DISABLE_REGISTRATION = getenv('DISABLE_REGISTRATION', 'False') == 'True'
 DISABLE_REGISTRATION_MESSAGE = getenv('DISABLE_REGISTRATION_MESSAGE', 'Registration is disabled. Please contact the administrator if you need an account.')
 
-ALLAUTH_UI_THEME = "dark"
-SILENCED_SYSTEM_CHECKS = ["slippers.E001"]
-
 AUTH_USER_MODEL = 'users.CustomUser'
 
 ACCOUNT_ADAPTER = 'users.adapters.NoNewUsersAccountAdapter'
@@ -222,10 +220,16 @@ REST_FRAMEWORK = {
     'DEFAULT_SCHEMA_CLASS': 'rest_framework.schemas.coreapi.AutoSchema',
 }
 
-SWAGGER_SETTINGS = {
-    'LOGIN_URL': 'login',
-    'LOGOUT_URL': 'logout',
-}
+if DEBUG:
+    REST_FRAMEWORK['DEFAULT_RENDERER_CLASSES'] = (
+        'rest_framework.renderers.JSONRenderer',
+        'rest_framework.renderers.BrowsableAPIRenderer',
+    )
+else:
+    REST_FRAMEWORK['DEFAULT_RENDERER_CLASSES'] = (
+        'rest_framework.renderers.JSONRenderer',
+    )
+
 
 CORS_ALLOWED_ORIGINS = [origin.strip() for origin in getenv('CSRF_TRUSTED_ORIGINS', 'http://localhost').split(',') if origin.strip()]
 

backend/server/main/urls.py

@@ -39,6 +39,8 @@ urlpatterns = [
     # path('auth/account-confirm-email/', VerifyEmailView.as_view(), name='account_email_verification_sent'),
     path("accounts/", include("allauth.urls")),
 
+    path("api/integrations/", include("integrations.urls")),
+
     # Include the API endpoints:
     
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

backend/server/templates/base.html

@@ -53,6 +53,7 @@
                 >Documentation</a
               >
             </li>
+
             <li>
               <a
                 target="_blank"
@@ -60,6 +61,7 @@
                 >Source Code</a
               >
             </li>
+            <li><a href="/docs">API Docs</a></li>
           </ul>
         </div>
         <!--/.nav-collapse -->

backend/server/worldtravel/management/commands/download-countries.py

@@ -68,6 +68,8 @@ class Command(BaseCommand):
                 country_name = country['name']
                 country_subregion = country['subregion']
                 country_capital = country['capital']
+                longitude = round(float(country['longitude']), 6) if country['longitude'] else None
+                latitude = round(float(country['latitude']), 6) if country['latitude'] else None
 
                 processed_country_codes.add(country_code)
 
@@ -76,13 +78,17 @@ class Command(BaseCommand):
                     country_obj.name = country_name
                     country_obj.subregion = country_subregion
                     country_obj.capital = country_capital
+                    country_obj.longitude = longitude
+                    country_obj.latitude = latitude
                     countries_to_update.append(country_obj)
                 else:
                     country_obj = Country(
                         name=country_name,
                         country_code=country_code,
                         subregion=country_subregion,
-                        capital=country_capital
+                        capital=country_capital,
+                        longitude=longitude,
+                        latitude=latitude
                     )
                     countries_to_create.append(country_obj)
 

backend/server/worldtravel/migrations/0011_country_latitude_country_longitude.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.8 on 2025-01-02 00:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('worldtravel', '0010_country_capital'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='country',
+            name='latitude',
+            field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True),
+        ),
+        migrations.AddField(
+            model_name='country',
+            name='longitude',
+            field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True),
+        ),
+    ]

backend/server/worldtravel/models.py

@@ -15,6 +15,8 @@ class Country(models.Model):
     country_code = models.CharField(max_length=2, unique=True) #iso2 code
     subregion = models.CharField(max_length=100, blank=True, null=True)
     capital = models.CharField(max_length=100, blank=True, null=True)
+    longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
+    latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
 
     class Meta:
         verbose_name = "Country"

backend/server/worldtravel/serializers.py

@@ -29,7 +29,7 @@ class CountrySerializer(serializers.ModelSerializer):
     class Meta:
         model = Country
         fields = '__all__'
-        read_only_fields = ['id', 'name', 'country_code', 'subregion', 'flag_url', 'num_regions', 'num_visits']
+        read_only_fields = ['id', 'name', 'country_code', 'subregion', 'flag_url', 'num_regions', 'num_visits', 'longitude', 'latitude', 'capital']
 
 
 class RegionSerializer(serializers.ModelSerializer):