Merge branch 'development' into main

backend/server/adventures/migrations/0025_alter_visit_end_date_alter_visit_start_date.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.8 on 2025-03-17 21:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0024_alter_attachment_file'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='visit',
+            name='end_date',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='visit',
+            name='start_date',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]

backend/server/adventures/models.py

@@ -76,8 +76,8 @@ User = get_user_model()
 class Visit(models.Model):
     id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
     adventure = models.ForeignKey('Adventure', on_delete=models.CASCADE, related_name='visits')
-    start_date = models.DateField(null=True, blank=True)
-    end_date = models.DateField(null=True, blank=True)
+    start_date = models.DateTimeField(null=True, blank=True)
+    end_date = models.DateTimeField(null=True, blank=True)
     notes = models.TextField(blank=True, null=True)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)

backend/server/adventures/serializers.py

@@ -136,9 +136,11 @@ class AdventureSerializer(CustomModelSerializer):
     def get_is_visited(self, obj):
         current_date = timezone.now().date()
         for visit in obj.visits.all():
-            if visit.start_date and visit.end_date and (visit.start_date <= current_date):
+            start_date = visit.start_date.date() if isinstance(visit.start_date, timezone.datetime) else visit.start_date
+            end_date = visit.end_date.date() if isinstance(visit.end_date, timezone.datetime) else visit.end_date
+            if start_date and end_date and (start_date <= current_date):
                 return True
-            elif visit.start_date and not visit.end_date and (visit.start_date <= current_date):
+            elif start_date and not end_date and (start_date <= current_date):
                 return True
         return False
 

backend/server/adventures/views/collection_view.py

@@ -22,7 +22,7 @@ class CollectionViewSet(viewsets.ModelViewSet):
         order_by = self.request.query_params.get('order_by', 'name')
         order_direction = self.request.query_params.get('order_direction', 'asc')
 
-        valid_order_by = ['name', 'upated_at']
+        valid_order_by = ['name', 'upated_at', 'start_date']
         if order_by not in valid_order_by:
             order_by = 'updated_at'
 
@@ -35,6 +35,12 @@ class CollectionViewSet(viewsets.ModelViewSet):
             ordering = 'lower_name'
             if order_direction == 'desc':
                 ordering = f'-{ordering}'
+        elif order_by == 'start_date':
+            ordering = 'start_date'
+            if order_direction == 'asc':
+                ordering = 'start_date'
+            else:
+                ordering = '-start_date'
         else:
             order_by == 'updated_at'
             ordering = 'updated_at'

backend/server/users/backends.py

@@ -3,7 +3,6 @@ from allauth.socialaccount.models import SocialAccount
 
 class NoPasswordAuthBackend(ModelBackend):
     def authenticate(self, request, username=None, password=None, **kwargs):
-        print("NoPasswordAuthBackend")
         # First, attempt normal authentication
         user = super().authenticate(request, username=username, password=password, **kwargs)
         if user is None: