Activities, Trails, Wanderer + Strava Integration, UI Refresh, Devops Improvments, and more (#785)
* Implement code changes to enhance functionality and improve performance * Update nl.json Fix Dutch translations. * feat(security): add Trivy security scans for Docker images and source code * feat(security): restructure Trivy scans for improved clarity and organization * fix(dependencies): update Django version to 5.2.2 * style(workflows): standardize quotes and fix typo in frontend-test.yml * feat(workflows): add job names for clarity in backend and frontend test workflows * refactor(workflows): remove path filters from pull_request and push triggers in backend and frontend workflows * feat(workflows): add paths to push and pull_request triggers for backend and frontend workflows * refactor(workflows): simplify trigger paths for backend and frontend workflows fix(dependencies): add overrides for esbuild in frontend package.json * fix(package): add missing pnpm overrides for esbuild in package.json * fix(workflows): add missing severity parameter for Trivy filesystem scan * fix(workflows): add missing severity parameter for Docker image scans in Trivy workflow * fix(workflows): remove MEDIUM severity from Trivy scans in security workflow * added-fix-image-deletion (#681) * added-fix-image-deletion * feat(commands): add image cleanup command to find and delete unused files * fix(models): ensure associated AdventureImages are deleted and files cleaned up on Adventure deletion * fix(models): ensure associated Attachment files are deleted and their filesystem cleaned up on Adventure deletion --------- Co-authored-by: ferdousahmed <taninme@gmail.com> Co-authored-by: Sean Morley * Rename Adventures to Locations (#696) * Refactor user_id to user in adventures and related models, views, and components - Updated all instances of user_id to user in the adventures app, including models, serializers, views, and frontend components. - Adjusted queries and filters to reflect the new user field naming convention. - Ensured consistency across the codebase for user identification in adventures, collections, notes, and transportation entities. - Modified frontend components to align with the updated data structure, ensuring proper access control and rendering based on user ownership. * Refactor adventure-related views and components to use "Location" terminology - Updated GlobalSearchView to replace AdventureSerializer with LocationSerializer. - Modified IcsCalendarGeneratorViewSet to use LocationSerializer instead of AdventureSerializer. - Created new LocationImageViewSet for managing location images, including primary image toggling and image deletion. - Introduced LocationViewSet for managing locations with enhanced filtering, sorting, and sharing capabilities. - Updated ReverseGeocodeViewSet to utilize LocationSerializer. - Added ActivityTypesView to retrieve distinct activity types from locations. - Refactored user views to replace AdventureSerializer with LocationSerializer. - Updated frontend components to reflect changes from "adventure" to "location", including AdventureCard, AdventureLink, AdventureModal, and others. - Adjusted API endpoints in frontend routes to align with new location-based structure. - Ensured all references to adventures are replaced with locations across the codebase. * refactor: rename adventures to locations across the application - Updated localization files to replace adventure-related terms with location-related terms. - Refactored TypeScript types and variables from Adventure to Location in various routes and components. - Adjusted UI elements and labels to reflect the change from adventures to locations. - Ensured all references to adventures in the codebase are consistent with the new location terminology. * Refactor code structure for improved readability and maintainability * feat: Implement location details page with server-side loading and deletion functionality - Added +page.server.ts to handle server-side loading of additional location info. - Created +page.svelte for displaying location details, including images, visits, and maps. - Integrated GPX file handling and rendering on the map. - Updated map route to link to locations instead of adventures. - Refactored profile and search routes to use LocationCard instead of AdventureCard. * docs: Update terminology from "Adventure" to "Location" and enhance project overview * docs: Clarify collection examples in usage documentation * feat: Enable credentials for GPX file fetch and add CORS_ALLOW_CREDENTIALS setting * Refactor adventure references to locations across the backend and frontend - Updated CategoryViewSet to reflect location context instead of adventures. - Modified ChecklistViewSet to include locations in retrieval logic. - Changed GlobalSearchView to search for locations instead of adventures. - Adjusted IcsCalendarGeneratorViewSet to handle locations instead of adventures. - Refactored LocationImageViewSet to remove unused import. - Updated LocationViewSet to clarify public access for locations. - Changed LodgingViewSet to reference locations instead of adventures. - Modified NoteViewSet to prevent listing all locations. - Updated RecommendationsViewSet to handle locations in parsing and response. - Adjusted ReverseGeocodeViewSet to search through user locations. - Updated StatsViewSet to count locations instead of adventures. - Changed TagsView to reflect activity types for locations. - Updated TransportationViewSet to reference locations instead of adventures. - Added new translations for search results related to locations in multiple languages. - Updated dashboard and profile pages to reflect location counts instead of adventure counts. - Adjusted search routes to handle locations instead of adventures. * Update banner image * style: Update stats component background and border for improved visibility * refactor: Rename AdventureCard and AdventureModal to LocationCard and LocationModal for consistency * Import and Export Functionality (#698) * feat(backup): add BackupViewSet for data export and import functionality * Fixed frontend returning corrupt binary data * feat(import): enhance import functionality with confirmation check and improved city/region/country handling * Potential fix for code scanning alert no. 29: Information exposure through an exception Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * Refactor response handling to use arrayBuffer instead of bytes * Refactor image cleanup command to use LocationImage model and update import/export view to include backup and restore functionality * Update backup export versioning and improve data restore warning message * Enhance image navigation and localization support in modal components * Refactor location handling in Immich integration components for consistency * Enhance backup and restore functionality with improved localization and error handling * Improve accessibility by adding 'for' attribute to backup file input label --------- Co-authored-by: Christian Zäske <blitzdose@gmail.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * refactor(serializers): rename Location to Adventure and update related fields * refactor(serializers): rename Adventure to Location and update related fields * chore(requirements): update pillow version to 11.3.0 * Add PT-BR translations (#739) * Fixed frontend returning corrupt binary data * fix(adventure): enhance collection ownership validation in AdventureSerializer (#723) * Add PT-BR translations Add translation for Brazilian Portuguese to the project; Signed-off-by: Lucas Zampieri <lzampier@redhat.com> --------- Signed-off-by: Lucas Zampieri <lzampier@redhat.com> Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com> Co-authored-by: Christian Zäske <blitzdose@gmail.com> * fix: update date formatting for adventure items to include timezone * Image/attachment overhaul, activities, trails and integrations with Strava and Wanderer (#726) * refactor(models, views, serializers): rename LocationImage and Attachment to ContentImage and ContentAttachment, update related references * feat: Enhance collection sharing and location management features - Implemented unsharing functionality in CollectionViewSet, including removal of user-owned locations from collections. - Refactored ContentImageViewSet to support multiple content types and improved permission checks for image uploads. - Added user ownership checks in LocationViewSet for delete operations. - Enhanced collection management in the frontend to display both owned and shared collections separately. - Updated Immich integration to handle access control based on location visibility and user permissions. - Improved UI components to show creator information and manage collection links more effectively. - Added loading states and error handling in collection fetching logic. * feat: enhance transportation card and modal with image handling - Added CardCarousel component to TransportationCard for image display. - Implemented privacy indicator with Eye and EyeOff icons. - Introduced image upload functionality in TransportationModal, allowing users to upload multiple images. - Added image management features: remove image and set primary image. - Updated Transportation and Location types to include images as ContentImage array. - Enhanced UI for image upload and display in modal, including selected images preview and current images management. * feat: update CardCarousel component to handle images, name, and icon props across various cards * feat: add Discord link to AboutModal and update appVersion in config * feat: add LocationQuickStart and LocationVisits components for enhanced location selection and visit management - Implemented LocationQuickStart.svelte for searching and selecting locations on a map with reverse geocoding. - Created LocationVisits.svelte to manage visit dates and notes for locations, including timezone handling and validation. - Updated types to remove location property from Attachment type. - Modified locations page to integrate NewLocationModal for creating and editing locations, syncing updates with adventures. * feat: update button styles and add back and close functionality in location components * Collection invite system * feat: update CollectionSerializer to include 'shared_with' as a read-only field; update app version; add new background images and localization strings for invites * feat: add Strava integration with OAuth flow and activity management - Implemented IntegrationView for listing integrations including Immich, Google Maps, and Strava. - Created StravaIntegrationView for handling OAuth authorization and token exchange. - Added functionality to refresh Strava access tokens when needed. - Implemented endpoints to fetch user activities from Strava and extract essential information. - Added Strava logo asset and integrated it into the frontend settings page. - Updated settings page to display Strava integration status. - Enhanced location management to include trails with create, edit, and delete functionalities. - Updated types and localization files to support new features. * feat: enhance Strava integration with user-specific settings and management options; update localization strings * feat: update Strava integration settings and add Wanderer logo; enhance user experience with active section management * Add StravaActivity and Activity types to types.ts - Introduced StravaActivity type to represent detailed activity data from Strava. - Added Activity type to encapsulate user activities, including optional trail and GPX file information. - Updated Location type to include an array of activities associated with each visit. * feat: streamline location and activity management; enhance Strava import functionality and add activity handling in server actions * feat: add ActivityCard component and update LocationVisits to use it; modify Activity type to reference trail as string * feat: add geojson support to ActivitySerializer and ActivityCard; enhance location page with activity summaries and GPS tracks * feat: add trails property to recommendation object in collection page * feat: add Wanderer integration with authentication and management features * feat: implement Wanderer integration with trail management and UI components; enhance settings for reauthentication * feat: add measurement system field to CustomUser model and update related serializers, migrations, and UI components * feat: add measurement system support across ActivityCard, StravaActivityCard, NewLocationModal, LocationVisits, and related utility functions * feat: enhance Wanderer integration with trail data fetching and UI updates; add measurement system support * feat: add TrailCard component for displaying trail details with measurement system support * feat: add wanderer link support in TrailSerializer and TrailCard; update measurement system handling in location page * feat: integrate memcached for caching in Wanderer services; update Docker, settings, and supervisord configurations * feat: add activity statistics to user profile; include distance, moving time, elevation, and total activities * feat: enhance import/export functionality to include trails and activities; update UI components and localization * feat: integrate NewLocationModal across various components; update location handling and state management * Refactor Location and Visit types: Replace visits structure in Location with Visit type and add location, created_at, and updated_at fields to Visit * feat: enhance permissions and validation in activity, trail, and visit views; add unique constraint to CollectionInvite model * feat: sync visits when updating adventures in collection page * feat: add geojson support for attachments and refactor GPX handling in location page * chore: remove unused dependencies from pnpm-lock.yaml * feat: add Strava and Wanderer integration documentation and configuration options * Add support for Japanese and Arabic languages in localization * Add new localization strings for Russian, Swedish, and Chinese languages - Updated translations in ru.json, sv.json, and zh.json to include new phrases related to collections, activities, and integrations. - Added strings for leaving collections, loading collections, and quick start instructions. - Included new sections for invites and Strava integration with relevant messages. - Enhanced Google Maps integration descriptions for clarity. * Add localization support for activity-related features and update UI labels - Added new Russian, Swedish, and Chinese translations for activity statistics, achievements, and related terms. - Updated UI components to use localized strings for activity statistics, distance, moving time, and other relevant fields. - Enhanced user experience by ensuring all relevant buttons and labels are translated and accessible. * fix: update appVersion to reflect the latest development version * feat: add getActivityColor function and integrate activity color coding in map and location pages * feat: add support for showing activities and visited cities on the map * feat: update map page to display counts for visited cities and activities * fix: remove debug print statement from IsOwnerOrSharedWithFullAccess permission class * feat: add MapStyleSelector component and integrate basemap selection in map page * feat: enhance basemap functions with 3D terrain support and update XYZ style handling * feat: add management command to recalculate elevation data from GPX files and update activity view to handle elevation data extraction * feat: update MapStyleSelector component and enhance basemap options for improved user experience * feat: refactor activity model and admin to use sport_type, update serializers and components for improved activity handling * feat: update Activity model string representation to use sport_type instead of type * feat: update activity handling to use sport_type for color determination in map and location components * feat: Add attachments support to Transportation and Lodging types - Updated Transportation and Lodging types to include attachments array. - Enhanced localization files for multiple languages to include new strings related to attachments, lodging, and transportation. - Added error and success messages for attachment removal and upload information. - Included new prompts for creating and updating lodging and transportation details across various languages. * feat: Enhance activity statistics and breakdown by category in user profile * feat: Add SPORT_CATEGORIES for better organization of sports types and update StatsViewSet to use it * feat: Enhance CategoryDropdown for mobile responsiveness and add category creation functionality * feat: Update inspirational quote in adventure log * feat: Localize navigation labels in Navbar and add translation to en.json * feat: Update navigation elements to use anchor tags for better accessibility and add new fields to signup form * Translate login button text to support internationalization * feat: Refactor location visit status logic and add utility function for visited locations count * chore: Upgrade GitHub Actions and remove unused timezone import * fix: Update Docker image tags in GitHub Actions workflow for consistency * fix: Update Docker image build process to use BuildKit cache for improved performance * chore: Remove unused imports from stats_view.py for cleaner code * Increase background image opacity on login and signup pages for improved visibility * fix: Add postgresql-client to runtime dependencies in Dockerfile * fix: Update workflow files to include permissions for GitHub Actions * fix: Update esbuild version to ^0.25.9 in package.json and pnpm-lock.yaml for compatibility * chore: improve Chinese translation (#796) * fix: update adventure log quote and remove unused activity type field * fix: optimize import process by using get_or_create for visited cities and regions * fix: update README to reflect changes from adventures to locations and enhance feature descriptions * fix: update documentation to reflect changes from adventures to locations and enhance feature descriptions * Update google_maps_integration.md (#743) * Update google_maps_integration.md Explain APIs needed for AdventureLogs versions. Fixes #731 and #727 * Fix a typo google_maps_integration.md --------- Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com> * fix: update appVersion to reflect the main branch version * fix: update image source for satellite map in documentation * Update frontend/src/lib/components/NewLocationModal.svelte Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Add localization updates for multiple languages - Japanese (ja.json): Added new activity-related phrases and checklist terms. - Korean (ko.json): Included activity breakdown and checklist enhancements. - Dutch (nl.json): Updated activity descriptions and added checklist functionalities. - Norwegian (no.json): Enhanced activity and checklist terminology. - Polish (pl.json): Added new phrases for activities and checklist management. - Brazilian Portuguese (pt-br.json): Updated activity-related terms and checklist features. - Russian (ru.json): Included new phrases for activities and checklist management. - Swedish (sv.json): Enhanced activity descriptions and checklist functionalities. - Chinese (zh.json): Added new activity-related phrases and checklist terms. * fix: enhance image upload handling to support immich_id * Add "not_enabled" message for Strava integration in multiple languages - Updated Spanish, French, Italian, Japanese, Korean, Dutch, Norwegian, Polish, Brazilian Portuguese, Russian, Swedish, and Chinese locale files to include a new message indicating that Strava integration is not enabled in the current instance. --------- Signed-off-by: Lucas Zampieri <lzampier@redhat.com> Co-authored-by: Ycer0n <37674033+Ycer0n@users.noreply.github.com> Co-authored-by: taninme <5262715+taninme@users.noreply.github.com> Co-authored-by: ferdousahmed <taninme@gmail.com> Co-authored-by: Christian Zäske <blitzdose@gmail.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: Lucas Zampieri <lcasmz54@gmail.com> Co-authored-by: pplulee <pplulee@live.cn> Co-authored-by: Cathelijne Hornstra <github@hornstra.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Sean Morley
@@ -1,9 +1,11 @@
|
||||
from django.contrib import admin
|
||||
from allauth.account.decorators import secure_admin_login
|
||||
|
||||
from .models import ImmichIntegration
|
||||
from .models import ImmichIntegration, StravaToken, WandererIntegration
|
||||
|
||||
admin.autodiscover()
|
||||
admin.site.login = secure_admin_login(admin.site.login)
|
||||
|
||||
admin.site.register(ImmichIntegration)
|
||||
admin.site.register(ImmichIntegration)
|
||||
admin.site.register(StravaToken)
|
||||
admin.site.register(WandererIntegration)
|
||||
29
backend/server/integrations/migrations/0003_stravatoken.py
Normal file
29
backend/server/integrations/migrations/0003_stravatoken.py
Normal file
@@ -0,0 +1,29 @@
|
||||
# Generated by Django 5.2.2 on 2025-08-01 00:49
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('integrations', '0002_immichintegration_copy_locally'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='StravaToken',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('access_token', models.CharField(max_length=255)),
|
||||
('refresh_token', models.CharField(max_length=255)),
|
||||
('expires_at', models.BigIntegerField()),
|
||||
('athlete_id', models.BigIntegerField(blank=True, null=True)),
|
||||
('scope', models.CharField(blank=True, max_length=255, null=True)),
|
||||
('updated_at', models.DateTimeField(auto_now=True)),
|
||||
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='strava_tokens', to=settings.AUTH_USER_MODEL)),
|
||||
],
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,32 @@
|
||||
# Generated by Django 5.2.2 on 2025-08-04 16:40
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('integrations', '0003_stravatoken'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='WandererIntegration',
|
||||
fields=[
|
||||
('server_url', models.CharField(max_length=255)),
|
||||
('username', models.CharField(max_length=255)),
|
||||
('token', models.CharField(blank=True, max_length=255, null=True)),
|
||||
('token_expiry', models.DateTimeField(blank=True, null=True)),
|
||||
('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, related_name='wanderer_integrations', to=settings.AUTH_USER_MODEL)),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Wanderer Integration',
|
||||
'verbose_name_plural': 'Wanderer Integrations',
|
||||
},
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,18 @@
|
||||
# Generated by Django 5.2.2 on 2025-08-04 16:55
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('integrations', '0004_wandererintegration'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='wandererintegration',
|
||||
name='token',
|
||||
field=models.CharField(blank=True, max_length=1000, null=True),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,18 @@
|
||||
# Generated by Django 5.2.2 on 2025-08-04 17:03
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('integrations', '0005_alter_wandererintegration_token'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='wandererintegration',
|
||||
name='token',
|
||||
field=models.CharField(blank=True, null=True),
|
||||
),
|
||||
]
|
||||
@@ -13,4 +13,30 @@ class ImmichIntegration(models.Model):
|
||||
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
|
||||
|
||||
def __str__(self):
|
||||
return self.user.username + ' - ' + self.server_url
|
||||
return self.user.username + ' - ' + self.server_url
|
||||
|
||||
class StravaToken(models.Model):
|
||||
user = models.ForeignKey(
|
||||
User, on_delete=models.CASCADE, related_name='strava_tokens')
|
||||
access_token = models.CharField(max_length=255)
|
||||
refresh_token = models.CharField(max_length=255)
|
||||
expires_at = models.BigIntegerField() # Unix timestamp
|
||||
athlete_id = models.BigIntegerField(null=True, blank=True)
|
||||
scope = models.CharField(max_length=255, null=True, blank=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class WandererIntegration(models.Model):
|
||||
server_url = models.CharField(max_length=255)
|
||||
username = models.CharField(max_length=255)
|
||||
user = models.ForeignKey(
|
||||
User, on_delete=models.CASCADE, related_name='wanderer_integrations')
|
||||
token = models.CharField(null=True, blank=True)
|
||||
token_expiry = models.DateTimeField(null=True, blank=True)
|
||||
id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
|
||||
|
||||
def __str__(self):
|
||||
return self.user.username + ' - ' + self.server_url
|
||||
|
||||
class Meta:
|
||||
verbose_name = "Wanderer Integration"
|
||||
verbose_name_plural = "Wanderer Integrations"
|
||||
@@ -1,12 +1,15 @@
|
||||
from integrations.views import *
|
||||
from django.urls import path, include
|
||||
from rest_framework.routers import DefaultRouter
|
||||
from integrations.views import ImmichIntegrationView, IntegrationView, ImmichIntegrationViewSet
|
||||
from integrations.views import IntegrationView, StravaIntegrationView, WandererIntegrationViewSet
|
||||
|
||||
# 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')
|
||||
router.register(r'strava', StravaIntegrationView, basename='strava')
|
||||
router.register(r'wanderer', WandererIntegrationViewSet, basename='wanderer')
|
||||
|
||||
# Include the router URLs
|
||||
urlpatterns = [
|
||||
|
||||
6
backend/server/integrations/utils.py
Normal file
6
backend/server/integrations/utils.py
Normal file
@@ -0,0 +1,6 @@
|
||||
from rest_framework.pagination import PageNumberPagination
|
||||
|
||||
class StandardResultsSetPagination(PageNumberPagination):
|
||||
page_size = 25
|
||||
page_size_query_param = 'page_size'
|
||||
max_page_size = 1000
|
||||
4
backend/server/integrations/views/__init__.py
Normal file
4
backend/server/integrations/views/__init__.py
Normal file
@@ -0,0 +1,4 @@
|
||||
from .immich_view import ImmichIntegrationView, ImmichIntegrationViewSet
|
||||
from .integration_view import IntegrationView
|
||||
from .strava_view import StravaIntegrationView
|
||||
from .wanderer_view import WandererIntegrationViewSet
|
||||
@@ -1,42 +1,19 @@
|
||||
import os
|
||||
from rest_framework.response import Response
|
||||
from rest_framework import viewsets, status
|
||||
from .serializers import ImmichIntegrationSerializer
|
||||
from .models import ImmichIntegration
|
||||
from integrations.serializers import ImmichIntegrationSerializer
|
||||
from integrations.models import ImmichIntegration
|
||||
from rest_framework.decorators import action
|
||||
from rest_framework.permissions import IsAuthenticated
|
||||
import requests
|
||||
from rest_framework.pagination import PageNumberPagination
|
||||
from django.conf import settings
|
||||
from adventures.models import AdventureImage
|
||||
from adventures.models import ContentImage
|
||||
from django.http import HttpResponse
|
||||
from django.shortcuts import get_object_or_404
|
||||
from integrations.utils import StandardResultsSetPagination
|
||||
import logging
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
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)
|
||||
google_map_integration = settings.GOOGLE_MAPS_API_KEY != ''
|
||||
|
||||
return Response(
|
||||
{
|
||||
'immich': immich_integrations.exists(),
|
||||
'google_maps': google_map_integration
|
||||
},
|
||||
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
|
||||
@@ -253,11 +230,11 @@ class ImmichIntegrationView(viewsets.ViewSet):
|
||||
"""
|
||||
GET an Immich image using the integration and asset ID.
|
||||
Access levels (in order of priority):
|
||||
1. Public adventures: accessible by anyone
|
||||
2. Private adventures in public collections: accessible by anyone
|
||||
3. Private adventures in private collections shared with user: accessible by shared users
|
||||
4. Private adventures: accessible only to the owner
|
||||
5. No AdventureImage: owner can still view via integration
|
||||
1. Public locations: accessible by anyone
|
||||
2. Private locations in public collections: accessible by anyone
|
||||
3. Private locations in private collections shared with user: accessible by shared users, and the collection owner
|
||||
4. Private locations: accessible only to the owner
|
||||
5. No ContentImage: owner can still view via integration
|
||||
"""
|
||||
if not imageid or not integration_id:
|
||||
return Response({
|
||||
@@ -268,55 +245,101 @@ class ImmichIntegrationView(viewsets.ViewSet):
|
||||
|
||||
# Lookup integration and user
|
||||
integration = get_object_or_404(ImmichIntegration, id=integration_id)
|
||||
owner_id = integration.user_id
|
||||
owner_id = integration.user
|
||||
|
||||
# Try to find the image entry with collections and sharing information
|
||||
image_entry = (
|
||||
AdventureImage.objects
|
||||
.filter(immich_id=imageid, user_id=owner_id)
|
||||
.select_related('adventure')
|
||||
.prefetch_related('adventure__collections', 'adventure__collections__shared_with')
|
||||
.order_by('-adventure__is_public') # Public adventures first
|
||||
.first()
|
||||
# Get all images for this immich_id and user
|
||||
image_entries = list(
|
||||
ContentImage.objects
|
||||
.filter(immich_id=imageid, user=owner_id)
|
||||
.select_related('content_type')
|
||||
)
|
||||
|
||||
# Sort by access level priority and find the best match
|
||||
def get_access_priority(image_entry):
|
||||
"""Return priority score for access control (lower = higher priority)"""
|
||||
content_obj = image_entry.content_object
|
||||
|
||||
# Only handle Location objects for now (can be extended for other types)
|
||||
if not hasattr(content_obj, 'is_public'):
|
||||
return 999 # Low priority for non-location objects
|
||||
|
||||
# For Location objects, check access levels
|
||||
if content_obj.is_public:
|
||||
return 0 # Highest priority - public location
|
||||
|
||||
# Check if location is in any public collection
|
||||
if hasattr(content_obj, 'collections'):
|
||||
collections = content_obj.collections.all()
|
||||
if any(collection.is_public for collection in collections):
|
||||
return 1 # Second priority - private location in public collection
|
||||
|
||||
# Check for shared collections (if user is authenticated)
|
||||
if (request.user.is_authenticated and
|
||||
any(collection.shared_with.filter(id=request.user.id).exists()
|
||||
for collection in collections)):
|
||||
return 2 # Third priority - shared collection access
|
||||
|
||||
return 3 # Lowest priority - private location, owner access only
|
||||
|
||||
# Sort image entries by access priority
|
||||
image_entries.sort(key=get_access_priority)
|
||||
image_entry = image_entries[0] if image_entries else None
|
||||
|
||||
# Access control
|
||||
if image_entry:
|
||||
adventure = image_entry.adventure
|
||||
collections = adventure.collections.all()
|
||||
content_obj = image_entry.content_object
|
||||
|
||||
# Determine access level
|
||||
is_authorized = False
|
||||
|
||||
# Level 1: Public adventure (highest priority)
|
||||
if adventure.is_public:
|
||||
is_authorized = True
|
||||
# Only apply access control to Location objects
|
||||
if hasattr(content_obj, 'is_public'):
|
||||
location = content_obj
|
||||
|
||||
# Level 2: Private adventure in any public collection
|
||||
elif any(collection.is_public for collection in collections):
|
||||
is_authorized = True
|
||||
# Determine access level
|
||||
is_authorized = False
|
||||
|
||||
# Level 1: Public location (highest priority)
|
||||
if location.is_public:
|
||||
is_authorized = True
|
||||
|
||||
# Level 2: Private location in any public collection
|
||||
elif hasattr(location, 'collections'):
|
||||
collections = location.collections.all()
|
||||
if any(collection.is_public for collection in collections):
|
||||
is_authorized = True
|
||||
|
||||
# Level 3: Owner access
|
||||
elif request.user.is_authenticated and request.user == owner_id:
|
||||
is_authorized = True
|
||||
|
||||
# Level 4: Shared collection access or collection owner access
|
||||
elif (request.user.is_authenticated and
|
||||
(any(collection.shared_with.filter(id=request.user.id).exists()
|
||||
for collection in collections) or
|
||||
any(collection.user == request.user for collection in collections))):
|
||||
is_authorized = True
|
||||
else:
|
||||
# Location without collections - owner access only
|
||||
if request.user.is_authenticated and request.user == owner_id:
|
||||
is_authorized = True
|
||||
|
||||
# Level 3: Owner access
|
||||
elif request.user.is_authenticated and request.user.id == owner_id:
|
||||
is_authorized = True
|
||||
|
||||
# Level 4: Shared collection access - check if user has access to any collection
|
||||
elif (request.user.is_authenticated and
|
||||
any(collection.shared_with.filter(id=request.user.id).exists()
|
||||
for collection in collections)):
|
||||
is_authorized = True
|
||||
|
||||
if not is_authorized:
|
||||
return Response({
|
||||
'message': 'This image belongs to a private adventure and you are not authorized.',
|
||||
'error': True,
|
||||
'code': 'immich.permission_denied'
|
||||
}, status=status.HTTP_403_FORBIDDEN)
|
||||
if not is_authorized:
|
||||
return Response({
|
||||
'message': 'This image belongs to a private location and you are not authorized.',
|
||||
'error': True,
|
||||
'code': 'immich.permission_denied'
|
||||
}, status=status.HTTP_403_FORBIDDEN)
|
||||
else:
|
||||
# For non-Location objects, allow only owner access for now
|
||||
if not request.user.is_authenticated or request.user != owner_id:
|
||||
return Response({
|
||||
'message': 'This image is not publicly accessible and you are not the owner.',
|
||||
'error': True,
|
||||
'code': 'immich.permission_denied'
|
||||
}, status=status.HTTP_403_FORBIDDEN)
|
||||
else:
|
||||
# No AdventureImage exists; allow only the integration owner
|
||||
if not request.user.is_authenticated or request.user.id != owner_id:
|
||||
# No ContentImage exists; allow only the integration owner
|
||||
if not request.user.is_authenticated or request.user != owner_id:
|
||||
return Response({
|
||||
'message': 'Image is not linked to any adventure and you are not the owner.',
|
||||
'message': 'Image is not linked to any location and you are not the owner.',
|
||||
'error': True,
|
||||
'code': 'immich.not_found'
|
||||
}, status=status.HTTP_404_NOT_FOUND)
|
||||
42
backend/server/integrations/views/integration_view.py
Normal file
42
backend/server/integrations/views/integration_view.py
Normal file
@@ -0,0 +1,42 @@
|
||||
import os
|
||||
from rest_framework.response import Response
|
||||
from rest_framework import viewsets, status
|
||||
from rest_framework.permissions import IsAuthenticated
|
||||
from django.utils import timezone
|
||||
from integrations.models import ImmichIntegration, StravaToken, WandererIntegration
|
||||
from django.conf import settings
|
||||
|
||||
|
||||
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)
|
||||
google_map_integration = settings.GOOGLE_MAPS_API_KEY != ''
|
||||
strava_integration_global = settings.STRAVA_CLIENT_ID != '' and settings.STRAVA_CLIENT_SECRET != ''
|
||||
strava_integration_user = StravaToken.objects.filter(user=request.user).exists()
|
||||
wanderer_integration = WandererIntegration.objects.filter(user=request.user).exists()
|
||||
is_wanderer_expired = False
|
||||
|
||||
if wanderer_integration:
|
||||
token_expiry = WandererIntegration.objects.filter(user=request.user).first().token_expiry
|
||||
if token_expiry and token_expiry < timezone.now():
|
||||
is_wanderer_expired = True
|
||||
|
||||
return Response(
|
||||
{
|
||||
'immich': immich_integrations.exists(),
|
||||
'google_maps': google_map_integration,
|
||||
'strava': {
|
||||
'global': strava_integration_global,
|
||||
'user': strava_integration_user
|
||||
},
|
||||
'wanderer': {
|
||||
'exists': wanderer_integration,
|
||||
'expired': is_wanderer_expired
|
||||
}
|
||||
},
|
||||
status=status.HTTP_200_OK
|
||||
)
|
||||
464
backend/server/integrations/views/strava_view.py
Normal file
464
backend/server/integrations/views/strava_view.py
Normal file
@@ -0,0 +1,464 @@
|
||||
from rest_framework.response import Response
|
||||
from rest_framework import viewsets, status
|
||||
from rest_framework.permissions import IsAuthenticated
|
||||
from rest_framework.decorators import action
|
||||
import requests
|
||||
import logging
|
||||
import time
|
||||
import re
|
||||
from datetime import datetime, timedelta
|
||||
from django.shortcuts import redirect
|
||||
from django.conf import settings
|
||||
from integrations.models import StravaToken
|
||||
from adventures.utils.timezones import TIMEZONES
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class StravaIntegrationView(viewsets.ViewSet):
|
||||
permission_classes = [IsAuthenticated]
|
||||
|
||||
def extract_timezone_from_strava(self, strava_timezone):
|
||||
"""
|
||||
Extract IANA timezone from Strava's GMT offset format
|
||||
Input: "(GMT-05:00) America/New_York" or "(GMT+01:00) Europe/Zurich"
|
||||
Output: "America/New_York" if it exists in TIMEZONES, otherwise None
|
||||
"""
|
||||
if not strava_timezone:
|
||||
return None
|
||||
|
||||
# Use regex to extract the IANA timezone identifier
|
||||
# Pattern matches: (GMT±XX:XX) Timezone/Name
|
||||
match = re.search(r'\(GMT[+-]\d{2}:\d{2}\)\s*(.+)', strava_timezone)
|
||||
if match:
|
||||
timezone_name = match.group(1).strip()
|
||||
# Check if this timezone exists in our TIMEZONES list
|
||||
if timezone_name in TIMEZONES:
|
||||
return timezone_name
|
||||
|
||||
# If no match or timezone not in our list, try to find a close match
|
||||
# This handles cases where Strava might use slightly different names
|
||||
if match:
|
||||
timezone_name = match.group(1).strip()
|
||||
# Try some common variations
|
||||
variations = [
|
||||
timezone_name,
|
||||
timezone_name.replace('_', '/'),
|
||||
timezone_name.replace('/', '_'),
|
||||
]
|
||||
|
||||
for variation in variations:
|
||||
if variation in TIMEZONES:
|
||||
return variation
|
||||
|
||||
return None
|
||||
|
||||
@action(detail=False, methods=['get'], url_path='authorize')
|
||||
def authorize(self, request):
|
||||
"""
|
||||
Redirects the user to Strava's OAuth authorization page.
|
||||
"""
|
||||
client_id = settings.STRAVA_CLIENT_ID
|
||||
redirect_uri = f"{settings.PUBLIC_URL}/api/integrations/strava/callback/"
|
||||
scope = 'activity:read_all'
|
||||
|
||||
auth_url = (
|
||||
f'https://www.strava.com/oauth/authorize?client_id={client_id}'
|
||||
f'&response_type=code'
|
||||
f'&redirect_uri={redirect_uri}'
|
||||
f'&approval_prompt=auto'
|
||||
f'&scope={scope}'
|
||||
)
|
||||
|
||||
return Response({'auth_url': auth_url}, status=status.HTTP_200_OK)
|
||||
|
||||
@action(detail=False, methods=['get'], url_path='callback')
|
||||
def callback(self, request):
|
||||
"""
|
||||
Handles the OAuth callback from Strava and exchanges the code for an access token.
|
||||
Saves or updates the StravaToken model instance for the authenticated user.
|
||||
"""
|
||||
code = request.query_params.get('code')
|
||||
if not code:
|
||||
return Response(
|
||||
{
|
||||
'message': 'Missing authorization code from Strava.',
|
||||
'error': True,
|
||||
'code': 'strava.missing_code'
|
||||
},
|
||||
status=status.HTTP_400_BAD_REQUEST
|
||||
)
|
||||
|
||||
token_url = 'https://www.strava.com/oauth/token'
|
||||
payload = {
|
||||
'client_id': int(settings.STRAVA_CLIENT_ID),
|
||||
'client_secret': settings.STRAVA_CLIENT_SECRET,
|
||||
'code': code,
|
||||
'grant_type': 'authorization_code'
|
||||
}
|
||||
|
||||
try:
|
||||
response = requests.post(token_url, data=payload)
|
||||
response_data = response.json()
|
||||
|
||||
if response.status_code != 200:
|
||||
logger.warning("Strava token exchange failed: %s", response_data)
|
||||
return Response(
|
||||
{
|
||||
'message': 'Failed to exchange code for access token.',
|
||||
'error': True,
|
||||
'code': 'strava.exchange_failed',
|
||||
'details': response_data.get('message', 'Unknown error')
|
||||
},
|
||||
status=status.HTTP_400_BAD_REQUEST
|
||||
)
|
||||
|
||||
logger.info("Strava token exchange successful for user %s", request.user.username)
|
||||
|
||||
# Save or update tokens in DB
|
||||
strava_token, created = StravaToken.objects.update_or_create(
|
||||
user=request.user,
|
||||
defaults={
|
||||
'access_token': response_data.get('access_token'),
|
||||
'refresh_token': response_data.get('refresh_token'),
|
||||
'expires_at': response_data.get('expires_at'),
|
||||
'athlete_id': response_data.get('athlete', {}).get('id'),
|
||||
'scope': response_data.get('scope'),
|
||||
}
|
||||
)
|
||||
|
||||
# redirect to frontend url / settings
|
||||
frontend_url = settings.FRONTEND_URL
|
||||
if not frontend_url.endswith('/'):
|
||||
frontend_url += '/'
|
||||
return redirect(f"{frontend_url}settings?tab=integrations")
|
||||
|
||||
except requests.RequestException as e:
|
||||
logger.error("Error during Strava OAuth token exchange: %s", str(e))
|
||||
return Response(
|
||||
{
|
||||
'message': 'Failed to connect to Strava.',
|
||||
'error': True,
|
||||
'code': 'strava.connection_failed'
|
||||
},
|
||||
status=status.HTTP_502_BAD_GATEWAY
|
||||
)
|
||||
|
||||
@action(detail=False, methods=['post'], url_path='disable')
|
||||
def disable(self, request):
|
||||
"""
|
||||
Disables the Strava integration for the authenticated user by deleting their StravaToken.
|
||||
"""
|
||||
strava_token = StravaToken.objects.filter(user=request.user).first()
|
||||
if not strava_token:
|
||||
return Response(
|
||||
{
|
||||
'message': 'Strava integration is not enabled for this user.',
|
||||
'error': True,
|
||||
'code': 'strava.not_enabled'
|
||||
},
|
||||
status=status.HTTP_404_NOT_FOUND
|
||||
)
|
||||
|
||||
strava_token.delete()
|
||||
return Response(
|
||||
{'message': 'Strava integration disabled successfully.'},
|
||||
status=status.HTTP_204_NO_CONTENT
|
||||
)
|
||||
|
||||
def refresh_strava_token_if_needed(self, user):
|
||||
strava_token = StravaToken.objects.filter(user=user).first()
|
||||
if not strava_token:
|
||||
return None, Response({
|
||||
'message': 'You need to authorize Strava first.',
|
||||
'error': True,
|
||||
'code': 'strava.not_authorized'
|
||||
}, status=status.HTTP_403_FORBIDDEN)
|
||||
|
||||
now = int(time.time())
|
||||
# If token expires in less than 5 minutes, refresh it
|
||||
if strava_token.expires_at - now < 300:
|
||||
logger.info(f"Refreshing Strava token for user {user.username}")
|
||||
refresh_url = 'https://www.strava.com/oauth/token'
|
||||
payload = {
|
||||
'client_id': int(settings.STRAVA_CLIENT_ID),
|
||||
'client_secret': settings.STRAVA_CLIENT_SECRET,
|
||||
'grant_type': 'refresh_token',
|
||||
'refresh_token': strava_token.refresh_token,
|
||||
}
|
||||
try:
|
||||
response = requests.post(refresh_url, data=payload)
|
||||
data = response.json()
|
||||
if response.status_code == 200:
|
||||
# Update token info
|
||||
strava_token.access_token = data['access_token']
|
||||
strava_token.refresh_token = data['refresh_token']
|
||||
strava_token.expires_at = data['expires_at']
|
||||
strava_token.save()
|
||||
return strava_token, None
|
||||
else:
|
||||
logger.error(f"Failed to refresh Strava token: {data}")
|
||||
return None, Response({
|
||||
'message': 'Failed to refresh Strava token.',
|
||||
'error': True,
|
||||
'code': 'strava.refresh_failed',
|
||||
'details': data.get('message', 'Unknown error')
|
||||
}, status=status.HTTP_400_BAD_REQUEST)
|
||||
except requests.RequestException as e:
|
||||
logger.error(f"Error refreshing Strava token: {str(e)}")
|
||||
return None, Response({
|
||||
'message': 'Failed to connect to Strava for token refresh.',
|
||||
'error': True,
|
||||
'code': 'strava.connection_failed'
|
||||
}, status=status.HTTP_502_BAD_GATEWAY)
|
||||
|
||||
return strava_token, None
|
||||
|
||||
def extract_essential_activity_info(self, activity):
|
||||
"""
|
||||
Extract essential fields from a single activity dict with enhanced metrics
|
||||
"""
|
||||
# Calculate additional elevation metrics
|
||||
elev_high = activity.get("elev_high")
|
||||
elev_low = activity.get("elev_low")
|
||||
total_elevation_gain = activity.get("total_elevation_gain", 0)
|
||||
|
||||
# Calculate total elevation loss (approximate)
|
||||
total_elevation_range = None
|
||||
estimated_elevation_loss = None
|
||||
if elev_high is not None and elev_low is not None:
|
||||
total_elevation_range = elev_high - elev_low
|
||||
estimated_elevation_loss = max(0, total_elevation_range - total_elevation_gain)
|
||||
|
||||
# Calculate pace metrics
|
||||
moving_time = activity.get("moving_time")
|
||||
distance = activity.get("distance")
|
||||
pace_per_km = None
|
||||
pace_per_mile = None
|
||||
if moving_time and distance and distance > 0:
|
||||
pace_per_km = moving_time / (distance / 1000)
|
||||
pace_per_mile = moving_time / (distance / 1609.34)
|
||||
|
||||
# Calculate efficiency metrics
|
||||
grade_adjusted_speed = None
|
||||
if activity.get("splits_metric") and len(activity.get("splits_metric", [])) > 0:
|
||||
splits = activity.get("splits_metric", [])
|
||||
grade_speeds = [split.get("average_grade_adjusted_speed") for split in splits if split.get("average_grade_adjusted_speed")]
|
||||
if grade_speeds:
|
||||
grade_adjusted_speed = sum(grade_speeds) / len(grade_speeds)
|
||||
|
||||
# Calculate time metrics
|
||||
elapsed_time = activity.get("elapsed_time")
|
||||
moving_time = activity.get("moving_time")
|
||||
rest_time = None
|
||||
if elapsed_time and moving_time:
|
||||
rest_time = elapsed_time - moving_time
|
||||
|
||||
# Extract and normalize timezone
|
||||
strava_timezone = activity.get("timezone")
|
||||
normalized_timezone = self.extract_timezone_from_strava(strava_timezone)
|
||||
|
||||
return {
|
||||
# Basic activity info
|
||||
"id": activity.get("id"),
|
||||
"name": activity.get("name"),
|
||||
"type": activity.get("type"),
|
||||
"sport_type": activity.get("sport_type"),
|
||||
|
||||
# Distance and time
|
||||
"distance": activity.get("distance"), # meters
|
||||
"distance_km": round(activity.get("distance", 0) / 1000, 2) if activity.get("distance") else None,
|
||||
"distance_miles": round(activity.get("distance", 0) / 1609.34, 2) if activity.get("distance") else None,
|
||||
"moving_time": activity.get("moving_time"), # seconds
|
||||
"elapsed_time": activity.get("elapsed_time"), # seconds
|
||||
"rest_time": rest_time, # seconds of non-moving time
|
||||
|
||||
# Enhanced elevation metrics
|
||||
"total_elevation_gain": activity.get("total_elevation_gain"), # meters
|
||||
"estimated_elevation_loss": estimated_elevation_loss, # meters (estimated)
|
||||
"elev_high": activity.get("elev_high"), # highest point in meters
|
||||
"elev_low": activity.get("elev_low"), # lowest point in meters
|
||||
"total_elevation_range": total_elevation_range, # difference between high and low
|
||||
|
||||
# Date and location
|
||||
"start_date": activity.get("start_date"),
|
||||
"start_date_local": activity.get("start_date_local"),
|
||||
"timezone": normalized_timezone, # Normalized IANA timezone
|
||||
"timezone_raw": strava_timezone, # Original Strava format for reference
|
||||
|
||||
# Speed and pace metrics
|
||||
"average_speed": activity.get("average_speed"), # m/s
|
||||
"average_speed_kmh": round(activity.get("average_speed", 0) * 3.6, 2) if activity.get("average_speed") else None,
|
||||
"average_speed_mph": round(activity.get("average_speed", 0) * 2.237, 2) if activity.get("average_speed") else None,
|
||||
"max_speed": activity.get("max_speed"), # m/s
|
||||
"max_speed_kmh": round(activity.get("max_speed", 0) * 3.6, 2) if activity.get("max_speed") else None,
|
||||
"max_speed_mph": round(activity.get("max_speed", 0) * 2.237, 2) if activity.get("max_speed") else None,
|
||||
"pace_per_km_seconds": pace_per_km, # seconds per km
|
||||
"pace_per_mile_seconds": pace_per_mile, # seconds per mile
|
||||
"grade_adjusted_average_speed": grade_adjusted_speed, # m/s accounting for elevation
|
||||
|
||||
# Performance metrics
|
||||
"average_cadence": activity.get("average_cadence"),
|
||||
"average_watts": activity.get("average_watts"),
|
||||
"max_watts": activity.get("max_watts"),
|
||||
"kilojoules": activity.get("kilojoules"),
|
||||
"calories": activity.get("calories"),
|
||||
|
||||
# Achievement metrics
|
||||
"achievement_count": activity.get("achievement_count"),
|
||||
"kudos_count": activity.get("kudos_count"),
|
||||
"comment_count": activity.get("comment_count"),
|
||||
"pr_count": activity.get("pr_count"), # personal records achieved
|
||||
|
||||
# Equipment and technical
|
||||
"gear_id": activity.get("gear_id"),
|
||||
"device_name": activity.get("device_name"),
|
||||
"trainer": activity.get("trainer"), # indoor trainer activity
|
||||
"manual": activity.get("manual"), # manually entered
|
||||
|
||||
# GPS coordinates
|
||||
"start_latlng": activity.get("start_latlng"),
|
||||
"end_latlng": activity.get("end_latlng"),
|
||||
|
||||
# Export links
|
||||
'export_original': f'https://www.strava.com/activities/{activity.get("id")}/export_original',
|
||||
'export_gpx': f'https://www.strava.com/activities/{activity.get("id")}/export_gpx',
|
||||
|
||||
# Additional useful fields
|
||||
"visibility": activity.get("visibility"),
|
||||
"photo_count": activity.get("photo_count"),
|
||||
"has_heartrate": activity.get("has_heartrate"),
|
||||
"flagged": activity.get("flagged"),
|
||||
"commute": activity.get("commute"),
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
def format_pace_readable(pace_seconds):
|
||||
"""
|
||||
Helper function to convert pace in seconds to readable format (MM:SS)
|
||||
"""
|
||||
if pace_seconds is None:
|
||||
return None
|
||||
minutes = int(pace_seconds // 60)
|
||||
seconds = int(pace_seconds % 60)
|
||||
return f"{minutes}:{seconds:02d}"
|
||||
|
||||
@staticmethod
|
||||
def format_time_readable(time_seconds):
|
||||
"""
|
||||
Helper function to convert time in seconds to readable format (HH:MM:SS)
|
||||
"""
|
||||
if time_seconds is None:
|
||||
return None
|
||||
hours = int(time_seconds // 3600)
|
||||
minutes = int((time_seconds % 3600) // 60)
|
||||
seconds = int(time_seconds % 60)
|
||||
if hours > 0:
|
||||
return f"{hours}:{minutes:02d}:{seconds:02d}"
|
||||
else:
|
||||
return f"{minutes}:{seconds:02d}"
|
||||
|
||||
@action(detail=False, methods=['get'], url_path='activities')
|
||||
def activities(self, request):
|
||||
strava_token, error_response = self.refresh_strava_token_if_needed(request.user)
|
||||
if error_response:
|
||||
return error_response
|
||||
|
||||
# Get date parameters from query string
|
||||
start_date = request.query_params.get('start_date')
|
||||
end_date = request.query_params.get('end_date')
|
||||
per_page = request.query_params.get('per_page', 30) # Default to 30 activities
|
||||
page = request.query_params.get('page', 1)
|
||||
|
||||
# Build query parameters for Strava API
|
||||
params = {
|
||||
'per_page': min(int(per_page), 200), # Strava max is 200
|
||||
'page': int(page)
|
||||
}
|
||||
|
||||
if start_date:
|
||||
try:
|
||||
start_dt = datetime.fromisoformat(start_date.replace('Z', '+00:00'))
|
||||
params['after'] = int(start_dt.timestamp())
|
||||
except ValueError:
|
||||
return Response({
|
||||
'message': 'Invalid start_date format. Use ISO format (e.g., 2024-01-01T00:00:00Z)',
|
||||
'error': True,
|
||||
'code': 'strava.invalid_start_date'
|
||||
}, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
if end_date:
|
||||
try:
|
||||
end_dt = datetime.fromisoformat(end_date.replace('Z', '+00:00'))
|
||||
params['before'] = int(end_dt.timestamp())
|
||||
except ValueError:
|
||||
return Response({
|
||||
'message': 'Invalid end_date format. Use ISO format (e.g., 2024-12-31T23:59:59Z)',
|
||||
'error': True,
|
||||
'code': 'strava.invalid_end_date'
|
||||
}, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
headers = {'Authorization': f'Bearer {strava_token.access_token}'}
|
||||
try:
|
||||
response = requests.get('https://www.strava.com/api/v3/athlete/activities',
|
||||
headers=headers, params=params)
|
||||
if response.status_code != 200:
|
||||
return Response({
|
||||
'message': 'Failed to fetch activities from Strava.',
|
||||
'error': True,
|
||||
'code': 'strava.fetch_failed',
|
||||
'details': response.json().get('message', 'Unknown error')
|
||||
}, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
activities = response.json()
|
||||
essential_activities = [self.extract_essential_activity_info(act) for act in activities]
|
||||
|
||||
return Response({
|
||||
'activities': essential_activities,
|
||||
'count': len(essential_activities),
|
||||
'page': int(page),
|
||||
'per_page': int(per_page)
|
||||
}, status=status.HTTP_200_OK)
|
||||
|
||||
except requests.RequestException as e:
|
||||
logger.error(f"Error fetching Strava activities: {str(e)}")
|
||||
return Response({
|
||||
'message': 'Failed to connect to Strava.',
|
||||
'error': True,
|
||||
'code': 'strava.connection_failed'
|
||||
}, status=status.HTTP_502_BAD_GATEWAY)
|
||||
|
||||
@action(detail=False, methods=['get'], url_path='activities/(?P<activity_id>[^/.]+)')
|
||||
def activity(self, request, activity_id=None):
|
||||
if not activity_id:
|
||||
return Response({
|
||||
'message': 'Activity ID is required.',
|
||||
'error': True,
|
||||
'code': 'strava.activity_id_required'
|
||||
}, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
strava_token, error_response = self.refresh_strava_token_if_needed(request.user)
|
||||
if error_response:
|
||||
return error_response
|
||||
|
||||
headers = {'Authorization': f'Bearer {strava_token.access_token}'}
|
||||
try:
|
||||
response = requests.get(f'https://www.strava.com/api/v3/activities/{activity_id}', headers=headers)
|
||||
if response.status_code != 200:
|
||||
return Response({
|
||||
'message': 'Failed to fetch activity from Strava.',
|
||||
'error': True,
|
||||
'code': 'strava.fetch_failed',
|
||||
'details': response.json().get('message', 'Unknown error')
|
||||
}, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
activity = response.json()
|
||||
essential_activity = self.extract_essential_activity_info(activity)
|
||||
return Response(essential_activity, status=status.HTTP_200_OK)
|
||||
|
||||
except requests.RequestException as e:
|
||||
logger.error(f"Error fetching Strava activity: {str(e)}")
|
||||
return Response({
|
||||
'message': 'Failed to connect to Strava.',
|
||||
'error': True,
|
||||
'code': 'strava.connection_failed'
|
||||
}, status=status.HTTP_502_BAD_GATEWAY)
|
||||
165
backend/server/integrations/views/wanderer_view.py
Normal file
165
backend/server/integrations/views/wanderer_view.py
Normal file
@@ -0,0 +1,165 @@
|
||||
# views.py
|
||||
import requests
|
||||
from rest_framework import viewsets, status
|
||||
from rest_framework.decorators import action
|
||||
from rest_framework.permissions import IsAuthenticated
|
||||
from rest_framework.response import Response
|
||||
from rest_framework.exceptions import ValidationError, NotFound
|
||||
|
||||
from integrations.models import WandererIntegration
|
||||
from integrations.wanderer_services import get_valid_session, login_to_wanderer, IntegrationError
|
||||
from django.utils import timezone
|
||||
|
||||
class WandererIntegrationViewSet(viewsets.ViewSet):
|
||||
permission_classes = [IsAuthenticated]
|
||||
|
||||
def _get_obj(self):
|
||||
try:
|
||||
return WandererIntegration.objects.filter(user=self.request.user).first()
|
||||
except WandererIntegration.DoesNotExist:
|
||||
raise NotFound("Wanderer integration not found.")
|
||||
|
||||
# def list(self, request):
|
||||
# try:
|
||||
# inst = self._get_obj()
|
||||
# except NotFound:
|
||||
# return Response([], status=status.HTTP_200_OK)
|
||||
# return Response({
|
||||
# "id": inst.id,
|
||||
# "server_url": inst.server_url,
|
||||
# "username": inst.username,
|
||||
# "is_connected": bool(inst.token and inst.token_expiry and inst.token_expiry > timezone.now()),
|
||||
# "token_expiry": inst.token_expiry,
|
||||
# })
|
||||
|
||||
def create(self, request):
|
||||
if WandererIntegration.objects.filter(user=request.user).exists():
|
||||
raise ValidationError("Wanderer integration already exists. Use UPDATE instead.")
|
||||
|
||||
if not request.user.is_authenticated:
|
||||
raise ValidationError("You must be authenticated to create a Wanderer integration.")
|
||||
|
||||
server_url = request.data.get("server_url")
|
||||
username = request.data.get("username")
|
||||
password = request.data.get("password")
|
||||
if not server_url or not username or not password:
|
||||
raise ValidationError(
|
||||
"Must provide server_url, username + password in request data."
|
||||
)
|
||||
|
||||
inst = WandererIntegration(
|
||||
user=request.user,
|
||||
server_url=server_url.rstrip("/"),
|
||||
username=username,
|
||||
)
|
||||
|
||||
try:
|
||||
token, expiry = login_to_wanderer(inst, password)
|
||||
except IntegrationError:
|
||||
raise ValidationError({"error": "Failed to authenticate with Wanderer server."})
|
||||
|
||||
inst.token = token
|
||||
inst.token_expiry = expiry
|
||||
inst.save()
|
||||
|
||||
return Response(
|
||||
{"message": "Wanderer integration created and authenticated successfully."},
|
||||
status=status.HTTP_201_CREATED,
|
||||
)
|
||||
|
||||
def update(self, request, pk=None):
|
||||
inst = self._get_obj()
|
||||
|
||||
if not inst:
|
||||
raise NotFound("Wanderer integration not found.")
|
||||
if not self.request.user.is_authenticated:
|
||||
raise ValidationError("You must be authenticated to update the integration.")
|
||||
|
||||
changed = False
|
||||
for field in ("server_url", "username"):
|
||||
if field in request.data and getattr(inst, field) != request.data[field]:
|
||||
setattr(inst, field, request.data[field].rstrip("/") if field=="server_url" else request.data[field])
|
||||
changed = True
|
||||
|
||||
password = request.data.get("password")
|
||||
if not changed and not password:
|
||||
return Response(
|
||||
{"detail": "Nothing updated: send at least one of server_url, username, or password."},
|
||||
status=status.HTTP_400_BAD_REQUEST,
|
||||
)
|
||||
|
||||
# If password provided: re-auth / token renewal
|
||||
if password:
|
||||
try:
|
||||
token, expiry = login_to_wanderer(inst, password)
|
||||
except IntegrationError:
|
||||
raise ValidationError({"error": "Failed to update integration. Please check your credentials and try again."})
|
||||
inst.token = token
|
||||
inst.token_expiry = expiry
|
||||
|
||||
inst.save()
|
||||
return Response({"message": "Integration updated successfully."})
|
||||
|
||||
@action(detail=False, methods=["post"])
|
||||
def disable(self, request):
|
||||
inst = self._get_obj()
|
||||
|
||||
if not inst:
|
||||
raise NotFound("Wanderer integration not found.")
|
||||
if not self.request.user.is_authenticated:
|
||||
raise ValidationError("You must be authenticated to disable the integration.")
|
||||
|
||||
inst.delete()
|
||||
return Response(status=status.HTTP_204_NO_CONTENT)
|
||||
|
||||
@action(detail=False, methods=["post"])
|
||||
def refresh(self, request):
|
||||
inst = self._get_obj()
|
||||
|
||||
if not self.request.user.is_authenticated:
|
||||
raise ValidationError("You must be authenticated to refresh the integration.")
|
||||
|
||||
password = request.data.get("password")
|
||||
try:
|
||||
session = get_valid_session(inst, password_for_reauth=password)
|
||||
except IntegrationError:
|
||||
raise ValidationError({"detail": "An error occurred while refreshing the integration."})
|
||||
|
||||
return Response({
|
||||
"token": inst.token,
|
||||
"token_expiry": inst.token_expiry,
|
||||
"is_connected": True,
|
||||
})
|
||||
|
||||
@action(detail=False, methods=["get"], url_path='trails')
|
||||
def trails(self, request):
|
||||
inst = self._get_obj()
|
||||
|
||||
if not self.request.user.is_authenticated:
|
||||
raise ValidationError("You must be authenticated to access trails.")
|
||||
|
||||
# Check if we need to prompt for password
|
||||
password = request.query_params.get("password") # Allow password via query param if needed
|
||||
|
||||
try:
|
||||
session = get_valid_session(inst, password_for_reauth=password)
|
||||
except IntegrationError as e:
|
||||
# If session expired and no password provided, give a helpful error
|
||||
if "password is required" in str(e).lower():
|
||||
raise ValidationError({
|
||||
"detail": "Session expired or not authenticated. Please provide your password to re-authenticate.",
|
||||
"requires_password": True
|
||||
})
|
||||
raise ValidationError({"detail": "An error occurred while refreshing the integration."})
|
||||
|
||||
# Pass along all query parameters except password
|
||||
params = {k: v for k, v in request.query_params.items() if k != "password"}
|
||||
|
||||
url = f"{inst.server_url.rstrip('/')}/api/v1/trail"
|
||||
try:
|
||||
response = session.get(url, params=params, timeout=10)
|
||||
response.raise_for_status()
|
||||
except requests.RequestException:
|
||||
raise ValidationError({"detail": f"Error fetching trails"})
|
||||
|
||||
return Response(response.json())
|
||||
296
backend/server/integrations/wanderer_services.py
Normal file
296
backend/server/integrations/wanderer_services.py
Normal file
@@ -0,0 +1,296 @@
|
||||
# wanderer_services.py
|
||||
import requests
|
||||
from datetime import datetime
|
||||
from datetime import timezone as dt_timezone
|
||||
from django.utils import timezone as django_timezone
|
||||
from django.core.cache import cache
|
||||
from django.conf import settings
|
||||
import logging
|
||||
import hashlib
|
||||
import json
|
||||
|
||||
from .models import WandererIntegration
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class IntegrationError(Exception):
|
||||
pass
|
||||
|
||||
# Use both possible cookie names
|
||||
COOKIE_NAMES = ("pb_auth", "pb-auth")
|
||||
LOGIN_PATH = "/api/v1/auth/login"
|
||||
|
||||
# Cache settings
|
||||
TRAIL_CACHE_TIMEOUT = getattr(settings, 'WANDERER_TRAIL_CACHE_TIMEOUT', 60 * 15) # 15 minutes default
|
||||
TRAIL_CACHE_PREFIX = 'wanderer_trail'
|
||||
|
||||
def _get_cache_key(integration_id: int, trail_id: str) -> str:
|
||||
"""Generate a consistent cache key for trail data."""
|
||||
return f"{TRAIL_CACHE_PREFIX}:{integration_id}:{trail_id}"
|
||||
|
||||
def _get_etag_cache_key(integration_id: int, trail_id: str) -> str:
|
||||
"""Generate cache key for ETags."""
|
||||
return f"{TRAIL_CACHE_PREFIX}_etag:{integration_id}:{trail_id}"
|
||||
|
||||
def login_to_wanderer(integration: WandererIntegration, password: str):
|
||||
"""
|
||||
Authenticate with Wanderer and return the auth cookie and expiry.
|
||||
"""
|
||||
url = integration.server_url.rstrip("/") + LOGIN_PATH
|
||||
|
||||
try:
|
||||
resp = requests.post(url, json={
|
||||
"username": integration.username,
|
||||
"password": password
|
||||
}, timeout=10)
|
||||
resp.raise_for_status()
|
||||
except requests.RequestException as exc:
|
||||
logger.error("Error connecting to Wanderer login: %s", exc)
|
||||
raise IntegrationError("Could not connect to Wanderer server.")
|
||||
|
||||
# Log only summary (not full token body)
|
||||
logger.debug("Wanderer login status: %s, headers: %s", resp.status_code, resp.headers.get("Set-Cookie"))
|
||||
|
||||
# Extract auth cookie and expiry
|
||||
token = None
|
||||
expiry = None
|
||||
for cookie in resp.cookies:
|
||||
if cookie.name in COOKIE_NAMES:
|
||||
token = cookie.value
|
||||
if cookie.expires:
|
||||
expiry = datetime.fromtimestamp(cookie.expires, tz=dt_timezone.utc)
|
||||
else:
|
||||
# If no expiry set, assume 24 hours from now
|
||||
expiry = django_timezone.now() + django_timezone.timedelta(hours=24)
|
||||
break
|
||||
|
||||
if not token:
|
||||
logger.error("Wanderer login succeeded but no auth cookie in response.")
|
||||
raise IntegrationError("Authentication succeeded, but token cookie not found.")
|
||||
|
||||
logger.info(f"Successfully authenticated with Wanderer. Token expires: {expiry}")
|
||||
return token, expiry
|
||||
|
||||
def get_valid_session(integration: WandererIntegration, password_for_reauth: str = None):
|
||||
"""
|
||||
Get a requests session with valid authentication.
|
||||
Will reuse existing token if valid, or re-authenticate if needed.
|
||||
"""
|
||||
now = django_timezone.now()
|
||||
session = requests.Session()
|
||||
|
||||
if not integration:
|
||||
raise IntegrationError("No Wanderer integration found.")
|
||||
|
||||
# Check if we have a valid token
|
||||
if integration.token and integration.token_expiry and integration.token_expiry > now:
|
||||
logger.debug("Using existing valid token")
|
||||
session.cookies.set(COOKIE_NAMES[0], integration.token)
|
||||
return session
|
||||
|
||||
# Token expired or missing - need to re-authenticate
|
||||
if password_for_reauth is None:
|
||||
raise IntegrationError("Session expired; password is required to reconnect.")
|
||||
|
||||
logger.info("Token expired, re-authenticating with Wanderer")
|
||||
token, expiry = login_to_wanderer(integration, password_for_reauth)
|
||||
|
||||
# Update the integration with new token
|
||||
integration.token = token
|
||||
integration.token_expiry = expiry
|
||||
integration.save(update_fields=["token", "token_expiry"])
|
||||
|
||||
# Set the cookie in the session
|
||||
session.cookies.set(COOKIE_NAMES[0], token)
|
||||
return session
|
||||
|
||||
def make_wanderer_request(integration: WandererIntegration, endpoint: str, method: str = "GET", password_for_reauth: str = None, **kwargs):
|
||||
"""
|
||||
Helper function to make authenticated requests to Wanderer API.
|
||||
|
||||
Args:
|
||||
integration: WandererIntegration instance
|
||||
endpoint: API endpoint (e.g., '/api/v1/list')
|
||||
method: HTTP method (GET, POST, etc.)
|
||||
password_for_reauth: Password to use if re-authentication is needed
|
||||
**kwargs: Additional arguments to pass to requests method
|
||||
|
||||
Returns:
|
||||
requests.Response object
|
||||
"""
|
||||
session = get_valid_session(integration, password_for_reauth)
|
||||
url = f"{integration.server_url.rstrip('/')}{endpoint}"
|
||||
|
||||
try:
|
||||
response = getattr(session, method.lower())(url, timeout=10, **kwargs)
|
||||
response.raise_for_status()
|
||||
return response
|
||||
except requests.RequestException as exc:
|
||||
logger.error(f"Error making {method} request to {url}: {exc}")
|
||||
raise IntegrationError(f"Error communicating with Wanderer: {exc}")
|
||||
|
||||
def fetch_trail_by_id(integration: WandererIntegration, trail_id: str, password_for_reauth: str = None, use_cache: bool = True):
|
||||
"""
|
||||
Fetch a specific trail by its ID from the Wanderer API with intelligent caching.
|
||||
|
||||
Args:
|
||||
integration: WandererIntegration instance
|
||||
trail_id: ID of the trail to fetch
|
||||
password_for_reauth: Password to use if re-authentication is needed
|
||||
use_cache: Whether to use caching (default: True)
|
||||
|
||||
Returns:
|
||||
dict: Trail data from the API
|
||||
"""
|
||||
cache_key = _get_cache_key(integration.id, trail_id)
|
||||
etag_cache_key = _get_etag_cache_key(integration.id, trail_id)
|
||||
|
||||
# Try to get from cache first
|
||||
if use_cache:
|
||||
cached_data = cache.get(cache_key)
|
||||
if cached_data:
|
||||
logger.debug(f"Trail {trail_id} found in cache")
|
||||
return cached_data
|
||||
|
||||
# Prepare headers for conditional requests
|
||||
headers = {}
|
||||
if use_cache:
|
||||
cached_etag = cache.get(etag_cache_key)
|
||||
if cached_etag:
|
||||
headers['If-None-Match'] = cached_etag
|
||||
|
||||
try:
|
||||
response = make_wanderer_request(
|
||||
integration,
|
||||
f"/api/v1/trail/{trail_id}",
|
||||
password_for_reauth=password_for_reauth,
|
||||
headers=headers
|
||||
)
|
||||
|
||||
# Handle 304 Not Modified
|
||||
if response.status_code == 304:
|
||||
logger.debug(f"Trail {trail_id} not modified, using cached version")
|
||||
cached_data = cache.get(cache_key)
|
||||
if cached_data:
|
||||
return cached_data
|
||||
|
||||
trail_data = response.json()
|
||||
|
||||
# Cache the result
|
||||
if use_cache:
|
||||
cache.set(cache_key, trail_data, TRAIL_CACHE_TIMEOUT)
|
||||
|
||||
# Cache ETag if present
|
||||
etag = response.headers.get('ETag')
|
||||
if etag:
|
||||
cache.set(etag_cache_key, etag, TRAIL_CACHE_TIMEOUT)
|
||||
|
||||
logger.debug(f"Trail {trail_id} cached for {TRAIL_CACHE_TIMEOUT} seconds")
|
||||
|
||||
return trail_data
|
||||
|
||||
except requests.RequestException as exc:
|
||||
# If we have cached data and the request fails, return cached data as fallback
|
||||
if use_cache:
|
||||
cached_data = cache.get(cache_key)
|
||||
if cached_data:
|
||||
logger.debug(f"API request failed, returning cached trail {trail_id}: {exc}")
|
||||
return cached_data
|
||||
raise
|
||||
|
||||
def fetch_multiple_trails_by_id(integration: WandererIntegration, trail_ids: list, password_for_reauth: str = None, use_cache: bool = True):
|
||||
"""
|
||||
Fetch multiple trails efficiently with batch caching.
|
||||
|
||||
Args:
|
||||
integration: WandererIntegration instance
|
||||
trail_ids: List of trail IDs to fetch
|
||||
password_for_reauth: Password to use if re-authentication is needed
|
||||
use_cache: Whether to use caching (default: True)
|
||||
|
||||
Returns:
|
||||
dict: Dictionary mapping trail_id to trail data
|
||||
"""
|
||||
results = {}
|
||||
uncached_ids = []
|
||||
|
||||
if use_cache:
|
||||
# Get cache keys for all trails
|
||||
cache_keys = {trail_id: _get_cache_key(integration.id, trail_id) for trail_id in trail_ids}
|
||||
|
||||
# Batch get from cache
|
||||
cached_trails = cache.get_many(cache_keys.values())
|
||||
key_to_id = {v: k for k, v in cache_keys.items()}
|
||||
|
||||
# Separate cached and uncached
|
||||
for cache_key, trail_data in cached_trails.items():
|
||||
trail_id = key_to_id[cache_key]
|
||||
results[trail_id] = trail_data
|
||||
|
||||
uncached_ids = [tid for tid in trail_ids if tid not in results]
|
||||
logger.debug(f"Found {len(results)} trails in cache, need to fetch {len(uncached_ids)}")
|
||||
else:
|
||||
uncached_ids = trail_ids
|
||||
|
||||
# Fetch uncached trails
|
||||
for trail_id in uncached_ids:
|
||||
try:
|
||||
trail_data = fetch_trail_by_id(integration, trail_id, password_for_reauth, use_cache)
|
||||
results[trail_id] = trail_data
|
||||
except IntegrationError as e:
|
||||
logger.error(f"Failed to fetch trail {trail_id}: {e}")
|
||||
# Continue with other trails
|
||||
continue
|
||||
|
||||
return results
|
||||
|
||||
def invalidate_trail_cache(integration_id: int, trail_id: str = None):
|
||||
"""
|
||||
Invalidate cached trail data.
|
||||
|
||||
Args:
|
||||
integration_id: Integration ID
|
||||
trail_id: Specific trail ID to invalidate, or None to clear all trails for this integration
|
||||
"""
|
||||
if trail_id:
|
||||
# Invalidate specific trail
|
||||
cache_key = _get_cache_key(integration_id, trail_id)
|
||||
etag_cache_key = _get_etag_cache_key(integration_id, trail_id)
|
||||
cache.delete_many([cache_key, etag_cache_key])
|
||||
logger.info(f"Invalidated cache for trail {trail_id}")
|
||||
else:
|
||||
# This would require a more complex implementation to find all keys
|
||||
# For now, we'll just log it - you might want to use cache versioning instead
|
||||
logger.debug("Cache invalidation for all trails not implemented - consider using cache versioning")
|
||||
|
||||
def warm_trail_cache(integration: WandererIntegration, trail_ids: list, password_for_reauth: str = None):
|
||||
"""
|
||||
Pre-warm the cache with trail data.
|
||||
|
||||
Args:
|
||||
integration: WandererIntegration instance
|
||||
trail_ids: List of trail IDs to pre-load
|
||||
password_for_reauth: Password to use if re-authentication is needed
|
||||
"""
|
||||
logger.info(f"Warming cache for {len(trail_ids)} trails")
|
||||
fetch_multiple_trails_by_id(integration, trail_ids, password_for_reauth, use_cache=True)
|
||||
|
||||
# Decorator for additional caching layers
|
||||
def cached_trail_method(timeout=TRAIL_CACHE_TIMEOUT):
|
||||
"""
|
||||
Decorator to add method-level caching to any function that takes integration and trail_id.
|
||||
"""
|
||||
def decorator(func):
|
||||
def wrapper(integration, trail_id, *args, **kwargs):
|
||||
# Create cache key based on function name and arguments
|
||||
cache_key = f"{func.__name__}:{integration.id}:{trail_id}:{hashlib.md5(str(args).encode()).hexdigest()}"
|
||||
|
||||
cached_result = cache.get(cache_key)
|
||||
if cached_result is not None:
|
||||
return cached_result
|
||||
|
||||
result = func(integration, trail_id, *args, **kwargs)
|
||||
cache.set(cache_key, result, timeout)
|
||||
return result
|
||||
return wrapper
|
||||
return decorator
|
||||
Reference in New Issue
Block a user