From ed37ad45e4b9ae68c8688940b372d9f11ca8cf13 Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Fri, 4 Oct 2024 21:56:43 -0400
Subject: [PATCH] Being back /all view for map AdventureLink

---
 backend/server/adventures/views.py            | 26 +++++++++----------
 .../src/lib/components/AdventureLink.svelte   |  4 +--
 .../src/lib/components/AdventureModal.svelte  | 12 +++++----
 frontend/src/routes/map/+page.server.ts       |  4 +--
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/backend/server/adventures/views.py b/backend/server/adventures/views.py
index 7280c68..8c71ba3 100644
--- a/backend/server/adventures/views.py
+++ b/backend/server/adventures/views.py
@@ -129,23 +129,21 @@ class AdventureViewSet(viewsets.ModelViewSet):
     def all(self, request):
         if not request.user.is_authenticated:
             return Response({"error": "User is not authenticated"}, status=400)
-        # include_collections = request.query_params.get('include_collections', 'false')
-        # if include_collections not in ['true', 'false']:
-        #     include_collections = 'false'
+        include_collections = request.query_params.get('include_collections', 'false')
+        if include_collections not in ['true', 'false']:
+            include_collections = 'false'
 
-        # if include_collections == 'true':
-        #     queryset = Adventure.objects.filter(
-        #         Q(is_public=True) | Q(user_id=request.user.id)
-        #     )
-        # else:
-        #     queryset = Adventure.objects.filter(
-        #         Q(is_public=True) | Q(user_id=request.user.id), collection=None
-        #     )
-        allowed_types = ['visited', 'planned']
+        if include_collections == 'true':
+            queryset = Adventure.objects.filter(
+                Q(is_public=True) | Q(user_id=request.user.id)
+            )
+        else:
+            queryset = Adventure.objects.filter(
+                Q(is_public=True) | Q(user_id=request.user.id), collection=None
+            )
         queryset = Adventure.objects.filter(
-            Q(user_id=request.user.id) & Q(type__in=allowed_types)
+            Q(user_id=request.user.id)
         )
-        
         queryset = self.apply_sorting(queryset)
         serializer = self.get_serializer(queryset, many=True)
        
diff --git a/frontend/src/lib/components/AdventureLink.svelte b/frontend/src/lib/components/AdventureLink.svelte
index cb4551b..b1bb85f 100644
--- a/frontend/src/lib/components/AdventureLink.svelte
+++ b/frontend/src/lib/components/AdventureLink.svelte
@@ -19,14 +19,14 @@
 		if (modal) {
 			modal.showModal();
 		}
-		let res = await fetch(`/api/adventures/?include_collections=false`, {
+		let res = await fetch(`/api/adventures/all/?include_collections=false`, {
 			method: 'GET'
 		});
 
 		const newAdventures = await res.json();
 
 		if (res.ok && adventures) {
-			adventures = newAdventures.results;
+			adventures = newAdventures;
 		}
 		isLoading = false;
 	});
diff --git a/frontend/src/lib/components/AdventureModal.svelte b/frontend/src/lib/components/AdventureModal.svelte
index d8889d7..3f39b3e 100644
--- a/frontend/src/lib/components/AdventureModal.svelte
+++ b/frontend/src/lib/components/AdventureModal.svelte
@@ -736,11 +736,13 @@ it would also work to just use on:click on the MapLibre component itself. -->
 													timeZone: 'UTC'
 												})}
 											</p>
-											<p>
-												{new Date(visit.end_date).toLocaleDateString(undefined, {
-													timeZone: 'UTC'
-												})}
-											</p>
+											{#if visit.end_date}
+												<p>
+													{new Date(visit.end_date).toLocaleDateString(undefined, {
+														timeZone: 'UTC'
+													})}
+												</p>
+											{/if}
 
 											<div>
 												<button
diff --git a/frontend/src/routes/map/+page.server.ts b/frontend/src/routes/map/+page.server.ts
index 984a563..6bbf24d 100644
--- a/frontend/src/routes/map/+page.server.ts
+++ b/frontend/src/routes/map/+page.server.ts
@@ -8,7 +8,7 @@ export const load = (async (event) => {
 	if (!event.locals.user) {
 		return redirect(302, '/login');
 	} else {
-		let visitedFetch = await fetch(`${endpoint}/api/adventures/`, {
+		let visitedFetch = await fetch(`${endpoint}/api/adventures/all/?include_collections=true`, {
 			headers: {
 				Cookie: `${event.cookies.get('auth')}`
 			}
@@ -28,7 +28,7 @@ export const load = (async (event) => {
 			let visited: Adventure[] = [];
 			try {
 				let api_result = await visitedFetch.json();
-				visited = api_result.results as Adventure[];
+				visited = api_result as Adventure[];
 				if (!Array.isArray(visited) || visited.length === 0 || !visited) {
 					throw new Error('Visited adventures response is not an array');
 				}