Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add tests for inactive gym members

Roland Geidercaff2d1da613
diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.py
index 3fc5e3a1c..f137997a6 100644
--- a/wger/core/tests/test_temporary_users.py
+++ b/wger/core/tests/test_temporary_users.py
@@ -51,7 +51,7 @@ class DemoUserTestCase(WorkoutManagerTestCase):
'''
self.client.get(reverse('core:dashboard'))
self.assertEqual(self.count_temp_users(), 2)
- user = User.objects.get(pk=14)
+ user = User.objects.get(pk=25)
self.assertEqual(user.userprofile.is_temporary, True)
self.assertEqual(Workout.objects.filter(user=user).count(), 0)
diff --git a/wger/gym/management/commands/inactive-members.py b/wger/gym/management/commands/inactive-members.py
index 0d96f3c97..84cad6727 100644
--- a/wger/gym/management/commands/inactive-members.py
+++ b/wger/gym/management/commands/inactive-members.py
@@ -63,11 +63,16 @@ class Command(BaseCommand):
last_activity = get_user_last_activity(user)
if not last_activity:
user_list_no_activity.append({'user': user, 'last_activity': last_activity})
- elif last_activity - today < datetime.timedelta(weeks=weeks):
+ elif last_activity - today > datetime.timedelta(weeks=weeks):
user_list.append({'user': user, 'last_activity': last_activity})
if user_list or user_list_no_activity:
for trainer in trainer_list:
+
+ # Profile might not have email
+ if not trainer.email:
+ continue
+
translation.activate(trainer.userprofile.notification_language.short_name)
subject = _('Reminder of inactive members')
context = {
diff --git a/wger/gym/tests/test_inactive_members.py b/wger/gym/tests/test_inactive_members.py
new file mode 100644
index 000000000..cf4831ff9
--- /dev/null
+++ b/wger/gym/tests/test_inactive_members.py
@@ -0,0 +1,47 @@
+# This file is part of wger Workout Manager.
+#
+# wger Workout Manager is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# wger Workout Manager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+
+import datetime
+
+from django.core.management import call_command
+from django.core import mail
+
+from wger.manager.tests.testcase import WorkoutManagerTestCase
+from wger.manager.models import WorkoutLog
+from wger.manager.models import WorkoutSession
+
+
+class EmailInactiveUserTestCase(WorkoutManagerTestCase):
+ '''
+ Test email reminders for inactive users
+ '''
+
+ def test_reminder(self, fail=False):
+ '''
+ Test email reminders for inactive users
+ '''
+
+ call_command('inactive-members')
+ self.assertEqual(len(mail.outbox), 6)
+
+ recipment_list = [message.to[0] for message in mail.outbox]
+ trainer_list = ['[email protected]',
+ recipment_list.sort()
+ trainer_list.sort()
+
+ self.assertEqual(recipment_list.sort(), trainer_list.sort())
diff --git a/wger/manager/fixtures/test-user-data.README b/wger/manager/fixtures/test-user-data.README
new file mode 100644
index 000000000..d77c18680
--- /dev/null
+++ b/wger/manager/fixtures/test-user-data.README
@@ -0,0 +1,44 @@
+User for general use
+--------------------
+#1 admin super user
+#2 test regular user most data belongs to him
+#3 demo demo user
+
+
+Gym members
+-----------
+
+Gym 1 - Test 123
+================
+#1 admin
+#2 test
+#4 trainer1
+#5 trainer2
+#6 trainer3
+#9 manager1#10 manager2
+#12 general_manager1
+#14 member1
+#15 member2
+#16 member3
+#17 member4
+#18 member5
+
+
+Gym 2 - A cool gym
+==================
+#3 demo
+#7 trainer4
+#8 trainer5
+#11 manager2
+#13 general_manager1
+#19 member6
+#20 member7
+
+
+Gym 3 - Muscle Gym
+==================
+#21 member8
+#22 member9
+#23 member10
+#24 member11
+
diff --git a/wger/manager/fixtures/test-user-data.json b/wger/manager/fixtures/test-user-data.json
index 1837c99db..1bae46a87 100644
--- a/wger/manager/fixtures/test-user-data.json
+++ b/wger/manager/fixtures/test-user-data.json
@@ -75,7 +75,7 @@
],
"user_permissions": [],
"password": "pbkdf2_sha256$12000$BaNi2p83rltB$fYAI0Y1Wxyo1DoQf8uJC6W1y3fK9HzmI7t8bN//Mzvo=",
- "email": "",
+ "email": "[email protected]",
"date_joined": "2013-03-30T00:23:21.592Z"
}
},
@@ -97,7 +97,7 @@
],
"user_permissions": [],
"password": "pbkdf2_sha256$12000$fgvAIvZjOH3f$ufayZhSXYPIgEhAiimIv6coPAPWcE0MwLZKVOTsJMM0=",
- "email": "",
+ "email": "[email protected]",
"date_joined": "2013-03-30T00:23:21.592Z"
}
},
@@ -119,7 +119,7 @@
],
"user_permissions": [],
"password": "pbkdf2_sha256$12000$IsWVvB7BuF2p$ZwLPKiGB5wP6XVx5qYI2hKu5CWODQX3gVUDvXEr1XqM=",
- "email": "",
+ "email": "[email protected]",
"date_joined": "2013-03-30T00:23:21.592Z"
}
},
@@ -141,7 +141,7 @@
],
"user_permissions": [],
"password": "pbkdf2_sha256$12000$U11MFXGmVZCy$znXUYY6Nt9t25mqGaCumxe9qe91pjQSr3fNWQb+SZms=",
- "email": "",
+ "email": "[email protected]",
"date_joined": "2013-03-30T00:23:21.592Z"
}
},
@@ -163,7 +163,7 @@
],
"user_permissions": [],
"password": "pbkdf2_sha256$12000$N1LjFaFdFKXD$Bd4rFH4+pXY9R3xOOE6rLfFLZ9Y7zri+UmzAEWgADWE=",
- "email": "",
+ "email": "[email protected]",
"date_joined": "2013-03-30T00:23:21.592Z"
}
},
@@ -185,7 +185,7 @@
],
"user_permissions": [],
"password": "pbkdf2_sha256$12000$YHyCIzh0CYNt$kEeqDYK9mw4d9+X5uxpav/rVAFEQuJyT2GRaTdtpaFI=",
- "email": "",
+ "email": "[email protected]",
"date_joined": "2013-03-30T00:23:21.592Z"
}
},
@@ -207,7 +207,7 @@
],
"user_permissions": [],
"password": "pbkdf2_sha256$12000$JpQW8y8VEnIJ$LgBr+wCAU00/Lpec0Iq/og8oqEOT0yS2C8C1UakI1Uo=",
- "email": "",
+ "email": "[email protected]",
"date_joined": "2013-03-30T00:23:21.592Z"
}
},
@@ -229,7 +229,7 @@
],
"user_permissions": [],
"password": "pbkdf2_sha256$12000$lHge7s7afhrb$Nb5M0jcoSX0ZbT3P70D4XDtke37u+NKdoBfXNd9LFng=",
- "email": "",
+ "email": "[email protected]",
"date_joined": "2013-03-30T00:23:21.592Z"
}
},
@@ -251,7 +251,7 @@
],
"user_permissions": [],
"password": "pbkdf2_sha256$12000$q1ZLvhPFKbRp$Q1dgERaIC1YSWdWI8XwxwDlP0J5c52n+Nu2UFKRT0Mc=",
- "email": "",
+ "email": "[email protected]",
"date_joined": "2013-03-30T00:23:21.592Z"
}
},
@@ -273,10 +273,208 @@
],
"user_permissions": [],
"password": "pbkdf2_sha256$12000$gy3Rnm5zmJFb$3yjL9nKmDkwWlZwYVTUfUe/E2MPcWbYdrucauAx78lw=",
- "email": "",
+ "email": "[email protected]",
"date_joined": "2013-03-30T00:23:21.592Z"
}
},
+ {
+ "pk": 14,
+ "model": "auth.user",
+ "fields": {
+ "username": "member1",
+ "last_name": "",
+ "is_active": true,
+ "is_staff": false,
+ "groups": [],
+ "user_permissions": [],
+ "password": "pbkdf2_sha256$12000$tvRb4UoTTrNA$02ZacbgPTU9n3erervJjNJ6pPnYcT5WCdK8A7vKNsWQ=",
+ "date_joined": "2013-03-30T00:23:21.592Z",
+ "first_name": "",
+ "is_superuser": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "email": "[email protected]"
+ }
+ },
+ {
+ "pk": 15,
+ "model": "auth.user",
+ "fields": {
+ "username": "member2",
+ "last_name": "",
+ "is_active": true,
+ "is_staff": false,
+ "groups": [],
+ "user_permissions": [],
+ "password": "pbkdf2_sha256$12000$EmUrOsFPNqad$pVs/qtc6HTNBElh3JTML1t0pu0HrVCgInTRjH1kGR70=",
+ "date_joined": "2013-03-30T00:23:21.592Z",
+ "first_name": "",
+ "is_superuser": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "email": "[email protected]"
+ }
+ },
+ {
+ "pk": 16,
+ "model": "auth.user",
+ "fields": {
+ "username": "member3",
+ "last_name": "",
+ "is_active": true,
+ "is_staff": false,
+ "groups": [],
+ "user_permissions": [],
+ "password": "pbkdf2_sha256$12000$u2LgFL6ZAoRj$Ta4N0lDL0ITirzY+1X43Ovu0La/aRuIgbsB6/V3M2Cc=",
+ "date_joined": "2013-03-30T00:23:21.592Z",
+ "first_name": "",
+ "is_superuser": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "email": "[email protected]"
+ }
+ },
+ {
+ "pk": 17,
+ "model": "auth.user",
+ "fields": {
+ "username": "member4",
+ "last_name": "",
+ "is_active": true,
+ "is_staff": false,
+ "groups": [],
+ "user_permissions": [],
+ "password": "pbkdf2_sha256$12000$8UWUtO9ISbvS$03anO5xZwW5/9bfKnHvd59jXN7zjZ0feg3ZigNgql2c=",
+ "date_joined": "2013-03-30T00:23:21.592Z",
+ "first_name": "",
+ "is_superuser": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "email": "[email protected]"
+ }
+ },
+ {
+ "pk": 18,
+ "model": "auth.user",
+ "fields": {
+ "username": "member5",
+ "last_name": "",
+ "is_active": true,
+ "is_staff": false,
+ "groups": [],
+ "user_permissions": [],
+ "password": "pbkdf2_sha256$12000$icmsz2q1iPt9$Hye1b2lb5aSfAh8qSJ0As3eQ859X+gPWRLMrg+RgBr8=",
+ "date_joined": "2013-03-30T00:23:21.592Z",
+ "first_name": "",
+ "is_superuser": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "email": "[email protected]"
+ }
+ },
+ {
+ "pk": 19,
+ "model": "auth.user",
+ "fields": {
+ "username": "member6",
+ "last_name": "",
+ "is_active": true,
+ "is_staff": false,
+ "groups": [],
+ "user_permissions": [],
+ "password": "pbkdf2_sha256$12000$DrZmCJLgdwmB$EHjhx5Q0TGfQuEIONQ16ZS7y+68ZzRkfrT8+jO9PqtA=",
+ "date_joined": "2013-03-30T00:23:21.592Z",
+ "first_name": "",
+ "is_superuser": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "email": "[email protected]"
+ }
+ },
+ {
+ "pk": 20,
+ "model": "auth.user",
+ "fields": {
+ "username": "member7",
+ "last_name": "",
+ "is_active": true,
+ "is_staff": false,
+ "groups": [],
+ "user_permissions": [],
+ "password": "pbkdf2_sha256$12000$TmyjzRJywZvs$CixnTYFGK8/dcAARAQOJE6gIPDmDiI/r3MCE81WZRU4=",
+ "date_joined": "2013-03-30T00:23:21.592Z",
+ "first_name": "",
+ "is_superuser": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "email": "[email protected]"
+ }
+ },
+ {
+ "pk": 21,
+ "model": "auth.user",
+ "fields": {
+ "username": "member8",
+ "last_name": "",
+ "is_active": true,
+ "is_staff": false,
+ "groups": [],
+ "user_permissions": [],
+ "password": "pbkdf2_sha256$12000$GSsralc7hddi$R0CFaVao8DDukttGl3rAgge/kcxFdOKGdl4c7koGIdU=",
+ "date_joined": "2013-03-30T00:23:21.592Z",
+ "first_name": "",
+ "is_superuser": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "email": "[email protected]"
+ }
+ },
+ {
+ "pk": 22,
+ "model": "auth.user",
+ "fields": {
+ "username": "member9",
+ "last_name": "",
+ "is_active": true,
+ "is_staff": false,
+ "groups": [],
+ "user_permissions": [],
+ "password": "pbkdf2_sha256$12000$sJ5O9GgTuABf$PocdJ38fKz7F7MaP/mB5ruDbZs1FHPl6ANW8qmuvPtY=",
+ "date_joined": "2013-03-30T00:23:21.592Z",
+ "first_name": "",
+ "is_superuser": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "email": "[email protected]"
+ }
+ },
+ {
+ "pk": 23,
+ "model": "auth.user",
+ "fields": {
+ "username": "member10",
+ "last_name": "",
+ "is_active": true,
+ "is_staff": false,
+ "groups": [],
+ "user_permissions": [],
+ "password": "pbkdf2_sha256$12000$Tq889HV1Bfl6$NsSvfLamynFbcsvPth7TUNam7SMvUteDp4+T0fCJqDU=",
+ "date_joined": "2013-03-30T00:23:21.592Z",
+ "first_name": "",
+ "is_superuser": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "email": "[email protected]"
+ }
+ },
+ {
+ "pk": 24,
+ "model": "auth.user",
+ "fields": {
+ "username": "member11",
+ "last_name": "",
+ "is_active": true,
+ "is_staff": false,
+ "groups": [],
+ "user_permissions": [],
+ "password": "pbkdf2_sha256$12000$o3tY1figj6zP$Z/qOvtvxnGTj3QSxTQBskLNH4rNBKJqBdOQ/5/JKkdk=",
+ "date_joined": "2013-03-30T00:23:21.592Z",
+ "first_name": "",
+ "is_superuser": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "email": "[email protected]"
+ }
+ },
{
"pk": 1,
"model": "core.userprofile",
@@ -638,5 +836,313 @@
"timer_pause": 90,
"gym": 2
}
+ },
+ {
+ "pk": 14,
+ "model": "core.userprofile",
+ "fields": {
+ "workout_reminder": 20,
+ "height": 180,
+ "show_english_ingredients": false,
+ "show_comments": false,
+ "workout_duration": 8,
+ "sleep_hours": 7,
+ "freetime_hours": 8,
+ "gym": 1,
+ "sport_intensity": "3",
+ "workout_reminder_active": false,
+ "work_intensity": "1",
+ "user": 14,
+ "timer_active": true,
+ "timer_pause": 90,
+ "work_hours": 8,
+ "freetime_intensity": "1",
+ "gender": "1",
+ "age": 30,
+ "notification_language": 1,
+ "calories": 3500,
+ "sport_hours": 6,
+ "is_temporary": false
+ }
+ },
+ {
+ "pk": 15,
+ "model": "core.userprofile",
+ "fields": {
+ "workout_reminder": 20,
+ "height": 180,
+ "show_english_ingredients": false,
+ "show_comments": false,
+ "workout_duration": 8,
+ "sleep_hours": 7,
+ "freetime_hours": 8,
+ "gym": 1,
+ "sport_intensity": "3",
+ "workout_reminder_active": false,
+ "work_intensity": "1",
+ "user": 15,
+ "timer_active": true,
+ "timer_pause": 90,
+ "work_hours": 8,
+ "freetime_intensity": "1",
+ "gender": "1",
+ "age": 30,
+ "notification_language": 1,
+ "calories": 3500,
+ "sport_hours": 6,
+ "is_temporary": false
+ }
+ },
+ {
+ "pk": 16,
+ "model": "core.userprofile",
+ "fields": {
+ "workout_reminder": 20,
+ "height": 180,
+ "show_english_ingredients": false,
+ "show_comments": false,
+ "workout_duration": 8,
+ "sleep_hours": 7,
+ "freetime_hours": 8,
+ "gym": 1,
+ "sport_intensity": "3",
+ "workout_reminder_active": false,
+ "work_intensity": "1",
+ "user": 16,
+ "timer_active": true,
+ "timer_pause": 90,
+ "work_hours": 8,
+ "freetime_intensity": "1",
+ "gender": "1",
+ "age": 30,
+ "notification_language": 1,
+ "calories": 3500,
+ "sport_hours": 6,
+ "is_temporary": false
+ }
+ },
+ {
+ "pk": 17,
+ "model": "core.userprofile",
+ "fields": {
+ "workout_reminder": 20,
+ "height": 180,
+ "show_english_ingredients": false,
+ "show_comments": false,
+ "workout_duration": 8,
+ "sleep_hours": 7,
+ "freetime_hours": 8,
+ "gym": 1,
+ "sport_intensity": "3",
+ "workout_reminder_active": false,
+ "work_intensity": "1",
+ "user": 17,
+ "timer_active": true,
+ "timer_pause": 90,
+ "work_hours": 8,
+ "freetime_intensity": "1",
+ "gender": "1",
+ "age": 30,
+ "notification_language": 1,
+ "calories": 3500,
+ "sport_hours": 6,
+ "is_temporary": false
+ }
+ },
+ {
+ "pk": 18,
+ "model": "core.userprofile",
+ "fields": {
+ "workout_reminder": 20,
+ "height": 180,
+ "show_english_ingredients": false,
+ "show_comments": false,
+ "workout_duration": 8,
+ "sleep_hours": 7,
+ "freetime_hours": 8,
+ "gym": 1,
+ "sport_intensity": "3",
+ "workout_reminder_active": false,
+ "work_intensity": "1",
+ "user": 18,
+ "timer_active": true,
+ "timer_pause": 90,
+ "work_hours": 8,
+ "freetime_intensity": "1",
+ "gender": "1",
+ "age": 30,
+ "notification_language": 1,
+ "calories": 3500,
+ "sport_hours": 6,
+ "is_temporary": false
+ }
+ },
+ {
+ "pk": 19,
+ "model": "core.userprofile",
+ "fields": {
+ "workout_reminder": 20,
+ "height": 180,
+ "show_english_ingredients": false,
+ "show_comments": false,
+ "workout_duration": 8,
+ "sleep_hours": 7,
+ "freetime_hours": 8,
+ "gym": 2,
+ "sport_intensity": "3",
+ "workout_reminder_active": false,
+ "work_intensity": "1",
+ "user": 19,
+ "timer_active": true,
+ "timer_pause": 90,
+ "work_hours": 8,
+ "freetime_intensity": "1",
+ "gender": "1",
+ "age": 30,
+ "notification_language": 1,
+ "calories": 3500,
+ "sport_hours": 6,
+ "is_temporary": false
+ }
+ },
+ {
+ "pk": 20,
+ "model": "core.userprofile",
+ "fields": {
+ "workout_reminder": 20,
+ "height": 180,
+ "show_english_ingredients": false,
+ "show_comments": false,
+ "workout_duration": 8,
+ "sleep_hours": 7,
+ "freetime_hours": 8,
+ "gym": 2,
+ "sport_intensity": "3",
+ "workout_reminder_active": false,
+ "work_intensity": "1",
+ "user": 20,
+ "timer_active": true,
+ "timer_pause": 90,
+ "work_hours": 8,
+ "freetime_intensity": "1",
+ "gender": "1",
+ "age": 30,
+ "notification_language": 1,
+ "calories": 3500,
+ "sport_hours": 6,
+ "is_temporary": false
+ }
+ },
+ {
+ "pk": 21,
+ "model": "core.userprofile",
+ "fields": {
+ "workout_reminder": 20,
+ "height": 180,
+ "show_english_ingredients": false,
+ "show_comments": false,
+ "workout_duration": 8,
+ "sleep_hours": 7,
+ "freetime_hours": 8,
+ "gym": 1,
+ "sport_intensity": "3",
+ "workout_reminder_active": false,
+ "work_intensity": "1",
+ "user": 21,
+ "timer_active": true,
+ "timer_pause": 90,
+ "work_hours": 8,
+ "freetime_intensity": "1",
+ "gender": "1",
+ "age": 30,
+ "notification_language": 1,
+ "calories": 3500,
+ "sport_hours": 6,
+ "is_temporary": false
+ }
+ },
+ {
+ "pk": 22,
+ "model": "core.userprofile",
+ "fields": {
+ "workout_reminder": 20,
+ "height": 180,
+ "show_english_ingredients": false,
+ "show_comments": false,
+ "workout_duration": 8,
+ "sleep_hours": 7,
+ "freetime_hours": 8,
+ "gym": 1,
+ "sport_intensity": "3",
+ "workout_reminder_active": false,
+ "work_intensity": "1",
+ "user": 22,
+ "timer_active": true,
+ "timer_pause": 90,
+ "work_hours": 8,
+ "freetime_intensity": "1",
+ "gender": "1",
+ "age": 30,
+ "notification_language": 1,
+ "calories": 3500,
+ "sport_hours": 6,
+ "is_temporary": false
+ }
+ },
+ {
+ "pk": 23,
+ "model": "core.userprofile",
+ "fields": {
+ "workout_reminder": 20,
+ "height": 180,
+ "show_english_ingredients": false,
+ "show_comments": false,
+ "workout_duration": 8,
+ "sleep_hours": 7,
+ "freetime_hours": 8,
+ "gym": 1,
+ "sport_intensity": "3",
+ "workout_reminder_active": false,
+ "work_intensity": "1",
+ "user": 23,
+ "timer_active": true,
+ "timer_pause": 90,
+ "work_hours": 8,
+ "freetime_intensity": "1",
+ "gender": "1",
+ "age": 30,
+ "notification_language": 1,
+ "calories": 3500,
+ "sport_hours": 6,
+ "is_temporary": false
+ }
+ },
+ {
+ "pk": 24,
+ "model": "core.userprofile",
+ "fields": {
+ "workout_reminder": 20,
+ "height": 180,
+ "show_english_ingredients": false,
+ "show_comments": false,
+ "workout_duration": 8,
+ "sleep_hours": 7,
+ "freetime_hours": 8,
+ "gym": 1,
+ "sport_intensity": "3",
+ "workout_reminder_active": false,
+ "work_intensity": "1",
+ "user": 24,
+ "timer_active": true,
+ "timer_pause": 90,
+ "work_hours": 8,
+ "freetime_intensity": "1",
+ "gender": "1",
+ "age": 30,
+ "notification_language": 1,
+ "calories": 3500,
+ "sport_hours": 6,
+ "is_temporary": false
+ }
}
]