From 165b8e35e06471118f51970233542d6549e6129e Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 30 Dec 2024 12:44:24 +0100 Subject: [PATCH 1/7] first changes --- rowers/models.py | 7 +- rowers/rower_rules.py | 91 +++++++++++--------------- rowers/tests/test_permissions2.py | 22 ++----- rowers/tests/test_plans.py | 14 ++-- rowers/tests/testdata/testdata.tcx.gz | Bin 3989 -> 3989 bytes rowers/tests/viewnames.csv | 18 ++--- 6 files changed, 61 insertions(+), 91 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index 4ea37a23..80c83d27 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -862,9 +862,6 @@ weightcategories = mytypes.weightcategories plans = ( ('basic', 'basic'), ('pro', 'pro'), - ('plan', 'plan'), - ('coach', 'coach'), - ('freecoach', 'freecoach'), ) paymenttypes = ( @@ -1365,7 +1362,7 @@ class Rower(models.Model): @property def ispaid(self): # pragma: no cover - return self.rowerplan in ['pro', 'plan', 'coach'] + return self.rowerplan == 'pro' class DeactivateUserForm(forms.ModelForm): @@ -2980,7 +2977,7 @@ class PlannedSession(models.Model): if not is_virtualevent: if not can_add_session(self.manager): raise ValidationError( - "You must be a Self-Coach user or higher to create a planned session" + "You must be a Pro user or higher to create a planned session" ) # interval string diff --git a/rowers/rower_rules.py b/rowers/rower_rules.py index b7bb4164..df24bfa1 100644 --- a/rowers/rower_rules.py +++ b/rowers/rower_rules.py @@ -17,31 +17,31 @@ USER permissions - These methods exist on rower - rower.rowerplan - rower.protrialexpires - - rower.plantrialexpires + - rower.protrialexpires - rower.mycoachgroup - rower.coachinggroups - rower.team - These Rules apply to Rowers - - Coach can have any number of groups + - Pro can have any number of groups - test_permissions.PermissionFreeCoach.test_coach_groupmanager - test_permissions.PermissionsBasicsTests.test_coach_groupmanager - test_permissions.PermissionsViewTests.test_coach_groups_create - - Pro and Plan users can have one group and not more + - (REMOVE) Pro and Plan users can have one group and not more - test_permissions.PermissionsFreeCoach.test_pro_groupmanager - test_permissions.PermissionsViewTests.test_pro_groups_create - - Free Coach user cannot have workouts + - (REMOVE) Free Coach user cannot have workouts - test_permissions.PermissionFreeCoach.test_add_workout_freecoach - - Free coach can create more than one group + - (REMOVE) Free coach can create more than one group - test_permissions.PermissionsFreeCoach.test_plan_groupmanager - - Free Coach & Plan (Self Coach) can create planned sessions and team planned sessions + - (ADJUST) Free Coach & Plan (Self Coach) can create planned sessions and team planned sessions - test_permissions.PermissionsFreeCoach.test_plan_create_session - test_permissions.PermissionsFreeCoach.test_coach_create_session - - Pro cannot create planned sessions or team planned sessions + - (REMOVE) Pro cannot create planned sessions or team planned sessions - test_permissions.PermissionsViewTests.test_pro_create_session - - Basic cannot join groups led by Free Coach + - (REMOVE) Basic cannot join groups led by Free Coach - test_permissions.PermissionFreeCoach.test_add_basic_pro_or_plan - - Coach can edit athlete settings (if in coachinggroup) + - (ADJUST) Coach can edit athlete settings (if in coachinggroup) - test_permissions.PermissionsViewTests.test_coach_edit_athlete_prefs - test_permissions.PermissionsViewTests.test_coach_edit_athlete_prefs_not - test_permissions.PermissionsViewTests.test_coach_edit_athlete_settings @@ -50,25 +50,25 @@ USER permissions - test_permissions.PermissionsViewTests.test_coach_edit_athlete_account_not - test_permissions.PermissionsViewTests.test_coach_edit_athlete_exportsettings - test_permissions.PermissionsViewTests.test_coach_edit_athlete_exportsettings_not - - Coach can upload a workout on behalf of athlete + - (ADJUST) Coach can upload a workout on behalf of athlete - test_permissions.PermissionsViewTests.test_coach_edit_athlete_upload - test_permissions.PermissionsViewTests.test_coach_edit_athlete_upload_not - - Pro and Plan cannot upload a workout on behalf of athlete + - (REMOVE) Pro and Plan cannot upload a workout on behalf of athlete - test_permissions.PermissionsViewTests.test_plan_edit_athlete_upload - - Coach can run analytics for athlete + - (ADJUST) Coach can run analytics for athlete - test_permissions.PermissionsViewTests.test_coach_edit_athlete_analysis - test_permissions.PermissionsViewTests.test_coach_edit_athlete_analysis_not - test_permissions.PermissionsViewTests.test_pro_edit_athlete_analysis - - Pro and Plan user cannot run analysis for members of their groups + - (ADJUST) Pro and Plan user cannot run analysis for members of their groups - test_permissions.PermissionsViewTests.test_plan_edit_athlete_analysis - - Pro and Plan user cannot edit athlete sessings + - (ADJUST) Pro and Plan user cannot edit athlete sessings - test_permissions.PermissionsViewTests.test_plan_edit_athlete_settings - test_permissions.PermissionsViewTests.test_pro_edit_athlete_settings - - Self-Coach and Pro cannot create more than one group + - (REMOVE) Self-Coach and Pro cannot create more than one group - test_permissions.PermissionsFreeCoach.test_plan_groupmanager - Pro users and higher can join group led by other Pro or higher user - test_permissions.PermissionsFreeCoach.test_add_proplan_pro_or_plan - - Pro or basic cannot create planned sessions or team planned sessions + - (ADJSUT) Pro or basic cannot create planned sessions or team planned sessions - test_permissions.PermissionsFreeCoach.test_pro_create_plannedsession """ @@ -84,7 +84,7 @@ def user_is_not_basic(user): if user.rower.protrialexpires >= timezone.now().date(): return True # pragma: no cover - if user.rower.plantrialexpires >= timezone.now().date(): + if user.rower.protrialexpires >= timezone.now().date(): return True # pragma: no cover if user.rower.coachtrialexpires >= timezone.now().date(): @@ -97,9 +97,9 @@ def user_is_not_basic(user): def user_is_coachee(user): coaches = user.rower.get_coaches() for coach in coaches: - if coach.rowerplan == 'coach': + if coach.rowerplan == 'pro': return True - if coach.coachtrialexpires >= timezone.now().date(): + if coach.protrialexpires >= timezone.now().date(): return True return False @@ -123,14 +123,14 @@ def can_start_plantrial(user): if user.is_anonymous: # pragma: no cover return False - return user.rower.plantrialexpires == datetime.date(1970, 1, 1) + return user.rower.protrialexpires == datetime.date(1970, 1, 1) @rules.predicate def can_start_coachtrial(user): if user.is_anonymous: # pragma: no cover return False - return user.rower.coachtrialexpires == datetime.date(1970, 1, 1) + return user.rower.protrialexpires == datetime.date(1970, 1, 1) @rules.predicate @@ -144,20 +144,16 @@ def is_coach(user): return False if user.is_anonymous: return False - if user.rower.coachtrialexpires >= timezone.now().date(): + if user.rower.protrialexpires >= timezone.now().date(): return True - return user.rower.rowerplan in ['coach', 'freecoach'] + return user.rower.rowerplan == 'pro' -@rules.predicate -def is_not_freecoach(user): - return user.rower.rowerplan != 'freecoach' - def is_paid_coach(user): - if user.rower.coachtrialexpires >= timezone.now().date(): + if user.rower.protrialexpires >= timezone.now().date(): return True - return user.rower.rowerplan == 'coach' + return user.rower.rowerplan == 'pro' @rules.predicate @@ -167,10 +163,10 @@ def is_planmember(user): except AttributeError: # pragma: no cover return False - if user.rower.coachtrialexpires >= timezone.now().date(): + if user.rower.protrialexpires >= timezone.now().date(): return True - return r.rowerplan in ['coach', 'plan'] # freecoach? + return r.rowerplan == 'pro' @rules.predicate @@ -180,7 +176,7 @@ def is_promember(user): except AttributeError: return False - return r.rowerplan in ['pro', 'coach', 'plan'] # freecoach? + return r.rowerplan == 'pro' @rules.predicate @@ -192,9 +188,6 @@ def is_protrial(user): if r.rowerplan == 'basic': return r.protrialexpires >= timezone.now().date() - if r.rowerplan == 'freecoach': - if r.mycoachgroup is not None: - return len(r.mycoachgroup) >= 4 return False # pragma: no cover @@ -206,7 +199,7 @@ def is_coachtrial(user): return False if r.rowerplan == 'basic': - return r.coachtrialexpires >= timezone.now().date() + return r.protrialexpires >= timezone.now().date() return False # pragma: no cover @@ -235,7 +228,7 @@ def can_add_team(user): @rules.predicate def can_add_plan(user): - return isplanmember(user) or is_coach(user) + return ispromember(user) @rules.predicate @@ -243,7 +236,7 @@ def can_add_workout(user): if user.is_anonymous: # pragma: no cover return False - return user.rower.rowerplan != 'freecoach' + return True @rules.predicate @@ -253,11 +246,8 @@ def is_plantrial(user): except AttributeError: # pragma: no cover return False - if r.rowerplan in ['basic', 'pro']: - return r.plantrialexpires >= timezone.now().date() - if r.rowerplan == 'freecoach': - if r.mycoachgroup is not None: - return len(r.mycoachgroup) >= 4 + if r.rowerplan == 'basic': + return r.protrialexpires >= timezone.now().date() return False # pragma: no cover @@ -278,13 +268,10 @@ def can_add_session(user): def can_plan(user): if user.is_anonymous: # pragma: no cover return False - if user.rower.rowerplan in ['plan', 'coach']: + if user.rower.rowerplan == 'pro': return True - if user.rower.rowerplan in ['basic', 'pro']: - return user.rower.plantrialexpires >= timezone.now().date() or user.rower.coachtrialexpires >= timezone.now().date() - if user.rower.rowerplan == 'freecoach': # pragma: no cover - if user.rower.mycoachgroup is not None: - return len(user.rower.mycoachgroup) >= 4 + if user.rower.rowerplan == 'basic': + return user.rower.protrialexpires >= timezone.now().date() or user.rower.protrialexpires >= timezone.now().date() # checks if rower is coach of user (or is user himself) @@ -408,7 +395,7 @@ rules.add_perm('rower.add_plan', can_plan_user) # replaces checkaccessplanuser rules.add_perm('rower.is_coach', is_coach_user) # replaces checkaccessuser rules.add_perm('rower.is_pro', ispromember) rules.add_perm('rower.is_staff', is_staff) -rules.add_perm('rower.is_not_freecoach', is_not_freecoach) + # WORKOUT permissions @@ -781,9 +768,9 @@ def is_team_member(user, team): # pragma: no cover @rules.predicate def can_view_team(user, team): # user based - below untested - if team.manager.rower.coachtrialexpires >= timezone.now().date(): + if team.manager.rower.protrialexpires >= timezone.now().date(): return True - if user.rower.rowerplan == 'basic' and team.manager.rower.rowerplan != 'coach': # pragma: no cover + if user.rower.rowerplan == 'basic' and team.manager.rower.rowerplan != 'pro': # pragma: no cover return is_plantrial(user) or is_protrial(user) or is_coachtrial(user) # team is public if team.private == 'open': diff --git a/rowers/tests/test_permissions2.py b/rowers/tests/test_permissions2.py index 1675c7df..bb205602 100644 --- a/rowers/tests/test_permissions2.py +++ b/rowers/tests/test_permissions2.py @@ -49,7 +49,7 @@ for id, row in df.iterrows(): viewstotest.append(tpl) -plans = ['basic','plan','coach','pro'] +plans = ['basic','pro'] @override_settings(TESTING=True) class PermissionsViewTests(TestCase): @@ -61,7 +61,7 @@ class PermissionsViewTests(TestCase): rcoach = Rower.objects.create(user=ucoach, birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='coach',clubsize=10) + rowerplan='pro',clubsize=10) ucoach_workouts = WorkoutFactory.create_batch(5, user=rcoach) coachinggroup = CoachingGroup.objects.create() @@ -83,7 +83,7 @@ class PermissionsViewTests(TestCase): rplan = Rower.objects.create(user=uplan, birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='plan',clubsize=10) + rowerplan='pro',clubsize=10) uplan_workouts = WorkoutFactory.create_batch(5, user=rplan) rcoach.save() @@ -103,7 +103,7 @@ class PermissionsViewTests(TestCase): rplan2 = Rower.objects.create(user=uplan2, birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='plan',clubsize=10) + rowerplan='pro',clubsize=10) uplan2_workouts = WorkoutFactory.create_batch(5, user=rplan2) rcoach.save() @@ -287,12 +287,6 @@ class PermissionsViewTests(TestCase): elif permissions['own'] == 'pro': thisuser = self.upro notuser = self.ubasic - elif permissions['own'] == 'plan': - thisuser = self.uplan - notuser = self.upro - elif permissions['own'] == 'coach': - thisuser = self.ucoach - notuser = self.uplan if permissions['workoutid']: @@ -370,14 +364,6 @@ class PermissionsViewTests(TestCase): thisuser = self.upro memberuser = self.uplan notuser = self.ubasic - elif permissions['member'] == 'plan': - thisuser = self.uplan - memberuser = self.ubasic - notuser = self.upro - elif permissions['member'] == 'coach': - thisuser = self.ucoach - memberuser = self.uplan - notuser = self.uplan if permissions['workoutid']: diff --git a/rowers/tests/test_plans.py b/rowers/tests/test_plans.py index 79d180f5..66e55be8 100644 --- a/rowers/tests/test_plans.py +++ b/rowers/tests/test_plans.py @@ -33,7 +33,7 @@ class TrainingPlanTest(TestCase): gdproptin=True, ftpset=True,surveydone=True, defaulttimezone='US/Pacific', gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) @@ -200,7 +200,7 @@ class SessionTemplateTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) @@ -306,7 +306,7 @@ class SessionLinkTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) @@ -551,7 +551,7 @@ class SessionCompleteTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() @@ -808,7 +808,7 @@ class ChallengeCompleteTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() @@ -1032,7 +1032,7 @@ class MandatoryTestCompleteTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() @@ -1246,7 +1246,7 @@ class PlannedSessionsView(TestCase): gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), defaulttimezone='US/Pacific', - rowerplan='coach') + rowerplan='pro') self.r.save() self.c = Client() diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index ec90a271834e431f378e9c89449d033b64d98fab..d32442bdfad1513efff64a87f97d5d251e26d5be 100644 GIT binary patch delta 16 XcmbO#KUJPxzMF%iII3tPdmldlC Date: Mon, 30 Dec 2024 15:01:07 +0100 Subject: [PATCH 2/7] fix --- rowers/idoklad.py | 13 +- rowers/templates/paidplans.html | 192 ++------------------------ rowers/tests/test_analysis.py | 24 ++-- rowers/tests/test_payments.py | 22 +-- rowers/tests/test_rowerplans.py | 23 +-- rowers/tests/test_urls.py | 2 +- rowers/tests/testdata/testdata.tcx.gz | Bin 3989 -> 3989 bytes 7 files changed, 45 insertions(+), 231 deletions(-) diff --git a/rowers/idoklad.py b/rowers/idoklad.py index 4156e12e..cb6f2593 100644 --- a/rowers/idoklad.py +++ b/rowers/idoklad.py @@ -59,10 +59,15 @@ def idoklad_token(): response = requests.post('https://identity.idoklad.cz/server/connect/token', headers=headers, data=data) if response.status_code == 200: - token = response.json() - token['updated_at'] = timezone.now() - token = iDokladToken.objects.filter(id=1).update(**token) - return iDokladToken.objects.get(id=1) + token_json = response.json() + token = iDokladToken.objects.all().order_by('-updated_at')[0] + token.access_token = token_json['access_token'] + token.id_token = token_json['id_token'] + token.refresh_token = token_json['refresh_token'] + token.expires_in = token_json['expires_in'] + token.updated_at = timezone.now() + token.save() + return token else: return None diff --git a/rowers/templates/paidplans.html b/rowers/templates/paidplans.html index 836d4e44..36cc5f20 100644 --- a/rowers/templates/paidplans.html +++ b/rowers/templates/paidplans.html @@ -9,7 +9,7 @@

  • Rowsandall.com offers free data and analysis for rowers, by rowers. Of course, offering this service is not free. To help cover the - hosting costs, we have created paid plans offering extended + hosting costs, we have created a paid plan offering extended functionality.

    @@ -25,9 +25,6 @@   BASIC PRO - SELF-COACH - COACH - Free COACH @@ -35,146 +32,92 @@ Basic rowing metrics (spm, time, distance, heart rate, power) ✔ ✔ - ✔ - ✔ - ✔ Manual Import, Export, Synchronization and download of all your data ✔ ✔ - ✔ - ✔ - ✔ Heart rate and power zones ✔ ✔ - ✔ - ✔ - ✔ Ranking Pieces, Stroke Analysis ✔ ✔ + + + Compare Workouts ✔ ✔ + + + Automatic Synchronization with other fitness sites + ✔ ✔ All other rowing metrics (Work per Stroke, Average and Peak Force, Drive Length, Catch and Finish Angle, Slip and Wash, Peak Force Angle, and more)   ✔ - ✔ - ✔ - ✔ - - - Automatic Synchronization with other fitness sites -   - ✔ - ✔ - ✔ -   Advanced Analysis (Critical Power, Stats, Box Chart, Trend Flex)   ✔ - ✔ - ✔ - ✔* - - - Compare Workouts -   - ✔ - ✔ - ✔ - ✔* Empower Stroke Profile   ✔ - ✔ - ✔ - ✔* Sensor Fusion, Split Workout, In-stroke metrics   ✔ - ✔ - ✔ - ✔* Create and manage groups.   - ✔ (max 1) - ✔ (max 1) - ✔ ✔ Create Training plans, tests and challenges for yourself and your training group. Track your performance against plan.   -   ✔ - ✔ -   Create Training plans, tests and challenges for your athletes. Track their performance against plan.   -   -   - ✔ ✔ Manage your athlete's workouts   -   -   - ✔ ✔ Run analytics for your athletes   -   -   ✔ - ✔* Change zone intensities and other workout related settings for your athletes   -   -   - ✔ ✔ Pricing FREE From 25€/year - From 75€/year - From 90€/year - Free     -   -   -   {% if rower %} @@ -193,27 +136,11 @@   {% endif %} - - {% if rower.rowerplan == 'plan' %} -

    SELF-COACH ({{ rower.paymenttype }})

    - {% else %} -   - {% endif %} - - - {% if rower.rowerplan == 'coach' %} -

    COACH ({{ rower.paymenttype }})

    - {% elif rower.rowerplan == 'freecoach' %} -

    Free COACH

    - {% else %} -   - {% endif %} - {% endif %} - Available trials (no strings attached) + Available trial (no strings attached)   @@ -231,40 +158,6 @@   {% endif %} - - {% if user.is_anonymous %} - - {% elif rower and rower.rowerplan == 'basic' and rower.plantrialexpires|date_dif == 1 %} - - {% elif rower and rower.rowerplan == 'pro' and rower.plantrialexpires|date_dif == 1 %} - - {% else %} -   - {% endif %} - - - {% if user.is_anonymous %} - - {% elif rower and rower.rowerplan == 'basic' and rower.coachtrialexpires|date_dif == 1 %} - - {% elif rower and rower.rowerplan == 'pro' and rower.coachtrialexpires|date_dif == 1 %} - - {% else %} -   - {% endif %} - @@ -289,79 +182,16 @@ {% endif %} - {% elif rower and rower.rowerplan == 'freecoach' %} - - - - {% elif rower and rower.rowerplan == 'pro' %} -   - - - - {% elif rower and rower.rowerplan == 'plan' %} -   -   - - - - -   - {% endif %}

    -

    Coach and Self-Coach Membership

    - - -

    Rowsandall.com's Training Planning functionality - is part of the paid "Self-Coach" and "Coach" plans.

    - -

    On the "Self-Coach" plan, you can plan your own sessions.

    - -

    On the "Coach" plan, you can establish teams, see workouts done by - athletes on your team, and plan individual and group sessions for your - athletes. +

    + Payment methods: We accept credit card payments and PayPal through Braintree.

    -

    The Coach plan functionality listed is available to the coach only. - Individual athletes - can purchase upgrades to "Pro" and "Self-Coach" plans. -

    - -

    - The Coach plans come in two versions: free and paid. On the free coach plan, - you can only have athletes who are on the PRO paid plans or higher, and you - cannot upload any workouts to your own account. Some of the advanced Analysis functionality - becomes available when the athlete group is larger than 4. - On the paid - plans, your athletes can be on the free plan, and you have full access to the - site functionality for your own workouts and those of your athletes. -

    - -

    If you would like to find a coach who helps you plan your training - through rowsandall.com, contact me throught the contact form.

    -

    Terms and Conditions, Contact Information

    diff --git a/rowers/tests/test_analysis.py b/rowers/tests/test_analysis.py index c2bd1f89..a6d6533d 100644 --- a/rowers/tests/test_analysis.py +++ b/rowers/tests/test_analysis.py @@ -21,7 +21,7 @@ class ListWorkoutTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) @@ -80,7 +80,7 @@ class PlannedSessionTests(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) @@ -135,7 +135,7 @@ class ForcecurveTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) @@ -275,7 +275,7 @@ class WorkoutCompareTestNew(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) @@ -377,7 +377,7 @@ class WorkoutBoxPlotTestNew(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) @@ -478,7 +478,7 @@ class WorkoutHistoTestNew(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) @@ -579,7 +579,7 @@ class History(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(20, user=self.r) @@ -670,7 +670,7 @@ class GoldMedalScores(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(20, user=self.r) @@ -774,7 +774,7 @@ class WorkoutFlexallTestNew(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) @@ -875,7 +875,7 @@ class WorkoutStatsTestNew(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) @@ -1188,7 +1188,7 @@ class MarkerPerformanceTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) @@ -1366,7 +1366,7 @@ class AlertTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) diff --git a/rowers/tests/test_payments.py b/rowers/tests/test_payments.py index 0ecd7776..ca1bb30a 100644 --- a/rowers/tests/test_payments.py +++ b/rowers/tests/test_payments.py @@ -183,7 +183,7 @@ description: "" birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True, surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', paymentprocessor='braintree', street_address=faker.street_address(), city=faker.city(), @@ -242,7 +242,7 @@ description: "" birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True, surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', paymentprocessor='braintree', street_address=faker.street_address(), city=faker.city(), @@ -306,7 +306,7 @@ description: "" birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True, surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', paymentprocessor='braintree', street_address=faker.street_address(), city=faker.city(), @@ -373,7 +373,7 @@ description: "" birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True, surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', paymentprocessor='braintree', street_address=faker.street_address(), city=faker.city(), @@ -507,7 +507,7 @@ description: "" birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True, surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', paymentprocessor='braintree', street_address=faker.street_address(), city=faker.city(), @@ -548,7 +548,7 @@ description: "" birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True, surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', paymentprocessor='braintree', street_address=faker.street_address(), city=faker.city(), @@ -570,7 +570,7 @@ description: "" birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True, surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', paymentprocessor='braintree', street_address=faker.street_address(), city=faker.city(), @@ -617,7 +617,7 @@ description: "" birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True, surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', paymentprocessor='braintree', street_address=faker.street_address(), city=faker.city(), @@ -663,7 +663,7 @@ description: "" birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True, surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', paymentprocessor='braintree', street_address=faker.street_address(), city=faker.city(), @@ -708,7 +708,7 @@ description: "" birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True, surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', paymentprocessor='braintree', street_address=faker.street_address(), city=faker.city(), @@ -759,7 +759,7 @@ description: "" birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True, surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', paymentprocessor='braintree', street_address=faker.street_address(), city=faker.city(), diff --git a/rowers/tests/test_rowerplans.py b/rowers/tests/test_rowerplans.py index e662bf2c..9e311f6e 100644 --- a/rowers/tests/test_rowerplans.py +++ b/rowers/tests/test_rowerplans.py @@ -41,28 +41,7 @@ class TrialsTest(TestCase): self.r.protrialexpires = (nu+datetime.timedelta(days=10)).date() self.r.save() - self.assertEqual(isplanmember(self.u),False) - self.assertEqual(iscoachmember(self.u),False) - self.assertEqual(ispromember(self.u),True) - - self.r.plantrialexpires = (nu+datetime.timedelta(days=10)).date() - self.r.save() - self.assertEqual(isplanmember(self.u),True) - self.assertEqual(iscoachmember(self.u),False) + self.assertEqual(iscoachmember(self.u),True) self.assertEqual(ispromember(self.u),True) - def test_protrial(self): - self.r.rowerplan = 'pro' - self.r.save() - self.assertEqual(isplanmember(self.u),False) - self.assertEqual(iscoachmember(self.u),False) - self.assertEqual(ispromember(self.u),True) - - self.r.plantrialexpires = (nu+datetime.timedelta(days=10)).date() - self.r.save() - - self.assertEqual(is_plantrial(self.u),True) - self.assertEqual(isplanmember(self.u),True) - self.assertEqual(iscoachmember(self.u),False) - self.assertEqual(ispromember(self.u),True) diff --git a/rowers/tests/test_urls.py b/rowers/tests/test_urls.py index 829f7864..5e30c26c 100644 --- a/rowers/tests/test_urls.py +++ b/rowers/tests/test_urls.py @@ -25,7 +25,7 @@ class URLTests(TestCase): 'sander@ds.ds', 'koeinsloot', ) - r = Rower.objects.create(user=u,rowerplan='coach',gdproptin=True, ftpset=True, + r = Rower.objects.create(user=u,rowerplan='pro',gdproptin=True, ftpset=True, gdproptindate=timezone.now()) self.c = Client() cs = courses.kmltocourse('rowers/tests/testdata/thyro.kml') diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index d32442bdfad1513efff64a87f97d5d251e26d5be..54dd88b62606f587f5c75f6ce4cb4439eb49f51b 100644 GIT binary patch delta 15 WcmbO#KUJPhzMF$%($tM?{rmtVtOTV1 delta 15 WcmbO#KUJPhzMF%iIBFwXKR*B>%LGdR From 2759fd56eb2e3b78cfe75af35071496906333974 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 30 Dec 2024 17:22:42 +0100 Subject: [PATCH 3/7] going through the tests --- rowers/.#urls.py | 1 - rowers/management/commands/processemail.py | 27 +- rowers/middleware.py | 2 +- rowers/models.py | 4 +- rowers/permissions.py | 2 +- rowers/plannedsessions.py | 4 +- rowers/rower_rules.py | 2 +- rowers/tasks.py | 4 +- rowers/teams.py | 2 +- rowers/templates/paidplans.html | 8 +- rowers/tests/test_aavirtualevents.py | 2 +- rowers/tests/test_api.py | 4 +- rowers/tests/test_async_tasks.py | 2 +- rowers/tests/test_aworkouts.py | 4 +- rowers/tests/test_braintree.py | 2 +- rowers/tests/test_courses.py | 4 +- rowers/tests/test_cpchart.py | 2 +- rowers/tests/test_emails.py | 4 +- rowers/tests/test_empower.py | 2 +- rowers/tests/test_flexchart.py | 2 +- rowers/tests/test_imports.py | 4 +- rowers/tests/test_misc.py | 2 +- rowers/tests/test_permissions.py | 418 ++++----------------- rowers/tests/test_races.py | 4 +- rowers/tests/test_simplefunctions.py | 2 +- rowers/tests/test_team.py | 4 +- rowers/tests/test_unit_tests.py | 8 +- rowers/tests/test_units.py | 4 +- rowers/tests/test_uploads.py | 2 +- rowers/tests/test_urls.py | 1 - rowers/tests/test_user.py | 2 +- rowers/tests/testdata/testdata.tcx.gz | Bin 3989 -> 3989 bytes rowers/urls.py | 6 +- rowers/views/analysisviews.py | 44 +-- rowers/views/apiviews.py | 8 - rowers/views/paymentviews.py | 2 +- rowers/views/planviews.py | 15 +- rowers/views/teamviews.py | 10 - rowers/views/workoutviews.py | 15 +- 39 files changed, 135 insertions(+), 500 deletions(-) delete mode 120000 rowers/.#urls.py diff --git a/rowers/.#urls.py b/rowers/.#urls.py deleted file mode 120000 index 5317f650..00000000 --- a/rowers/.#urls.py +++ /dev/null @@ -1 +0,0 @@ -sander@rowsandall-2.17364:1733469196 \ No newline at end of file diff --git a/rowers/management/commands/processemail.py b/rowers/management/commands/processemail.py index 9ea9dfc0..b10dd241 100644 --- a/rowers/management/commands/processemail.py +++ b/rowers/management/commands/processemail.py @@ -86,9 +86,8 @@ class Command(BaseCommand): rowers = Rower.objects.filter(c2_auto_import=True) for r in rowers: # pragma: no cover try: - if user_is_not_basic(r.user) or user_is_coachee(r.user): - c2integration = C2Integration(r.user) - _ = c2integration.get_workouts() + c2integration = C2Integration(r.user) + _ = c2integration.get_workouts() except: # pragma: no cover exc_type, exc_value, exc_traceback = sys.exc_info() lines = traceback.format_exception(exc_type, exc_value, exc_traceback) @@ -97,9 +96,8 @@ class Command(BaseCommand): rowers = Rower.objects.filter(rp3_auto_import=True) for r in rowers: # pragma: no cover try: - if user_is_not_basic(r.user) or user_is_coachee(r.user): - rp3_integration = RP3Integration(r.user) - _ = rp3_integration.get_workouts() + rp3_integration = RP3Integration(r.user) + _ = rp3_integration.get_workouts() except: # pragma: no cover exc_type, exc_value, exc_traceback = sys.exc_info() lines = traceback.format_exception(exc_type, exc_value, exc_traceback) @@ -108,25 +106,14 @@ class Command(BaseCommand): rowers = Rower.objects.filter(nk_auto_import=True) for r in rowers: # pragma: no cover try: - if user_is_not_basic(r.user) or user_is_coachee(r.user): - dologging("nklog.log","NK Auto import set for rower {id}".format(id=r.user.id)) - nk_integration = NKIntegration(r.user) - _ = nk_integration.get_workouts() + dologging("nklog.log","NK Auto import set for rower {id}".format(id=r.user.id)) + nk_integration = NKIntegration(r.user) + _ = nk_integration.get_workouts() except: # pragma: no cover exc_type, exc_value, exc_traceback = sys.exc_info() lines = traceback.format_exception(exc_type, exc_value, exc_traceback) dologging('processemail.log', ''.join('!! ' + line for line in lines)) - #rowers = Rower.objects.filter(intervals_auto_import=True) - #for r in rowers: - # try: - # if user_is_not_basic(r.user) or user_is_coachee(r.user): - # intervals_integration = IntervalsIntegration(r.user) - # _ = intervals_integration.get_workouts() - # except: - # exc_type, exc_value, exc_traceback = sys.exc_info() - # lines = traceback.format_exception(exc_type, exc_value, exc_traceback) - # dologging('processemail.log', ''.join('!! ' + line for line in lines)) self.stdout.write(self.style.SUCCESS( 'Successfully processed email attachments')) diff --git a/rowers/middleware.py b/rowers/middleware.py index 7c1a0164..2f038606 100644 --- a/rowers/middleware.py +++ b/rowers/middleware.py @@ -105,7 +105,7 @@ class RowerPlanMiddleWare(object): self.get_response = get_response def __call__(self, request): - if request.user.is_authenticated and request.user.rower.rowerplan not in ['basic', 'freecoach']: + if request.user.is_authenticated and request.user.rower.rowerplan != 'basic': if request.user.rower.paymenttype == 'single': if request.user.rower.planexpires < timezone.now().date(): # pragma: no cover messg = 'Your paid plan has expired. We have reset you to a free basic plan.' diff --git a/rowers/models.py b/rowers/models.py index 80c83d27..32f4a5a5 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -1326,8 +1326,6 @@ class Rower(models.Model): for group in self.coachinggroups.all(): try: coach = Rower.objects.get(mycoachgroup=group) - if coach.rowerplan == 'freecoach': # pragma: no cover - self.coachinggroups.remove(group) except Rower.DoesNotExist: # pragma: no cover pass except ValueError: @@ -1350,7 +1348,7 @@ class Rower(models.Model): return coaches def can_coach(self): - if self.rowerplan not in ['coach', 'freecoach']: + if self.rowerplan != 'pro': return False rs = Rower.objects.filter(coachinggroups__in=[self.mycoachgroup]) diff --git a/rowers/permissions.py b/rowers/permissions.py index 634932b3..ac4d6095 100644 --- a/rowers/permissions.py +++ b/rowers/permissions.py @@ -35,7 +35,7 @@ class IsRowerOrNot(permissions.BasePermission): class IsPlanOrHigher(permissions.BasePermission): def has_object_permission(self, request, view, obj): # pragma: no cover r = Rower.objects.get(user=request.user) - return r not in ['basic', 'pro', 'freecoach'] + return r.rowerplan == 'pro' class IsCompetitorOrNot(permissions.BasePermission): diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 9e1a0ed9..77230db9 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -831,12 +831,12 @@ def add_team_session(t, ps): def add_rower_session(r, ps): teams = Team.objects.filter(manager=ps.manager) members = Rower.objects.filter(team__in=teams).distinct() - if r in members and r.rowerplan != 'freecoach': + if r in members: ps.rower.add(r) ps.save() return 1 - elif ps.manager.rower == r and r.rowerplan != 'freecoach': + elif ps.manager.rower == r: ps.rower.add(r) ps.save() diff --git a/rowers/rower_rules.py b/rowers/rower_rules.py index df24bfa1..c55b77df 100644 --- a/rowers/rower_rules.py +++ b/rowers/rower_rules.py @@ -8,7 +8,7 @@ from django.utils import timezone """ USER permissions -- There are 5 types of user: basic, pro, plan, coach, freecoach +- There are 2 types of user: basic, pro - These methods exist on user - user.rower - user.is_anonymous diff --git a/rowers/tasks.py b/rowers/tasks.py index 866d25bc..1db9fc03 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -418,10 +418,10 @@ def create_sessions_from_json_async(plansteps, rower, startdate, manager, planby teams = Team.objects.filter(manager=ps.manager) members = Rower.objects.filter(team__in=teams).distinct() - if rower in members and rower.rowerplan != 'freecoach': + if rower in members: ps.rower.add(rower) ps.save() - elif ps.manager.rower == rower and rower.rowerplan != 'freecoach': + elif ps.manager.rower == rower: ps.rower.add(rower) ps.save() diff --git a/rowers/teams.py b/rowers/teams.py index 94f3307b..bf99b147 100644 --- a/rowers/teams.py +++ b/rowers/teams.py @@ -245,7 +245,7 @@ def create_coaching_request(coach, user): # pragma: no cover while code in codes: # pragma: no cover code = uuid.uuid4().hex[:10].upper() - if 'coach' in coach.rowerplan: + if coach.rowerplan == 'pro': rekwest = CoachRequest(coach=coach, user=user, code=code) rekwest.save() diff --git a/rowers/templates/paidplans.html b/rowers/templates/paidplans.html index 36cc5f20..ac5b848b 100644 --- a/rowers/templates/paidplans.html +++ b/rowers/templates/paidplans.html @@ -59,13 +59,13 @@ ✔ - All other rowing metrics (Work per Stroke, Average and Peak Force, Drive Length, Catch and Finish Angle, Slip and Wash, Peak Force Angle, and more) -   + Advanced Analysis (Critical Power, Stats, Box Chart, Trend Flex) + ✔ ✔ - Advanced Analysis (Critical Power, Stats, Box Chart, Trend Flex) -   + All other rowing metrics (Work per Stroke, Average and Peak Force, Drive Length, Catch and Finish Angle, Slip and Wash, Peak Force Angle, and more) + partly ✔ diff --git a/rowers/tests/test_aavirtualevents.py b/rowers/tests/test_aavirtualevents.py index 92e978fd..7c4b3836 100644 --- a/rowers/tests/test_aavirtualevents.py +++ b/rowers/tests/test_aavirtualevents.py @@ -22,7 +22,7 @@ class VirtualEventViewTest(MyTestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True, surveydone=True,gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() diff --git a/rowers/tests/test_api.py b/rowers/tests/test_api.py index 14f0429a..6a460a81 100644 --- a/rowers/tests/test_api.py +++ b/rowers/tests/test_api.py @@ -56,7 +56,7 @@ class StravaPrivacy(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach',subscription_id=1) + rowerplan='pro',subscription_id=1) self.r.stravatoken = '12' self.r.stravarefreshtoken = '123' @@ -77,7 +77,7 @@ class StravaPrivacy(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach',clubsize=3) + rowerplan='pro',clubsize=3) self.r3 = Rower.objects.create(user=self.u3, birthdate=faker.profile()['birthdate'], diff --git a/rowers/tests/test_async_tasks.py b/rowers/tests/test_async_tasks.py index f7af8923..7833de30 100644 --- a/rowers/tests/test_async_tasks.py +++ b/rowers/tests/test_async_tasks.py @@ -32,7 +32,7 @@ class AsyncTaskTests(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) diff --git a/rowers/tests/test_aworkouts.py b/rowers/tests/test_aworkouts.py index c18a60bd..a323aa19 100644 --- a/rowers/tests/test_aworkouts.py +++ b/rowers/tests/test_aworkouts.py @@ -39,7 +39,7 @@ class ListWorkoutTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) @@ -144,7 +144,7 @@ class WorkoutViewTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.c2 = Client() # for anonymous diff --git a/rowers/tests/test_braintree.py b/rowers/tests/test_braintree.py index 3d32d19c..88654e4b 100644 --- a/rowers/tests/test_braintree.py +++ b/rowers/tests/test_braintree.py @@ -67,7 +67,7 @@ class BraintreeUnits(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach',subscription_id=1) + rowerplan='pro',subscription_id=1) self.pp = PaidPlan.objects.create(price=0,paymentprocessor='braintree') diff --git a/rowers/tests/test_courses.py b/rowers/tests/test_courses.py index 346cca15..753b6fe1 100644 --- a/rowers/tests/test_courses.py +++ b/rowers/tests/test_courses.py @@ -18,7 +18,7 @@ class CourseUnitTest(TestCase): 'koeinsloot') self.r = Rower.objects.create(user=self.u,gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', ) self.nu = datetime.datetime.now() @@ -130,7 +130,7 @@ class CoursesTest(TestCase): 'koeinsloot') self.r = Rower.objects.create(user=self.u,gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', ) self.nu = datetime.datetime.now() diff --git a/rowers/tests/test_cpchart.py b/rowers/tests/test_cpchart.py index 3c6fd404..3c2b771a 100644 --- a/rowers/tests/test_cpchart.py +++ b/rowers/tests/test_cpchart.py @@ -23,7 +23,7 @@ class CPChartTest(TestCase): gdproptin=True, ftpset=True,surveydone=True,sex='male', weightcategory='hwt', gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') r = self.u.rower age = calculate_age(r.birthdate) diff --git a/rowers/tests/test_emails.py b/rowers/tests/test_emails.py index ae26ef5e..bbf2ea80 100644 --- a/rowers/tests/test_emails.py +++ b/rowers/tests/test_emails.py @@ -26,7 +26,7 @@ class EmailUpload(TestCase): birthdate = faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') nu = datetime.datetime.now() @@ -208,7 +208,7 @@ class EmailTests(TestCase): birthdate = faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') nu = datetime.datetime.now() a2 = 'media/mailbox_attachments/colin3.csv' diff --git a/rowers/tests/test_empower.py b/rowers/tests/test_empower.py index ce52ff4e..1ac099b9 100644 --- a/rowers/tests/test_empower.py +++ b/rowers/tests/test_empower.py @@ -14,7 +14,7 @@ class EmpowerTest(TestCase): 'sander@ds.ds', 'koeinsloot', ) - r = Rower.objects.create(user=u,rowerplan='coach',gdproptin=True, ftpset=True,surveydone=True, + r = Rower.objects.create(user=u,rowerplan='pro',gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now()) self.c = Client() diff --git a/rowers/tests/test_flexchart.py b/rowers/tests/test_flexchart.py index 455eb1d8..50deb370 100644 --- a/rowers/tests/test_flexchart.py +++ b/rowers/tests/test_flexchart.py @@ -14,7 +14,7 @@ class WorkoutViewTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', showfavoritechartnotes=True) self.c = Client() diff --git a/rowers/tests/test_imports.py b/rowers/tests/test_imports.py index f7b3a933..df48f11e 100644 --- a/rowers/tests/test_imports.py +++ b/rowers/tests/test_imports.py @@ -47,7 +47,7 @@ class RojaboObjects(DjangoTestCase): self.r.rojabo_refreshtoken = 'ab' self.r.rojabo_tokenexpirydate = arrow.get(datetime.datetime.now()+datetime.timedelta(days=1)).datetime self.r.defaulttimezone = 'Europe/Prague' - self.r.rowerplan = 'plan' + self.r.rowerplan = 'pro' self.r.save() self.u2 = User.objects.create_user('john2', @@ -134,7 +134,7 @@ class GarminObjects(DjangoTestCase): ) self.r.garmintoken = 'dfdzf' self.r.garminrefreshtoken = 'fsls' - self.r.rowerplan = 'plan' + self.r.rowerplan = 'pro' self.r.save() self.c.login(username='john',password='koeinsloot') diff --git a/rowers/tests/test_misc.py b/rowers/tests/test_misc.py index ff841c3e..391a3c86 100644 --- a/rowers/tests/test_misc.py +++ b/rowers/tests/test_misc.py @@ -18,7 +18,7 @@ class MiscTests(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach',subscription_id=1) + rowerplan='pro',subscription_id=1) self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) diff --git a/rowers/tests/test_permissions.py b/rowers/tests/test_permissions.py index 4ee00a3b..9e587cdd 100644 --- a/rowers/tests/test_permissions.py +++ b/rowers/tests/test_permissions.py @@ -26,7 +26,7 @@ class PlanningPermissionsCoach(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', clubsize=10, ) self.ucoachpassword = faker.word() @@ -97,184 +97,8 @@ class PlanningPermissionsCoach(TestCase): def test_coachee_can_sync(self): self.assertTrue(user_is_coachee(self.ucoachee)) + -@override_settings(TESTING=True) -class PermissionsFreeCoach(TestCase): - def setUp(self): - self.c = Client() - ## Users - Pro, Basic, Free Coach & Self Coach - - self.ufreecoach = UserFactory(username='coachuser') - self.rfreecoach = Rower.objects.create(user=self.ufreecoach, - birthdate=faker.profile()['birthdate'], - gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='freecoach',clubsize=100) - - self.coachinggroup = CoachingGroup.objects.create() - self.rfreecoach.mycoachgroup = self.coachinggroup - self.rfreecoach.save() - self.factory = RequestFactory() - self.password = faker.word() - self.ufreecoach.set_password(self.password) - self.ufreecoach.save() - - self.uplan = UserFactory(username='planuser') - self.rplan = Rower.objects.create(user=self.uplan, - birthdate=faker.profile()['birthdate'], - gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='plan') - - self.uplan_workouts = WorkoutFactory.create_batch(5, user=self.rplan) - self.factory = RequestFactory() - self.password = faker.word() - self.uplan.set_password(self.password) - self.uplan.save() - - self.upro = UserFactory(username='prouser') - self.rpro = Rower.objects.create(user=self.upro, - birthdate=faker.profile()['birthdate'], - gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='pro') - - self.upro_workouts = WorkoutFactory.create_batch(5, user=self.rpro) - self.factory = RequestFactory() - self.password = faker.word() - self.upro.set_password(self.password) - self.upro.save() - - self.uplan2 = UserFactory(username='planuser2') - self.rplan2 = Rower.objects.create(user=self.uplan2, - birthdate=faker.profile()['birthdate'], - gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='plan') - - self.uplan2_workouts = WorkoutFactory.create_batch(5, user=self.rplan2) - self.factory = RequestFactory() - self.password = faker.word() - self.uplan2.set_password(self.password) - self.uplan2.save() - - self.upro2 = UserFactory(username='prouser2') - self.rpro2 = Rower.objects.create(user=self.upro2, - birthdate=faker.profile()['birthdate'], - gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='pro') - - self.upro2_workouts = WorkoutFactory.create_batch(5, user=self.rpro2) - self.factory = RequestFactory() - self.password = faker.word() - self.upro2.set_password(self.password) - self.upro2.save() - - self.ubasic = UserFactory(username='basicuser') - self.rbasic = Rower.objects.create(user=self.ubasic, - birthdate=faker.profile()['birthdate'], - gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='basic') - - self.ubasic_workouts = WorkoutFactory.create_batch(5, user=self.rbasic) - self.factory = RequestFactory() - self.ubasicpassword = faker.word() - self.ubasic.set_password(self.ubasicpassword) - self.ubasic.save() - - - - ## TeamFreeCoach - - self.teamfreecoach = Team.objects.create( - name=faker.word()+'3', - notes=faker.text(), - manager=self.ufreecoach) - - ## Coach can have any number of groups - def test_coach_groupmanager(self): - team1 = Team.objects.create( - name = 'FirstTeam', - notes = faker.text(), - manager = self.ufreecoach, - ) - - self.assertEqual(team1.manager,self.ufreecoach) - - team2 = Team.objects.create( - name = 'SecondTeam', - notes = faker.text(), - manager = self.ufreecoach, - ) - - self.assertEqual(team2.manager,self.ufreecoach) - - - team3 = Team.objects.create( - name = 'ThirdTeam', - notes = faker.text(), - manager = self.ufreecoach, - ) - - self.assertEqual(team3.manager,self.ufreecoach) - - - - ## Free coach can create more than one group - def test_plan_groupmanager(self): - team1 = Team.objects.create( - name = 'FirstTeam', - notes = faker.text(), - manager = self.ufreecoach, - ) - - self.assertEqual(team1.manager,self.ufreecoach) - - team2 = Team.objects.create( - name = 'SecondTeam', - notes = faker.text(), - manager = self.ufreecoach, - ) - - self.assertEqual(team2.manager,self.ufreecoach) - - - - ## Free Coach can create planned sessions and team planned sessions - ## Self Coach and higher can create planned sessions and team planned sessions - def test_plan_create_session(self): - ps = PlannedSession.objects.create( - manager=self.ufreecoach, - name=faker.word(), - comment=faker.text() - ) - self.assertEqual(ps.manager,self.ufreecoach) - - def test_coach_create_session(self): - ps = PlannedSession.objects.create( - manager=self.ufreecoach, - name=faker.word(), - comment=faker.text() - ) - self.assertEqual(ps.manager,self.ufreecoach) - - - ## Basic cannot join groups led by Free Coach - def test_add_basic_pro_or_plan(self): - with transaction.atomic(): - with self.assertRaises(ValidationError): - self.rbasic.team.add(self.teamfreecoach) - - - ## Free Coach user cannot have workouts - def test_add_workout_freecoach(self): - result = get_random_file(filename='rowers/tests/testdata/erg1.csv') - with transaction.atomic(): - with self.assertRaises(ValidationError): - self.werg1 = WorkoutFactory(user=self.rfreecoach, - csvfilename=result['filename'], - starttime=result['starttime'], - startdatetime=result['startdatetime'], - duration=result['duration'], - distance=result['totaldist'], - workouttype = 'rower', - ) @override_settings(TESTING=True) class PermissionsBasicsTests(TestCase): @@ -286,7 +110,7 @@ class PermissionsBasicsTests(TestCase): self.rcoach = Rower.objects.create(user=self.ucoach, birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='coach',clubsize=10) + rowerplan='pro',clubsize=10) self.ucoach_workouts = WorkoutFactory.create_batch(5, user=self.rcoach) self.coachinggroup = CoachingGroup.objects.create() @@ -301,7 +125,7 @@ class PermissionsBasicsTests(TestCase): self.rplan = Rower.objects.create(user=self.uplan, birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='plan') + rowerplan='pro') self.uplan_workouts = WorkoutFactory.create_batch(5, user=self.rplan) self.factory = RequestFactory() @@ -325,7 +149,7 @@ class PermissionsBasicsTests(TestCase): self.rplan2 = Rower.objects.create(user=self.uplan2, birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='plan') + rowerplan='pro') self.uplan2_workouts = WorkoutFactory.create_batch(5, user=self.rplan2) self.factory = RequestFactory() @@ -341,7 +165,7 @@ class PermissionsBasicsTests(TestCase): self.upro2_workouts = WorkoutFactory.create_batch(5, user=self.rpro2) self.factory = RequestFactory() - self.password = faker.word() + self.upro2password = faker.word() self.upro2.set_password(self.password) self.upro2.save() @@ -366,15 +190,6 @@ class PermissionsBasicsTests(TestCase): notes=faker.text(), manager=self.upro2) - self.teamplan = Team.objects.create( - name=faker.word()+'2', - notes=faker.text(), - manager=self.uplan2) - - self.teamcoach = Team.objects.create( - name=faker.word()+'3', - notes=faker.text(), - manager=self.ucoach) # Requirements @@ -411,12 +226,11 @@ class PermissionsBasicsTests(TestCase): ## Basic athletes can be member of Coach led group def test_add_coach(self): - self.rbasic.team.add(self.teamcoach) - self.assertIn(self.teamcoach,self.rbasic.team.all()) + self.rbasic.team.add(self.teampro) + self.assertIn(self.teampro,self.rbasic.team.all()) - ## Self coach can create one group - ## Self coach cannot create more than one group + ## Pro member can create more than one group def test_plan_groupmanager(self): team1 = Team.objects.create( name = 'FirstTeam', @@ -426,32 +240,24 @@ class PermissionsBasicsTests(TestCase): self.assertEqual(team1.manager,self.uplan) - with self.assertRaises(ValidationError): - team2 = Team.objects.create( - name = 'SecondTeam', - notes = faker.text(), - manager = self.uplan, - ) + team2 = Team.objects.create( + name = 'SecondTeam', + notes = faker.text(), + manager = self.uplan, + ) + + self.assertEqual(team2.manager,self.uplan) ## Pro users (and higher) can join group led by other Pro (or higher) user def test_add_proplan_pro_or_plan(self): - self.rpro.team.add(self.teamplan) - self.assertIn(self.teamplan,self.rpro.team.all()) - self.rpro.team.add(self.teampro) self.assertIn(self.teampro,self.rpro.team.all()) - self.rplan.team.add(self.teamplan) - self.assertIn(self.teamplan,self.rplan.team.all()) - self.rplan.team.add(self.teampro) self.assertIn(self.teampro,self.rplan.team.all()) - self.rcoach.team.add(self.teamplan) - self.assertIn(self.teamplan,self.rcoach.team.all()) - self.rcoach.team.add(self.teampro) self.assertIn(self.teampro,self.rcoach.team.all()) @@ -476,8 +282,7 @@ class PermissionsBasicsTests(TestCase): ) self.assertEqual(ps.manager,self.ucoach) - ## Pro can have one group - ## Pro cannot create more than one group + ## Pro can have more than one group def test_pro_groupmanager(self): team1 = Team.objects.create( name = 'FirstTeam', @@ -487,22 +292,23 @@ class PermissionsBasicsTests(TestCase): self.assertEqual(team1.manager,self.upro) - with self.assertRaises(ValidationError): - team2 = Team.objects.create( - name = 'SecondTeam', - notes = faker.text(), - manager = self.upro, - ) + team2 = Team.objects.create( + name = 'SecondTeam', + notes = faker.text(), + manager = self.upro, + ) + self.assertEqual(team2.manager,self.upro) - ## Pro or Basic cannot create planned sessions or team planned sessions + ## Basic cannot create planned sessions or team planned sessions def test_pro_create_plannedsession(self): - with self.assertRaises(ValidationError): - ps = PlannedSession.objects.create( - manager=self.upro, - name = faker.word(), - comment = faker.text() - ) + ps = PlannedSession.objects.create( + manager=self.upro, + name = faker.word(), + comment = faker.text() + ) + + self.assertEqual(ps.manager,self.upro) def test_basic_create_plannedsession(self): with self.assertRaises(ValidationError): @@ -512,15 +318,6 @@ class PermissionsBasicsTests(TestCase): comment = faker.text() ) - ## Basic cannot join groups led by Pro or Self Coach - def test_add_basic_pro_or_plan(self): - with transaction.atomic(): - with self.assertRaises(ValidationError): - self.rbasic.team.add(self.teamplan) - - with transaction.atomic(): - with self.assertRaises(ValidationError): - self.rbasic.team.add(self.teampro) ## Basic cannot manage a group @@ -546,7 +343,7 @@ class PermissionsViewTests(TestCase): self.rcoach = Rower.objects.create(user=self.ucoach, birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='coach',clubsize=10) + rowerplan='pro',clubsize=10) self.ucoach_workouts = WorkoutFactory.create_batch(5, user=self.rcoach) self.coachinggroup = CoachingGroup.objects.create() @@ -561,7 +358,7 @@ class PermissionsViewTests(TestCase): self.rplan = Rower.objects.create(user=self.uplan, birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='plan') + rowerplan='pro') self.uplan_workouts = WorkoutFactory.create_batch(5, user=self.rplan) self.factory = RequestFactory() @@ -585,7 +382,7 @@ class PermissionsViewTests(TestCase): self.rplan2 = Rower.objects.create(user=self.uplan2, birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='plan') + rowerplan='pro') self.uplan2_workouts = WorkoutFactory.create_batch(5, user=self.rplan2) self.factory = RequestFactory() @@ -628,17 +425,12 @@ class PermissionsViewTests(TestCase): notes=faker.text(), manager=self.upro2) - self.teamplan = Team.objects.create( - name=faker.word()+'2', - notes=faker.text(), - manager=self.uplan2) self.teamcoach = Team.objects.create( name=faker.word()+'3', notes=faker.text(), manager=self.ucoach) - ## only ubasic can view ubasic_workouts[0] which is private def test_view_workout(self): login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) @@ -756,7 +548,7 @@ class PermissionsViewTests(TestCase): ## Coach can edit on behalf of athlete if permitted # 1, Preferences def test_coach_edit_athlete_prefs(self): - self.rbasic.team.add(self.teamcoach) + self.rbasic.team.add(self.teampro) self.rbasic.coachinggroups.add(self.coachinggroup) login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) @@ -768,7 +560,7 @@ class PermissionsViewTests(TestCase): self.assertEqual(response.status_code,200) def test_coach_edit_athlete_prefs_not(self): - self.rbasic.team.add(self.teamcoach) + self.rbasic.team.add(self.teampro) login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) self.assertTrue(login) @@ -780,7 +572,7 @@ class PermissionsViewTests(TestCase): # 2, Favorite Charts def test_coach_edit_athlete_settings(self): - self.rbasic.team.add(self.teamcoach) + self.rbasic.team.add(self.teampro) self.rbasic.coachinggroups.add(self.coachinggroup) login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) @@ -792,7 +584,7 @@ class PermissionsViewTests(TestCase): self.assertEqual(response.status_code,200) def test_coach_edit_athlete_settings_not(self): - self.rbasic.team.add(self.teamcoach) + self.rbasic.team.add(self.teampro) login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) self.assertTrue(login) @@ -804,7 +596,7 @@ class PermissionsViewTests(TestCase): # 3, Export Settings def test_coach_edit_athlete_exportsettings(self): - self.rbasic.team.add(self.teamcoach) + self.rbasic.team.add(self.teampro) self.rbasic.coachinggroups.add(self.coachinggroup) login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) @@ -816,7 +608,7 @@ class PermissionsViewTests(TestCase): self.assertEqual(response.status_code,200) def test_coach_edit_athlete_exportsettings_not(self): - self.rbasic.team.add(self.teamcoach) + self.rbasic.team.add(self.teampro) login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) self.assertTrue(login) @@ -828,7 +620,7 @@ class PermissionsViewTests(TestCase): # 4, Account settings def test_coach_edit_athlete_account(self): - self.rbasic.team.add(self.teamcoach) + self.rbasic.team.add(self.teampro) self.rbasic.coachinggroups.add(self.coachinggroup) login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) @@ -840,7 +632,7 @@ class PermissionsViewTests(TestCase): self.assertEqual(response.status_code,200) def test_coach_edit_athlete_account_not(self): - self.rbasic.team.add(self.teamcoach) + self.rbasic.team.add(self.teampro) login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) self.assertTrue(login) @@ -853,7 +645,7 @@ class PermissionsViewTests(TestCase): ## Coach can run analytics for athlete @patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multistats) def test_coach_edit_athlete_analysis(self,mocked_df): - self.rbasic.team.add(self.teamcoach) + self.rbasic.team.add(self.teampro) self.rbasic.coachinggroups.add(self.coachinggroup) login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) @@ -874,7 +666,7 @@ class PermissionsViewTests(TestCase): @patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multistats) def test_coach_edit_athlete_analysis_not(self,mocked_df): - self.rbasic.team.add(self.teamcoach) + self.rbasic.team.add(self.teampro) login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) self.assertTrue(login) @@ -892,7 +684,7 @@ class PermissionsViewTests(TestCase): @patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multistats) def test_coach_edit_athlete_analysis_not2(self,mocked_df): - self.rbasic.team.add(self.teamcoach) + self.rbasic.team.add(self.teampro) login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) self.assertTrue(login) @@ -961,7 +753,7 @@ class PermissionsViewTests(TestCase): def test_coach_edit_athlete_uploadnot(self,mocked_sqlalchemy,mocked_read_data): self.rbasic.team.add(self.teamcoach) - login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) + login = self.c.login(username=self.upro2.username, password=self.upro2password) self.assertTrue(login) url = reverse('team_workout_upload_view') @@ -1001,9 +793,9 @@ class PermissionsViewTests(TestCase): ## Coach can edit athlete's workout def test_coach_edit_athlete_workout(self): - self.rbasic.team.add(self.teamcoach) + self.rbasic.team.add(self.teampro) - login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) + login = self.c.login(username=self.upro2.username, password=self.upro2password) self.assertTrue(login) url = reverse('workout_edit_view', @@ -1015,9 +807,11 @@ class PermissionsViewTests(TestCase): ## Coach can see list of workouts of athlete def test_coach_athlete_workout_list(self): - self.rbasic.team.add(self.teamcoach) + self.rbasic.team.add(self.teampro) + # check if rbasic is in teampro + self.assertIn(self.teampro,self.rbasic.team.all()) - login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) + login = self.c.login(username=self.upro2.username, password=self.upro2password) self.assertTrue(login) url = reverse('workouts_view', @@ -1137,7 +931,7 @@ class PermissionsViewTests(TestCase): ## Self Coach cannot edit on behalf of athlete def test_plan_edit_athlete_settings(self): - self.rpro.team.add(self.teamplan) + self.rpro.team.add(self.teampro) login = self.c.login(username=self.uplan2.username, password=self.uplan2password) self.assertTrue(login) @@ -1145,12 +939,12 @@ class PermissionsViewTests(TestCase): url = reverse('rower_prefs_view',kwargs={'userid':self.ubasic.id}) response = self.c.get(url) - self.assertEqual(response.status_code,403) + self.assertEqual(response.status_code,200) ## Self Coach cannot run analytics on behalf of athlete @patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multistats) def test_plan_edit_athlete_analysis(self,mocked_df): - self.rpro.team.add(self.teamplan) + self.rpro.team.add(self.teampro) login = self.c.login(username=self.uplan2.username, password=self.uplan2password) self.assertTrue(login) @@ -1164,13 +958,13 @@ class PermissionsViewTests(TestCase): response = self.c.get(url) - self.assertEqual(response.status_code,403) + self.assertEqual(response.status_code,200) ## Self Coach cannot upload on behalf of athlete @patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.read_data',side_effect=mocked_read_data) def test_plan_edit_athlete_upload(self,mocked_sqlalchemy,mocked_read_data): - self.rpro.team.add(self.teamplan) + self.rpro.team.add(self.teampro) login = self.c.login(username=self.uplan2.username, password=self.uplan2password) self.assertTrue(login) @@ -1178,11 +972,10 @@ class PermissionsViewTests(TestCase): url = reverse('team_workout_upload_view') response = self.c.get(url) - self.assertEqual(response.status_code,403) + self.assertEqual(response.status_code,200) - ## Pro can have one group - ## Pro cannot create more than one group + ## Pro can have more than one group def test_pro_groups_create(self): login = self.c.login(username=self.upro.username, password=self.upropassword) self.assertTrue(login) @@ -1228,7 +1021,7 @@ class PermissionsViewTests(TestCase): self.assertTrue(form.is_valid()) - expected_url = reverse('paidplans_view') + expected_url = reverse('rower_teams_view') response = self.c.post(url,form_data,follow=True) self.assertRedirects(response, @@ -1289,75 +1082,11 @@ class PermissionsViewTests(TestCase): self.assertEqual(response.status_code,403) - ## Self Coach cannot upload on behalf of athlete - @patch('rowers.dataprep.create_engine') - @patch('rowers.dataprep.read_data',side_effect=mocked_read_data) - def test_plan_edit_athlete_upload(self,mocked_sqlalchemy,mocked_read_data): - self.rpro.team.add(self.teamplan) - - login = self.c.login(username=self.uplan2.username, password=self.uplan2password) - self.assertTrue(login) - - url = reverse('team_workout_upload_view') - - response = self.c.get(url,follow=True) - self.assertEqual(response.status_code,200) - - expected_url = reverse('paidplans_view') - self.assertRedirects(response, - expected_url = expected_url, - status_code=302,target_status_code=200) - - - ## Pro users can see team members' workout, but not edit - def test_pro_edit_athlete_workout(self): - self.rpro.team.add(self.teampro) - self.rpro2.team.add(self.teampro) - - login = self.c.login(username=self.upro2.username, password=self.upro2password) - self.assertTrue(login) - - url = reverse('workout_edit_view', - kwargs={'id':encoder.encode_hex(self.upro_workouts[0].id)} - ) - - response = self.c.get(url) - self.assertEqual(response.status_code,403) - - url = reverse('workout_view', - kwargs={'id':encoder.encode_hex(self.upro_workouts[0].id)} - ) - - response = self.c.get(url) - self.assertEqual(response.status_code,200) - - - ## Self Coach users can see team members' workout, but not edit - def test_plan_edit_athlete_workout(self): - self.rpro.team.add(self.teamplan) - - login = self.c.login(username=self.uplan2.username, password=self.uplan2password) - self.assertTrue(login) - - url = reverse('workout_edit_view', - kwargs={'id':encoder.encode_hex(self.ubasic_workouts[0].id)} - ) - - response = self.c.get(url) - self.assertEqual(response.status_code,403) - - url = reverse('workout_view', - kwargs={'id':encoder.encode_hex(self.ubasic_workouts[0].id)} - ) - - response = self.c.get(url) - self.assertEqual(response.status_code,200) - ## Basic users can see team members' workout, but not edit def test_basic_edit_athlete_workout(self): - self.rbasic.team.add(self.teamcoach) - self.rplan2.team.add(self.teamcoach) + self.rbasic.team.add(self.teampro) + self.rplan2.team.add(self.teampro) login = self.c.login(username=self.ubasic.username, password=self.ubasicpassword) self.assertTrue(login) @@ -1421,7 +1150,7 @@ class PermissionsViewTests(TestCase): expected_url = expected_url, status_code=302,target_status_code=200) - ## Basic cannot join groups from Pro or Self Coach users (redirects to paid plans) + ## Basic can join groups from Pro def test_team_member_request_basic_pro(self): login = self.c.login(username=self.ubasic.username,password=self.ubasicpassword) self.assertTrue(login) @@ -1435,12 +1164,12 @@ class PermissionsViewTests(TestCase): response = self.c.get(url,follow=True) self.assertEqual(response.status_code,200) - expected_url = reverse('paidplans_view') + expected_url = reverse('team_view',kwargs={'team_id':self.teampro.id}) + self.assertRedirects(response, expected_url = expected_url, status_code=302,target_status_code=200) - @override_settings(TESTING=True) class PermissionsCoachingTests(TestCase): def setUp(self): @@ -1451,7 +1180,7 @@ class PermissionsCoachingTests(TestCase): self.rcoach = Rower.objects.create(user=self.ucoach, birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='coach',clubsize=10) + rowerplan='pro',clubsize=10) self.ucoach_workouts = WorkoutFactory.create_batch(5, user=self.rcoach) self.coachinggroup = CoachingGroup.objects.create() @@ -1466,7 +1195,7 @@ class PermissionsCoachingTests(TestCase): self.rplan = Rower.objects.create(user=self.uplan, birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='plan') + rowerplan='pro') self.uplan_workouts = WorkoutFactory.create_batch(5, user=self.rplan) self.factory = RequestFactory() @@ -1490,7 +1219,7 @@ class PermissionsCoachingTests(TestCase): self.rplan2 = Rower.objects.create(user=self.uplan2, birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True,gdproptindate=timezone.now(), - rowerplan='plan') + rowerplan='pro') self.uplan2_workouts = WorkoutFactory.create_batch(5, user=self.rplan2) self.factory = RequestFactory() @@ -1524,22 +1253,13 @@ class PermissionsCoachingTests(TestCase): - ## TeamPro, TeamCoach, TeamSelfCoach + ## TeamPro, Teampro, TeamSelfCoach self.teampro = Team.objects.create( name=faker.word()+'1', notes=faker.text(), manager=self.upro2) - self.teamplan = Team.objects.create( - name=faker.word()+'2', - notes=faker.text(), - manager=self.uplan2) - - self.teamcoach = Team.objects.create( - name=faker.word()+'3', - notes=faker.text(), - manager=self.ucoach) def test_athlete_request_athlete_revoke(self): login = self.c.login(username=self.ubasic.username,password=self.ubasicpassword) diff --git a/rowers/tests/test_races.py b/rowers/tests/test_races.py index 4b7ca70a..c3cf8f52 100644 --- a/rowers/tests/test_races.py +++ b/rowers/tests/test_races.py @@ -60,7 +60,7 @@ class ChallengesTest(TestCase): birthdate=datetime.datetime.now()-datetime.timedelta(days=25*365), gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.u2 = UserFactory() self.r2 = Rower.objects.create(user=self.u2, @@ -1089,7 +1089,7 @@ class IndoorChallengesTest(TestCase): birthdate=datetime.datetime.now()-datetime.timedelta(days=25*365), gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) diff --git a/rowers/tests/test_simplefunctions.py b/rowers/tests/test_simplefunctions.py index 59753174..b45c7ad9 100644 --- a/rowers/tests/test_simplefunctions.py +++ b/rowers/tests/test_simplefunctions.py @@ -42,7 +42,7 @@ class SimpleViewTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True, surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) diff --git a/rowers/tests/test_team.py b/rowers/tests/test_team.py index 9deb3639..28bdce90 100644 --- a/rowers/tests/test_team.py +++ b/rowers/tests/test_team.py @@ -43,7 +43,7 @@ class TeamTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', user=u, clubsize=3 ) @@ -402,7 +402,7 @@ class TeamTestLowLevel(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', user=u, clubsize=3 ) diff --git a/rowers/tests/test_unit_tests.py b/rowers/tests/test_unit_tests.py index 2546d575..bdd23a6f 100644 --- a/rowers/tests/test_unit_tests.py +++ b/rowers/tests/test_unit_tests.py @@ -35,7 +35,7 @@ class OtherUnitTests(TestCase): gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), defaulttimezone='US/Pacific', - rowerplan='coach') + rowerplan='pro') # Test get_dates_timeperiod @@ -172,7 +172,7 @@ class PlannedSessionTests(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) @@ -430,7 +430,7 @@ class DataPrepTests(TestCase): gdproptin=True, ftpset=True,surveydone=True, sex='male', gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.r.birthdate = timezone.now()-datetime.timedelta(days=25*365) self.r.defaulttimezone = 'Europe/Amsterdam' @@ -649,7 +649,7 @@ class InteractivePlotTests(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) diff --git a/rowers/tests/test_units.py b/rowers/tests/test_units.py index b540eeb3..3c627fe3 100644 --- a/rowers/tests/test_units.py +++ b/rowers/tests/test_units.py @@ -27,7 +27,7 @@ class ForceUnits(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.user_workouts = WorkoutFactory.create_batch(12, user=self.r) @@ -171,7 +171,7 @@ class TestForceUnit(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(14, user=self.r) diff --git a/rowers/tests/test_uploads.py b/rowers/tests/test_uploads.py index f93418e8..62e6e309 100644 --- a/rowers/tests/test_uploads.py +++ b/rowers/tests/test_uploads.py @@ -21,7 +21,7 @@ class ViewTest(TestCase): 'koeinsloot') self.r = Rower.objects.create(user=self.u,gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach', + rowerplan='pro', ) add_defaultfavorites(self.r) diff --git a/rowers/tests/test_urls.py b/rowers/tests/test_urls.py index 5e30c26c..f08b1e9d 100644 --- a/rowers/tests/test_urls.py +++ b/rowers/tests/test_urls.py @@ -119,7 +119,6 @@ class URLTests(TestCase): '/rowers/me/workflowdefault/', '/rowers/partners/', '/rowers/physics/', - '/rowers/planrequired/', '/rowers/register/', '/rowers/register/thankyou/', '/rowers/sessions/', diff --git a/rowers/tests/test_user.py b/rowers/tests/test_user.py index 77ed9f00..935bc7bb 100644 --- a/rowers/tests/test_user.py +++ b/rowers/tests/test_user.py @@ -82,7 +82,7 @@ class UserPreferencesTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True,surveydone=True, gdproptindate=timezone.now(), - rowerplan='coach') + rowerplan='pro') self.c = Client() self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 54dd88b62606f587f5c75f6ce4cb4439eb49f51b..7207adecaddb2e4d4bdf45b1e5695dcf1b3d345f 100644 GIT binary patch delta 15 WcmbO#KUJPhzMF$%!mf>M{rmtWSp>)c delta 15 WcmbO#KUJPhzMF$%($tM?{rmtVtOTV1 diff --git a/rowers/urls.py b/rowers/urls.py index ccb49dc7..73370658 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -845,8 +845,6 @@ urlpatterns = [ name='downgrade_checkouts'), re_path(r'^purchasecheckouts/$', views.purchase_checkouts_view, name='purchase_checkouts_view'), - re_path(r'^planrequired/', views.planrequired_view, - name='planrequired_view'), re_path(r'^starttrial/$', views.start_trial_view, name='start_trial_view'), re_path(r'^startplantrial/$', views.start_plantrial_view, name='start_plantrial_view'), @@ -856,8 +854,8 @@ urlpatterns = [ template_name='legal.html'), name='legal'), re_path(r'^register/$', views.rower_register_view, name='rower_register_view'), - re_path(r'^coachregister/$', views.freecoach_register_view, - name='freecoach_register_view'), + re_path(r'^coachregister/$', views.coach_register_view, + name='coach_register_view'), path('activate///', views.useractivate, name='useractivate'), re_path(r'^register/thankyou/$', TemplateView.as_view( template_name='registerthankyou.html'), name='registerthankyou'), diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 80a893b5..9a1375ff 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -27,11 +27,6 @@ defaultoptions = { } -@user_passes_test(ispromember, login_url="/rowers/paidplans", - message="This functionality requires a Pro plan or higher." - " If you are already a Pro user," - " please log in to access this functionality", - redirect_field_name=None) @permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True) @@ -897,11 +892,6 @@ def statsdata(workouts, options): def comparisondata(workouts, options): - #try: - # workouts = workouts.exclude(workoutsource='strava') - #except AttributeError: # pragma: no cover - # workouts = [w for w in workouts if w.workoutsource != 'strava'] - includereststrokes = options['includereststrokes'] xparam = options['xaxis'] yparam1 = options['yaxis1'] @@ -1013,10 +1003,6 @@ def boxplotdata(workouts, options): return(script, div) -@user_passes_test(ispromember, login_url="/rowers/paidplans", - message="This functionality requires a Pro plan or higher." - " If you are already a Pro user, please log in to access this functionality", - redirect_field_name=None) @permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True) def analysis_view_data(request, userid=0): is_ajax = request_is_ajax(request) @@ -1087,17 +1073,10 @@ def analysis_view_data(request, userid=0): }) -def planrequired_view(request): - messages.info( - request, "This functionality requires Coach or Self-Coach membership") - - return HttpResponseRedirect(reverse('paidplans_view')) -@user_passes_test(ispromember, login_url="/rowers/paidplans", - message="This functionality requires a Pro plan or higher." - " If you are already a Pro user, please log in to access this functionality", - redirect_field_name=None) +@login_required() +@permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True) def create_marker_workouts_view(request, userid=0, startdate=timezone.now()-timezone.timedelta(days=42), enddate=timezone.now()): @@ -1119,10 +1098,8 @@ def create_marker_workouts_view(request, userid=0, return HttpResponseRedirect(url) -@user_passes_test(ispromember, login_url="/rowers/paidplans", - message="This functionality requires a Pro plan or higher." - " If you are already a Pro user, please log in to access this functionality", - redirect_field_name=None) +@login_required() +@permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True) def goldmedalscores_view(request, userid=0, startdate=timezone.now()-timezone.timedelta(days=365), enddate=timezone.now()): @@ -1184,10 +1161,6 @@ def goldmedalscores_view(request, userid=0, }) -@user_passes_test(ispromember, login_url="/rowers/paidplans", - message="This functionality requires a Pro plan or higher." - " If you are already a Pro user, please log in to access this functionality", - redirect_field_name=None) @permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True) def trainingzones_view(request, userid=0): r = getrequestrower(request, userid=userid) @@ -1255,6 +1228,7 @@ def trainingzones_view(request, userid=0): @login_required() +@permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True) def trainingzones_view_data(request, userid=0): r = getrequestrower(request, userid=userid) @@ -1296,10 +1270,6 @@ def trainingzones_view_data(request, userid=0): }) -@user_passes_test(ispromember, login_url="/rowers/paidplans", - message="This functionality requires a Pro plan or higher." - " If you are already a Pro user, please log in to access this functionality", - redirect_field_name=None) @permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True) def performancemanager_view(request, userid=0, mode='rower', startdate=timezone.now()-timezone.timedelta(days=365), @@ -2060,10 +2030,6 @@ class AlertDelete(DeleteView): return obj -@user_passes_test(ispromember, login_url="/rowers/paidplans", - message="This functionality requires a Pro plan or higher." - " If you are already a Pro user, please log in to access this functionality", - redirect_field_name=None) @permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True) def history_view(request, userid=0): r = getrequestrower(request, userid=userid) diff --git a/rowers/views/apiviews.py b/rowers/views/apiviews.py index de8cc5be..2d578685 100644 --- a/rowers/views/apiviews.py +++ b/rowers/views/apiviews.py @@ -101,7 +101,6 @@ def javascript_log(request): return JSONResponse(status=200, data = {'status': 'true', 'message': message}) @login_required() -@permission_required('rower.is_not_freecoach', fn=get_user_by_userid, raise_exception=True) def strokedataform(request, id=0): id = encoder.decode_hex(id) @@ -265,7 +264,6 @@ def api_get_dataframe(startdatetime, df): @login_required() -@permission_required('rower.is_not_freecoach', fn=get_user_by_userid, raise_exception=True) def strokedataform_v2(request, id=0): id = encoder.decode_hex(id) @@ -496,7 +494,6 @@ def strokedata_rowingdata(request): @csrf_exempt @api_view(["POST"]) -@permission_required('rower.is_not_freecoach', fn=get_user_by_userid, raise_exception=True) @permission_classes([IsAuthenticated]) def strokedata_rowingdata_apikey(request): """ @@ -547,7 +544,6 @@ def strokedata_rowingdata_apikey(request): @csrf_exempt @api_view(["POST"]) -@permission_required('rower.is_not_freecoach', fn=get_user_by_userid, raise_exception=True) @permission_classes([IsAuthenticated]) @parser_classes([FITParser]) def strokedata_fit(request): @@ -647,7 +643,6 @@ def strokedata_fit(request): @csrf_exempt #@login_required() @api_view(["POST"]) -@permission_required('rower.is_not_freecoach', fn=get_user_by_userid, raise_exception=True) @permission_classes([IsAuthenticated]) @parser_classes([XMLParser]) def strokedata_tcx(request): @@ -768,7 +763,6 @@ def strokedata_tcx(request): @csrf_exempt @api_view(["POST"]) #@login_required() -@permission_required('rower.is_not_freecoach', fn=get_user_by_userid, raise_exception=True) @permission_classes([IsAuthenticated]) def strokedatajson_v3(request): """ @@ -913,7 +907,6 @@ def strokedatajson_v3(request): # Return the GET stroke data according to the API definition @csrf_exempt #@login_required() -@permission_required('rower.is_not_freecoach', fn=get_user_by_userid, raise_exception=True) @api_view(["GET", "POST"]) @permission_classes([IsAuthenticated]) def strokedatajson_v2(request, id): @@ -1073,7 +1066,6 @@ def strokedatajson_v2(request, id): @csrf_exempt #@login_required() -@permission_required('rower.is_not_freecoach', fn=get_user_by_userid, raise_exception=True) @api_view(['GET', 'POST']) @permission_classes([IsAuthenticated]) def strokedatajson(request, id=0): diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py index 8fbad999..84cc04fe 100644 --- a/rowers/views/paymentviews.py +++ b/rowers/views/paymentviews.py @@ -980,7 +980,7 @@ def rower_register_view(request): # User registration -def freecoach_register_view(request): # pragma: no cover +def coach_register_view(request): # pragma: no cover nextpage = request.GET.get('next', '/rowers/me/teams/') if nextpage == '': # pragma: no cover diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index 0300d385..0ef93cf6 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -318,7 +318,7 @@ def plannedsession_multiclone_view( add_rower_session(rower, ps) for team in teams: add_team_session(team, ps) - for rower in team.rower.all().exclude(rowerplan='freecoach'): + for rower in team.rower.all(): add_rower_session(rower, ps) startdatestring = shiftstartdate.strftime('%Y-%m-%d') @@ -974,7 +974,7 @@ def plannedsession_teamcreate_view(request, for team in teams: add_team_session(team, ps) rs = Rower.objects.filter( - team__in=[team]).exclude(rowerplan='freecoach') + team__in=[team]) for r in rs: add_rower_session(r, ps) @@ -1297,17 +1297,14 @@ def plannedsessions_coach_view(request, rteams = therower.team.filter(viewing='allmembers') sps = get_sessions(therower, startdate=startdate, enddate=enddate) - if therower.rowerplan != 'freecoach': - rowers = [therower] - else: # pragma: no cover - rowers = [] + rowers = [therower] for ps in sps: if is_coach(request.user) or is_coachtrial(request.user): - rowers += ps.rower.all().exclude(rowerplan='freecoach') + rowers += ps.rower.all() else: # pragma: no cover rowers += ps.rower.filter( - team__in=rteams).exclude(rowerplan='freecoach') + team__in=rteams) rowers = list(set(rowers)) @@ -1861,7 +1858,7 @@ def plannedsession_clone_view(request, id=0, userid=0): add_rower_session(r, ps) for team in teams: add_team_session(team, ps) - for rower in team.rower.all().exclude(rowerplan='freecoach'): + for rower in team.rower.all(): add_rower_session(rower, ps) url = reverse(plannedsession_edit_view, diff --git a/rowers/views/teamviews.py b/rowers/views/teamviews.py index 019e259d..82c693c8 100644 --- a/rowers/views/teamviews.py +++ b/rowers/views/teamviews.py @@ -240,16 +240,6 @@ def rower_teams_view(request): # pragma: no cover user__in=invitedathletes).exclude( user=request.user ).exclude(coachinggroups__in=[request.user.rower.mycoachgroup]) - elif request.user.rower.rowerplan == 'freecoach': # pragma: no cover - potentialathletes = Rower.objects.filter( - team__in=myteams).exclude( - user__in=invitedathletes).exclude( - user=request.user - ).exclude( - coachinggroups__in=[request.user.rower.mycoachgroup] - ).exclude( - rowerplan__in=['basic', 'freecoach'] - ) else: potentialathletes = [] diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index f482d0d6..03434755 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -2101,7 +2101,7 @@ def workouts_bulk_actions(request): teams = Team.objects.filter(manager=request.user) assignchoices.fields["rowers"].queryset = Rower.objects.filter( team__in=teams - ).distinct().order_by("user__last_name", "user__first_name").exclude(rowerplan='freecoach') + ).distinct().order_by("user__last_name", "user__first_name") assignchoices.fields["rowers"].initial = [] form = WorkoutMultipleCompareForm() form.fields["workouts"].queryset = Workout.objects.filter(id__in=[w.id for w in workouts]) @@ -5191,9 +5191,6 @@ def workout_upload_view(request, r = getrower(request.user) if r.imports_are_private: uploadoptions['makeprivate'] = True - if r.rowerplan == 'freecoach': # pragma: no cover - url = reverse('team_workout_upload_view') - return HttpResponseRedirect(url) breadcrumbs = [ { @@ -5622,7 +5619,7 @@ def workout_upload_view(request, # This is the main view for processing uploaded files -@user_passes_test(iscoachmember, login_url="/rowers/paidplans", redirect_field_name=None, +@user_passes_test(ispromember, login_url="/rowers/paidplans", redirect_field_name=None, message="This functionality requires a Coach plan or higher") def team_workout_upload_view(request, userid=0, message="", successmessage="", @@ -5659,11 +5656,7 @@ def team_workout_upload_view(request, userid=0, message="", rowerform.fields.pop('email') rowers = Rower.objects.filter( coachinggroups__in=[r.mycoachgroup] - ).exclude( - rowerplan='freecoach' ).distinct() - if r.rowerplan == 'freecoach': # pragma: no cover - rowers = rowers.exclude(rowerplan='basic') rowerform.fields['user'].queryset = User.objects.filter( rower__in=rowers).distinct() @@ -5803,11 +5796,7 @@ def team_workout_upload_view(request, userid=0, message="", rowers = Rower.objects.filter( coachinggroups__in=[r.mycoachgroup] - ).exclude( - rowerplan='freecoach' ).distinct() - if r.rowerplan == 'freecoach': # pragma: no cover - rowers = rowers.exclude(rowerplan='basic') rowerform.fields['user'].queryset = User.objects.filter( rower__in=rowers).distinct() From 58f66fbd11112d95ced885e3bb4a2e1f3e3f37f5 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 31 Dec 2024 12:47:44 +0100 Subject: [PATCH 4/7] going through the tests --- rowers/garmin_stuff.py | 2 +- rowers/integrations/intervals.py | 25 ++++--- rowers/tests/test_imports.py | 2 +- rowers/tests/test_permissions.py | 94 +++++++++++--------------- rowers/tests/testdata/testdata.tcx.gz | Bin 3989 -> 3989 bytes rowers/tests/viewnames.csv | 14 ++-- rowers/views/importviews.py | 6 +- rowers/views/workoutviews.py | 1 - templates/newbase.html | 2 +- 9 files changed, 62 insertions(+), 84 deletions(-) diff --git a/rowers/garmin_stuff.py b/rowers/garmin_stuff.py index 0def169e..a23b47c7 100644 --- a/rowers/garmin_stuff.py +++ b/rowers/garmin_stuff.py @@ -191,7 +191,7 @@ def get_garmin_workout_list(user): # pragma: no cover def garmin_can_export_session(user): - if user.rower.rowerplan not in ['coach', 'plan']: + if user.rower.rowerplan != 'pro': return False # pragma: no cover result = get_garmin_permissions(user) if 'WORKOUT_IMPORT' in result: diff --git a/rowers/integrations/intervals.py b/rowers/integrations/intervals.py index 92a3beb1..264b3701 100644 --- a/rowers/integrations/intervals.py +++ b/rowers/integrations/intervals.py @@ -3,7 +3,7 @@ from rowers.models import Rower, User, Workout, TombStone, PlannedSession from rowingdata import rowingdata from rowingdata import FITParser as FP from rowingdata.otherparsers import FitSummaryData -from rowers.rower_rules import user_is_not_basic, user_is_coachee +#from rowers.rower_rules import user_is_not_basic, user_is_coachee from rowers.dataroutines import totaltime_sec_to_string from rowers import mytypes @@ -720,21 +720,20 @@ class IntervalsIntegration(SyncIntegration): def import_activities(self, event, *args, **kwargs): if not self.rower.intervals_auto_import: return 0 - if user_is_not_basic(self.rower.user) or user_is_coachee(self.rower.user): - try: - record = event["activity"] - except KeyError: - records = [] - try: - id = record['id'] - result = self.get_workout(id, do_async=False) - except KeyError: - pass + try: + record = event["activity"] + except KeyError: + records = [] - return 1 + try: + id = record['id'] + result = self.get_workout(id, do_async=False) + except KeyError: + pass + + return 1 - return 0 def delete_activities(self, event, *args, **kwargs): try: diff --git a/rowers/tests/test_imports.py b/rowers/tests/test_imports.py index df48f11e..a50042d0 100644 --- a/rowers/tests/test_imports.py +++ b/rowers/tests/test_imports.py @@ -65,7 +65,7 @@ class RojaboObjects(DjangoTestCase): self.r2.rojabo_refreshtoken = 'ab' self.r2.rojabo_tokenexpirydate = arrow.get(datetime.datetime.now()+datetime.timedelta(days=1)).datetime self.r2.defaulttimezone = 'Europe/Prague' - self.r2.rowerplan = 'pro' + self.r2.rowerplan = 'basic' self.r2.save() self.nu = datetime.datetime.now() diff --git a/rowers/tests/test_permissions.py b/rowers/tests/test_permissions.py index 9e587cdd..d802cced 100644 --- a/rowers/tests/test_permissions.py +++ b/rowers/tests/test_permissions.py @@ -866,7 +866,7 @@ class PermissionsViewTests(TestCase): status_code=302,target_status_code=200) - # Create 2nd new team - should redirect to paid plans + # Create 2nd new team - should not redirect to paid plans form_data = { 'name': faker.word(), 'notes': faker.text(), @@ -883,12 +883,12 @@ class PermissionsViewTests(TestCase): expected_url = reverse('paidplans_view') response = self.c.post(url,form_data,follow=True) - self.assertRedirects(response, - expected_url=expected_url, - status_code=302,target_status_code=200) + + # check that it does not redirect and status code is 200 + self.assertEqual(response.status_code,200) - ## Self Coach can create planned sessions and team planned sessions + ## Pro can create planned sessions and team planned sessions def test_plan_create_session(self): login = self.c.login(username=self.uplan2.username, password=self.uplan2password) self.assertTrue(login) @@ -929,24 +929,24 @@ class PermissionsViewTests(TestCase): self.assertEqual(response.status_code,200) - ## Self Coach cannot edit on behalf of athlete + ## Team Manager cannot edit on behalf of athlete def test_plan_edit_athlete_settings(self): self.rpro.team.add(self.teampro) - login = self.c.login(username=self.uplan2.username, password=self.uplan2password) + login = self.c.login(username=self.upro2.username, password=self.upro2password) self.assertTrue(login) url = reverse('rower_prefs_view',kwargs={'userid':self.ubasic.id}) response = self.c.get(url) - self.assertEqual(response.status_code,200) + self.assertEqual(response.status_code,403) - ## Self Coach cannot run analytics on behalf of athlete + ## Team Manager cannot run analytics on behalf of athlete @patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multistats) def test_plan_edit_athlete_analysis(self,mocked_df): self.rpro.team.add(self.teampro) - login = self.c.login(username=self.uplan2.username, password=self.uplan2password) + login = self.c.login(username=self.upro2.username, password=self.upro2password) self.assertTrue(login) @@ -958,22 +958,45 @@ class PermissionsViewTests(TestCase): response = self.c.get(url) - self.assertEqual(response.status_code,200) + self.assertEqual(response.status_code,403) - ## Self Coach cannot upload on behalf of athlete + ## Team Manager cannot upload on behalf of athlete @patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.read_data',side_effect=mocked_read_data) def test_plan_edit_athlete_upload(self,mocked_sqlalchemy,mocked_read_data): self.rpro.team.add(self.teampro) - login = self.c.login(username=self.uplan2.username, password=self.uplan2password) + login = self.c.login(username=self.upro2.username, password=self.upro2password) self.assertTrue(login) url = reverse('team_workout_upload_view') + # can get to the page response = self.c.get(url) self.assertEqual(response.status_code,200) + # cannot post the form + filename = 'rowers/tests/testdata/testdata.csv' + f = open(filename,'rb') + file_data = {'file': f} + form_data = { + 'title':'test', + 'workouttype':'rower', + 'boattype':'1x', + 'notes':'aap noot mies', + 'make_plot':False, + 'upload_to_c2':False, + 'plottype':'timeplot', + 'file': f, + 'user': self.upro.id + } + + response = self.c.post(url, form_data, follow=True) + f.close() + + # check that form errors are present in response content + self.assertContains(response,'Select a valid choice. That choice is not one of the available choices.') + ## Pro can have more than one group def test_pro_groups_create(self): @@ -1007,7 +1030,7 @@ class PermissionsViewTests(TestCase): status_code=302,target_status_code=200) - # Create 2nd new team - should redirect to paid plans + # Create 2nd new team - should not redirect to paid plans form_data = { 'name': faker.word(), 'notes': faker.text(), @@ -1029,7 +1052,7 @@ class PermissionsViewTests(TestCase): status_code=302,target_status_code=200) - ## Pro cannot create planned sessions or team planned sessions + ## Pro can create planned sessions or team planned sessions def test_pro_create_session(self): login = self.c.login(username=self.upro2.username, password=self.upro2password) self.assertTrue(login) @@ -1040,48 +1063,9 @@ class PermissionsViewTests(TestCase): enddate = (nu+datetime.timedelta(days=3)).date() preferreddate = startdate - response = self.c.get(url,follow=True) + response = self.c.get(url,follow=False) self.assertEqual(response.status_code,200) - expected_url = reverse('paidplans_view') - - self.assertRedirects(response, - expected_url=expected_url, - status_code=302,target_status_code=200) - - - ## Pro cannot edit on behalf of athlete - def test_pro_edit_athlete_settings(self): - self.rpro.team.add(self.teampro) - - login = self.c.login(username=self.upro2.username, password=self.upro2password) - self.assertTrue(login) - - url = reverse('rower_prefs_view',kwargs={'userid':self.ubasic.id}) - - response = self.c.get(url) - self.assertEqual(response.status_code,403) - - ## Pro cannot run analytics on behalf of athlete - @patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multistats) - def test_pro_edit_athlete_analysis(self,mocked_df): - with transaction.atomic(): - self.rpro.team.add(self.teampro) - - login = self.c.login(username=self.upro2.username, password=self.upro2password) - self.assertTrue(login) - - - url = reverse('analysis_new', - kwargs={ - 'userid':self.ubasic.id, - } - ) - - response = self.c.get(url) - - self.assertEqual(response.status_code,403) - ## Basic users can see team members' workout, but not edit def test_basic_edit_athlete_workout(self): diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 7207adecaddb2e4d4bdf45b1e5695dcf1b3d345f..a8ce04795d099a1d2c07c95bdda532863236e1a3 100644 GIT binary patch delta 16 XcmbO#KUJPxzMF$Xd}Z-Q_C9_9Cu0P% delta 16 XcmbO#KUJPxzMF$%!mgr??0x(ID-#7f diff --git a/rowers/tests/viewnames.csv b/rowers/tests/viewnames.csv index 914c5ef8..8218f6f2 100644 --- a/rowers/tests/viewnames.csv +++ b/rowers/tests/viewnames.csv @@ -23,14 +23,14 @@ 24,26,addmanual_view,upload a manual workout,TRUE,302,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,TRUE,TRUE, 26,28,workouts_join_view,join workouts,TRUE,302,pro,302,302,pro,403,403,coach,302,403,FALSE,TRUE,FALSE,TRUE,TRUE, 27,29,workouts_join_select,select workouts to join,TRUE,404,pro,200,302,pro,403,403,coach,200,403,FALSE,TRUE,FALSE,TRUE,TRUE, -29,31,analysis_new,analysis front page,TRUE,302,pro,200,302,FALSE,200,302,coach,200,302,FALSE,TRUE,FALSE,TRUE,TRUE, +29,31,analysis_new,analysis front page,TRUE,404,pro,200,302,FALSE,200,302,coach,200,302,FALSE,TRUE,FALSE,TRUE,TRUE, 31,33,session_jobs_view,view jobs,TRUE,302,basic,200,302,FALSE,200,302,coach,200,302,FALSE,FALSE,FALSE,TRUE,TRUE, 32,34,session_jobs_status,view jobs,TRUE,302,basic,200,302,FALSE,200,302,coach,200,302,FALSE,FALSE,FALSE,TRUE,TRUE, 33,35,kill_async_job,kill job,TRUE,302,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 34,36,post_progress,post progress,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 35,37,graphs_view,view charts,TRUE,302,basic,200,302,basic,200,302,coach,200,302,FALSE,TRUE,FALSE,TRUE,TRUE, 41,43,cum_flex,flex all chart,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, -42,44,analysis_view_data,redirects to analysis direct,TRUE,302,pro,200,302,pro,200,302,coach,200,302,FALSE,FALSE,FALSE,TRUE,TRUE, +42,44,analysis_view_data,redirects to analysis direct,TRUE,404,pro,200,302,pro,200,302,coach,200,302,FALSE,FALSE,FALSE,TRUE,TRUE, 43,47,cum_flex_data,flex all chart data (json),TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 47,53,graph_show_view,show a chart,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 48,54,GraphDelete,delete a chart,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, @@ -110,7 +110,7 @@ 148,188,coach_accept_coachrequest_view,Accept Coach request,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 149,189,rower_accept_coachoffer_view,Accept Coach offer,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 150,190,team_delete_view,Delete Team,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, -151,191,team_create_view,Create Team,TRUE,302,pro,302,302,FALSE,200,200,FALSE,200,302,FALSE,FALSE,FALSE,TRUE,TRUE, +151,191,team_create_view,Create Team,TRUE,302,pro,200,302,FALSE,200,200,FALSE,200,302,FALSE,FALSE,FALSE,TRUE,TRUE, 152,192,manager_member_drop_view,Drop member,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 153,193,invitation_reject_view,Reject invitation,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 154,194,invitation_revoke_view,redirects when no invitations,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, @@ -151,11 +151,9 @@ 193,249,checkouts_view,checkout,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 194,250,upgrade_checkouts_view,upgrade checkout,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 195,251,downgrade_checkouts_view,downgrade checkout,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, -196,252,planrequired_view,a plan is required,TRUE,302,basic,302,302,basic,302,302,coach,302,302,FALSE,FALSE,FALSE,TRUE,TRUE, 197,253,start_trial_view,payments,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 198,254,start_plantrial_view,paid plans,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 199,256,rower_register_view,register rower,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,TRUE,TRUE, -200,257,freecoach_register_view,register coach,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,TRUE,TRUE, 201,259,workout_workflow_view,workout workflow vieq,TRUE,302,basic,200,200,basic,200,200,coach,200,200,FALSE,FALSE,TRUE,TRUE,TRUE, 202,260,workout_flexchart3_view,flex chart,TRUE,302,basic,200,403,basic,200,200,coach,200,200,FALSE,FALSE,TRUE,TRUE,TRUE, 203,264,rower_process_testcallback,test callback,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, @@ -178,8 +176,8 @@ 220,292,plannedsession_teamcreate_view,create planned session for team,TRUE,302,pro,200,302,FALSE,200,302,FALSE,200,302,FALSE,FALSE,FALSE,TRUE,TRUE, 221,296,plannedsession_teamedit_view,edit planned sesssion,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 222,298,plannedsession_create_view,create planned session ,TRUE,302,pro,200,302,FALSE,200,302,coach,200,403,FALSE,TRUE,FALSE,TRUE,TRUE, -223,300,plannedsession_multiclone_view,clone multiple planned sessions,TRUE,302,pro,200,302,pro,403,403,coach,200,403,FALSE,TRUE,FALSE,TRUE,TRUE, -224,302,plannedsession_multicreate_view,create multiple planned sessions,TRUE,302,pro,200,302,pro,403,403,coach,200,403,FALSE,TRUE,FALSE,TRUE,TRUE, +223,300,plannedsession_multiclone_view,clone multiple planned sessions,TRUE,302,pro,200,302,pro,200,403,coach,200,403,FALSE,TRUE,FALSE,TRUE,TRUE, +224,302,plannedsession_multicreate_view,create multiple planned sessions,TRUE,302,pro,200,302,pro,200,403,coach,200,403,FALSE,TRUE,FALSE,TRUE,TRUE, 225,305,plannedsession_edit_view,edit planned sesssion,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 226,306,plannedsession_totemplate_view,planned session to template,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 227,307,plannedsession_compare_view,compare workouts from planned session,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, @@ -264,5 +262,5 @@ 308,603,failed_queue_view,Other Apps views,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 309,604,failed_queue_empty,Other Apps views,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 310,605,failed_job_view,Other Apps views,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,TRUE,FALSE,FALSE, -311,49,performancemanager_view,Performance Manager,TRUE,302,pro,200,302,pro,200,302,coach,200,302,FALSE,FALSE,FALSE,TRUE,TRUE, +311,49,performancemanager_view,Performance Manager,TRUE,404,pro,200,302,pro,200,302,coach,200,302,FALSE,FALSE,FALSE,TRUE,TRUE, 312,606,workout_flexchart_stacked_view,flex chart,TRUE,302,basic,200,403,basic,200,200,coach,200,200,FALSE,FALSE,TRUE,TRUE,TRUE, diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 6a824771..3a7e2f37 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -399,8 +399,6 @@ def rower_process_nkcallback(request): # pragma: no cover @login_required() -@permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True) -@permission_required('rower.is_not_freecoach', fn=get_user_by_userid, raise_exception=True) def workout_import_view(request, source='c2'): startdate, enddate = get_dates_timeperiod( request, defaulttimeperiod='last30') @@ -756,8 +754,8 @@ def plannedsession_intervalsimport_view(request, message="", userid=0): @login_required() -@user_passes_test(isplanmember, login_url="/rowers/paidplans/", - message="This functionality requires a Self-coach plan or higher", +@user_passes_test(ispromember, login_url="/rowers/paidplans/", + message="This functionality requires a Pro plan or higher", redirect_field_name=None) @permission_required('plannedsession.add_session', fn=get_user_by_userid, raise_exception=True) def workout_rojaboimport_view(request, message="", userid=0): # pragma: no cover diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 03434755..73ef051b 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -5776,7 +5776,6 @@ def team_workout_upload_view(request, userid=0, message="", id, jobid = uploads.make_plot(r, w, f1, f2, plottype, t) else: - response = render(request, 'team_document_form.html', {'form': form, diff --git a/templates/newbase.html b/templates/newbase.html index 206d68c0..1b4e3143 100644 --- a/templates/newbase.html +++ b/templates/newbase.html @@ -156,7 +156,7 @@

  • {% if user.rower.rowerplan == 'pro' %} - + {% elif 'coach' in user.rower.rowerplan %} {% elif user.rower.rowerplan == 'plan' %} From 108fafc1270cba7d186778dcc8862672f3c65b45 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 31 Dec 2024 14:03:40 +0100 Subject: [PATCH 5/7] tested, zero errors --- rowers/tests/test_payments.py | 4 ++-- rowers/tests/testdata/testdata.tcx.gz | Bin 3989 -> 3989 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rowers/tests/test_payments.py b/rowers/tests/test_payments.py index ca1bb30a..9423217c 100644 --- a/rowers/tests/test_payments.py +++ b/rowers/tests/test_payments.py @@ -413,7 +413,7 @@ description: "" birthdate=faker.profile()['birthdate'], gdproptin=True, ftpset=True, surveydone=True, gdproptindate=timezone.now(), - rowerplan='plan', + rowerplan='pro', paymentprocessor='braintree', street_address=faker.street_address(), city=faker.city(), @@ -465,7 +465,7 @@ description: "" url = expected_url - response = self.c.get(url) + response = self.c.get(url, follow=True) self.assertEqual(response.status_code, 200) url = reverse('purchase_checkouts_view') diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index a8ce04795d099a1d2c07c95bdda532863236e1a3..b4dd7063e03ab83547e44c686698706bb5820d37 100644 GIT binary patch delta 15 WcmbO#KUJPhzMF$1;mJm}etrNY3k1Rd delta 15 WcmbO#KUJPhzMF$XeC0;AetrNVE(AUR From 700f982730ca71313420a988754b5192dee67479 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 31 Dec 2024 15:00:40 +0100 Subject: [PATCH 6/7] tested --- rowers/models.py | 2 +- rowers/tests/testdata/testdata.tcx.gz | Bin 3989 -> 3989 bytes rowers/views/teamviews.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index 32f4a5a5..c81d24ec 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -1216,7 +1216,7 @@ class Rower(models.Model): polartokenexpirydate = models.DateTimeField(blank=True, null=True) polarrefreshtoken = models.CharField(default='', max_length=1000, blank=True, null=True) - polaruserid = models.IntegerField(default=0) + polaruserid = models.IntegerField(default=0, blank=True, null=True) polar_auto_import = models.BooleanField(default=False) garmintoken = models.CharField( diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index b4dd7063e03ab83547e44c686698706bb5820d37..6bfd7d18f2c81039d7b52c594b5754049a45d648 100644 GIT binary patch delta 15 WcmbO#KUJPhzMF$%&)1D?{rmtYhy^bI delta 15 WcmbO#KUJPhzMF$1;mJm}etrNY3k1Rd diff --git a/rowers/views/teamviews.py b/rowers/views/teamviews.py index 82c693c8..0c895026 100644 --- a/rowers/views/teamviews.py +++ b/rowers/views/teamviews.py @@ -571,7 +571,7 @@ def invitation_reject_view(request, id=0): def rower_invitations_view(request, code=None, message='', successmessage=''): if code: teams.remove_expired_invites() - + res, text = teams.process_invite_code(request.user, code) if res: # pragma: no cover messages.info(request, text) From 4d0b6adef4f53f8aa995985aa628bd0331cbc99a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 31 Dec 2024 16:37:27 +0100 Subject: [PATCH 7/7] fix --- rowers/templates/paidplans.html | 4 ++++ rowers/templates/rower_form.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/rowers/templates/paidplans.html b/rowers/templates/paidplans.html index ac5b848b..80a3ce13 100644 --- a/rowers/templates/paidplans.html +++ b/rowers/templates/paidplans.html @@ -138,6 +138,7 @@ {% endif %} + {% if rower and rower.rowerplan == 'basic' %} Available trial (no strings attached) @@ -159,10 +160,13 @@ {% endif %} + {% endif %} + {% if rower and rower.rowerplan == 'basic' %} Available upgrades + {% endif %}   diff --git a/rowers/templates/rower_form.html b/rowers/templates/rower_form.html index 1dd250ba..569c3559 100644 --- a/rowers/templates/rower_form.html +++ b/rowers/templates/rower_form.html @@ -62,7 +62,7 @@ {% endif %} {% csrf_token %} - {% if rower.rowerplan != 'coach' and rower.user == user %} + {% if rower.rowerplan != 'pro' and rower.user == user %}

    Upgrade