mirror of
https://github.com/seanmorley15/AdventureLog.git
synced 2026-03-27 10:43:01 -04:00
* 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>
464 lines
20 KiB
Python
464 lines
20 KiB
Python
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) |