Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix ican generation and tests

Roland Geiderc5cffbd681f4
diff --git a/wger/manager/tests/test_ical.py b/wger/manager/tests/test_ical.py
index 4f9356a8f..5182c8306 100644
--- a/wger/manager/tests/test_ical.py
+++ b/wger/manager/tests/test_ical.py
@@ -12,84 +12,21 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Standard Library
-import datetime
-
# Django
-from django.contrib.auth.models import User
from django.urls import reverse
# wger
from wger.core.tests.base_testcase import WgerTestCase
-from wger.utils.helpers import (
- make_token,
- next_weekday,
-)
# TODO: parse the generated calendar files with the icalendar library
-class IcalToolsTestCase(WgerTestCase):
- """
- Tests some tools used for iCal generation
- """
-
- def test_next_weekday(self):
- """
- Test the next weekday function
- """
- start_date = datetime.date(2013, 12, 5)
-
- # Find next monday
- self.assertEqual(next_weekday(start_date, 0), datetime.date(2013, 12, 9))
-
- # Find next wednesday
- self.assertEqual(next_weekday(start_date, 2), datetime.date(2013, 12, 11))
-
- # Find next saturday
- self.assertEqual(next_weekday(start_date, 5), datetime.date(2013, 12, 7))
-
-
class WorkoutICalExportTestCase(WgerTestCase):
"""
Tests exporting the ical file for a workout
"""
- def export_ical_token(self):
- """
- Helper function that checks exporing an ical file using tokens for access
- """
-
- user = User.objects.get(username='test')
- uid, token = make_token(user)
- response = self.client.get(
- reverse('manager:workout:ical', kwargs={'pk': 3, 'uidb64': uid, 'token': token})
- )
-
- self.assertEqual(response.status_code, 200)
- self.assertEqual(response['Content-Type'], 'text/calendar')
- self.assertEqual(
- response['Content-Disposition'], 'attachment; filename=Calendar-workout-3.ics'
- )
-
- # Approximate size
- self.assertGreater(len(response.content), 540)
- self.assertLess(len(response.content), 620)
-
- def export_ical_token_wrong(self):
- """
- Helper function that checks exporing an ical file using a wrong token
- """
-
- uid = 'AB'
- token = 'abc-11223344556677889900'
- response = self.client.get(
- reverse('manager:workout:ical', kwargs={'pk': 3, 'uidb64': uid, 'token': token})
- )
-
- self.assertEqual(response.status_code, 403)
-
def export_ical(self, fail=False):
"""
Helper function
@@ -107,7 +44,7 @@ class WorkoutICalExportTestCase(WgerTestCase):
)
# Approximate size
- self.assertGreater(len(response.content), 540)
+ self.assertGreater(len(response.content), 50)
self.assertLess(len(response.content), 620)
def test_export_ical_anonymous(self):
@@ -116,8 +53,6 @@ class WorkoutICalExportTestCase(WgerTestCase):
"""
self.export_ical(fail=True)
- self.export_ical_token()
- self.export_ical_token_wrong()
def test_export_ical_owner(self):
"""
@@ -126,8 +61,6 @@ class WorkoutICalExportTestCase(WgerTestCase):
self.user_login('test')
self.export_ical(fail=False)
- self.export_ical_token()
- self.export_ical_token_wrong()
def test_export_ical_other(self):
"""
@@ -136,5 +69,3 @@ class WorkoutICalExportTestCase(WgerTestCase):
self.user_login('admin')
self.export_ical(fail=True)
- self.export_ical_token()
- self.export_ical_token_wrong()
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index a62c92c4f..0c6e5c791 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -31,7 +31,6 @@ from wger.manager.views import (
workout,
)
-
# sub patterns for workout logs
patterns_log = [
path(
@@ -86,11 +85,6 @@ patterns_workout = [
ReactView.as_view(login_required=True),
name='calendar',
),
- re_path(
- r'^(?P<pk>\d+)/ical/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
- ical.export,
- name='ical',
- ),
path(
'<int:pk>/ical',
ical.export,
diff --git a/wger/manager/views/ical.py b/wger/manager/views/ical.py
index 4802826b4..b48365baa 100644
--- a/wger/manager/views/ical.py
+++ b/wger/manager/views/ical.py
@@ -35,12 +35,7 @@ from icalendar.tools import UIDGenerator
# wger
from wger import get_version
-from wger.manager.models import Workout
-from wger.utils.helpers import (
- check_token,
- next_weekday,
-)
-
+from wger.manager.models import Routine
logger = logging.getLogger(__name__)
"""
@@ -69,71 +64,50 @@ def get_calendar():
return calendar
-def get_events_workout(calendar, workout, duration, start_date=None):
+def get_events_workout(calendar, routine: Routine):
"""
Creates all necessary events from the given workout and adds them to
the calendar. Each event's occurrence ist set to weekly (one event for
each training day).
-
- :param calendar: calendar to add events to
- :param workout: Workout
- :param duration: duration in weeks
- :param start_date: start date, default: profile default
- :return: None
"""
- start_date = start_date if start_date else workout.creation_date
- end_date = start_date + datetime.timedelta(weeks=duration)
generator = UIDGenerator()
site = Site.objects.get_current()
- for day in workout.day_set.all():
- # Make the description of the event with the day's exercises
- description_list = []
- for set_obj in day.set_set.all():
- for base in set_obj.exercise_bases:
- description_list.append(str(base.get_translation()))
- description = ', '.join(description_list) if description_list else day.description
-
- # Make an event for each weekday
- for weekday in day.day.all():
- event = Event()
- event.add('summary', day.description)
- event.add('description', description)
- event.add('dtstart', next_weekday(start_date, weekday.id - 1))
- event.add('dtend', next_weekday(start_date, weekday.id - 1))
- event.add('rrule', {'freq': 'weekly', 'until': end_date})
- event['uid'] = generator.uid(host_name=site.domain)
- event.add('priority', 5)
- calendar.add_component(event)
+ for day_data in routine.date_sequence:
+
+ if day_data.day.is_rest:
+ continue
+
+ event = Event()
+ event.add('summary', day_data.day.name)
+ event.add('description', day_data.day.description)
+ event.add('dtstart', day_data.date),
+ event.add('dtend', day_data.date)
+ event['uid'] = generator.uid(host_name=site.domain)
+ event.add('priority', 5)
+ calendar.add_component(event)
# Views
-def export(request, pk, uidb64=None, token=None):
+def export(request, pk):
"""
Export the current workout as an iCal file
"""
- # Load the workout
- if uidb64 is not None and token is not None:
- if check_token(uidb64, token):
- workout = get_object_or_404(Workout, pk=pk)
- else:
- return HttpResponseForbidden()
- else:
- if request.user.is_anonymous:
- return HttpResponseForbidden()
- workout = get_object_or_404(Workout, pk=pk, user=request.user)
+ if request.user.is_anonymous:
+ return HttpResponseForbidden()
+ routine = get_object_or_404(Routine, pk=pk, user=request.user)
# Create the calendar
calendar = get_calendar()
# Create the events and add them to the calendar
- get_events_workout(calendar, workout, workout.user.userprofile.workout_duration)
+ get_events_workout(calendar, routine)
# Send the file to the user
response = HttpResponse(content_type='text/calendar')
- response['Content-Disposition'] = f'attachment; filename=Calendar-workout-{workout.pk}.ics'
+ response['Content-Disposition'] = f'attachment; filename=Calendar-workout-{routine.pk}.ics'
response.write(calendar.to_ical())
response['Content-Length'] = len(response.content)
return response