sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fixing export, adding apps to export settings

Browse Source
This commit is contained in:
Sander Roosendaal
2024-12-29 15:12:45 +01:00
parent 173001fcc7
commit f53a2aca1e
5 changed files with 208 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
rowers/templates/rower_exportsettings.html
View File

@@ -206,14 +206,26 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
<li> </li>
{% endif %} {% endif %}
{% if user.is_staff %} {% if apps %}
<li class="rounder"> {% for app in apps %}
<h2>Admin</h2> <li class="rounder grid_4">
<p><a href="/rowers/me/idokladauthorize/">iDoklad authorize</a></p> <h2>{{ app.name }}</h2>
</li> <p><em>Client ID: </em>{{ app.client_id }}</p>
{% endif %} <p><em>Redirect URIs: </em>{{ app.redirect_uris }}</p>
<p><em>Client Type: </em>{{ app.client_type }}</p>
<p><em>Authorization grant type: </em>{{ app.authorization_grant_type }}</p>
<p><em>Allowed origins: </em>{{ app.allowed_origins }}</p>
</li>
{% endfor %}
{% endif %}
{% if user.is_staff %}
<li class="rounder grid_4">
<h2>Admin</h2>
<p><a href="/rowers/me/idokladauthorize/">iDoklad authorize</a></p>
</li>
{% endif %}
</ul> </ul>
</form> </form>

185
rowers/tests/test_imports.py
View File

@@ -349,6 +349,25 @@ class C2Objects(DjangoTestCase):
timezone='Europe/Amsterdam' timezone='Europe/Amsterdam'
) )
self.u2 = User.objects.create_user('john2',
'ba@ds.ds',
'koeinsloot2')
self.u2.first_name = 'John'
self.u2.last_name = 'Sander2'
self.u2.save()
self.r2 = Rower.objects.create(user=self.u2,gdproptin=True, ftpset=True,surveydone=True,
gdproptindate=timezone.now()
)
self.w2 = Workout.objects.create(
name='testworkout',workouttype='water',
user=self.r2,date=self.nu.strftime('%Y-%m-%d'),
starttime=workoutstarttime,
startdatetime=row.rowdatetime,
duration=duration,distance=totaldist,
csvfilename=filename
)
def test_timezone_c2(self): def test_timezone_c2(self):
c2integration = C2Integration(self.u) c2integration = C2Integration(self.u)
data = c2integration.createworkoutdata(self.w) data = c2integration.createworkoutdata(self.w)
@@ -411,6 +430,19 @@ class C2Objects(DjangoTestCase):
@patch('rowers.integrations.c2.requests.post', side_effect=mocked_requests) @patch('rowers.integrations.c2.requests.post', side_effect=mocked_requests)
@patch('rowers.integrations.c2.requests.get', side_effect=mocked_requests) @patch('rowers.integrations.c2.requests.get', side_effect=mocked_requests)
def test_c2_upload2(self, mock_get, mock_post):
url = '/rowers/workout/'+encoded2+'/c2uploadw/'
response = self.c.get(url)
self.assertRedirects(response,
expected_url = '/rowers/list-workouts/',
status_code=302,target_status_code=200)
self.assertEqual(response.url, '/rowers/list-workouts/')
self.assertEqual(response.status_code, 302)
@patch('rowers.integrations.c2.requests.post', side_effect=mocked_requests)
@patch('rowers.integrations.c2.requests.get', side_effect=mocked_requests)
def test_c2_list(self, mock_get, mock_post): def test_c2_list(self, mock_get, mock_post):
response = self.c.get('/rowers/workout/c2import',follow=True) response = self.c.get('/rowers/workout/c2import',follow=True)
@@ -756,6 +788,24 @@ class NKObjects(DjangoTestCase):
duration=duration,distance=totaldist, duration=duration,distance=totaldist,
csvfilename=filename csvfilename=filename
) )
self.u2 = User.objects.create_user('john2',
'ba@ds.ds',
'koeinsloot2')
self.u2.first_name = 'John'
self.u2.last_name = 'Sander2'
self.u2.save()
self.r2 = Rower.objects.create(user=self.u2,gdproptin=True, ftpset=True,surveydone=True,
gdproptindate=timezone.now()
)
self.w2 = Workout.objects.create(
name='testworkout',workouttype='water',
user=self.r2,date=self.nu.strftime('%Y-%m-%d'),
starttime=workoutstarttime,
startdatetime=row.rowdatetime,
duration=duration,distance=totaldist,
csvfilename=filename
)
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')
@patch('rowers.dataprep.read_data',side_effect=mocked_read_data) @patch('rowers.dataprep.read_data',side_effect=mocked_read_data)
@@ -1025,6 +1075,24 @@ class PolarObjects(DjangoTestCase):
duration=duration,distance=totaldist, duration=duration,distance=totaldist,
csvfilename=filename csvfilename=filename
) )
self.u2 = User.objects.create_user('john2',
'ba@ds.ds',
'koeinsloot2')
self.u2.first_name = 'John'
self.u2.last_name = 'Sander2'
self.u2.save()
self.r2 = Rower.objects.create(user=self.u2,gdproptin=True, ftpset=True,surveydone=True,
gdproptindate=timezone.now()
)
self.w2 = Workout.objects.create(
name='testworkout',workouttype='water',
user=self.r2,date=self.nu.strftime('%Y-%m-%d'),
starttime=workoutstarttime,
startdatetime=row.rowdatetime,
duration=duration,distance=totaldist,
csvfilename=filename
)
@patch('rowers.integrations.polar.requests.post', side_effect=mocked_requests) @patch('rowers.integrations.polar.requests.post', side_effect=mocked_requests)
@patch('rowers.integrations.polar.requests.get', side_effect=mocked_requests) @patch('rowers.integrations.polar.requests.get', side_effect=mocked_requests)
@@ -1118,6 +1186,24 @@ class RP3Objects(DjangoTestCase):
duration=duration,distance=totaldist, duration=duration,distance=totaldist,
csvfilename=filename csvfilename=filename
) )
self.u2 = User.objects.create_user('john2',
'ba@ds.ds',
'koeinsloot2')
self.u2.first_name = 'John'
self.u2.last_name = 'Sander2'
self.u2.save()
self.r2 = Rower.objects.create(user=self.u2,gdproptin=True, ftpset=True,surveydone=True,
gdproptindate=timezone.now()
)
self.w2 = Workout.objects.create(
name='testworkout',workouttype='water',
user=self.r2,date=self.nu.strftime('%Y-%m-%d'),
starttime=workoutstarttime,
startdatetime=row.rowdatetime,
duration=duration,distance=totaldist,
csvfilename=filename
)
@patch('rowers.integrations.rp3.requests.get', side_effect=mocked_requests) @patch('rowers.integrations.rp3.requests.get', side_effect=mocked_requests)
@patch('rowers.integrations.rp3.requests.post', side_effect=mocked_requests) @patch('rowers.integrations.rp3.requests.post', side_effect=mocked_requests)
@@ -1213,6 +1299,24 @@ class StravaObjects(DjangoTestCase):
duration=duration,distance=totaldist, duration=duration,distance=totaldist,
csvfilename=filename,uploadedtostrava=123, csvfilename=filename,uploadedtostrava=123,
) )
self.u2 = User.objects.create_user('john2',
'ba@ds.ds',
'koeinsloot2')
self.u2.first_name = 'John'
self.u2.last_name = 'Sander2'
self.u2.save()
self.r2 = Rower.objects.create(user=self.u2,gdproptin=True, ftpset=True,surveydone=True,
gdproptindate=timezone.now()
)
self.w2 = Workout.objects.create(
name='testworkout',workouttype='water',
user=self.r2,date=self.nu.strftime('%Y-%m-%d'),
starttime=workoutstarttime,
startdatetime=row.rowdatetime,
duration=duration,distance=totaldist,
csvfilename=filename
)
@patch('rowers.integrations.strava.requests.post', side_effect=mocked_requests) @patch('rowers.integrations.strava.requests.post', side_effect=mocked_requests)
@patch('rowers.integrations.strava.requests.get', side_effect=mocked_requests) @patch('rowers.integrations.strava.requests.get', side_effect=mocked_requests)
@@ -1281,6 +1385,20 @@ class StravaObjects(DjangoTestCase):
self.assertEqual(res,1) self.assertEqual(res,1)
@patch('rowers.integrations.strava.requests.post', side_effect=mocked_requests)
@patch('rowers.integrations.strava.requests.get', side_effect=mocked_requests)
def test_strava_upload2(self, mock_get, mock_post):
url = '/rowers/workout/'+encoded2+'/stravauploadw/'
response = self.c.get(url)
self.assertRedirects(response,
expected_url = '/rowers/list-workouts/',
status_code=302,target_status_code=200)
self.assertEqual(response.url, '/rowers/list-workouts/')
self.assertEqual(response.status_code, 302)
@patch('rowers.integrations.strava.requests.post', side_effect=mocked_requests) @patch('rowers.integrations.strava.requests.post', side_effect=mocked_requests)
@patch('rowers.integrations.strava.requests.get', side_effect=mocked_requests) @patch('rowers.integrations.strava.requests.get', side_effect=mocked_requests)
def test_strava_upload(self, mock_get, mock_post): def test_strava_upload(self, mock_get, mock_post):
@@ -1383,6 +1501,24 @@ class STObjects(DjangoTestCase):
duration=duration,distance=totaldist, duration=duration,distance=totaldist,
csvfilename=filename csvfilename=filename
) )
self.u2 = User.objects.create_user('john2',
'ba@ds.ds',
'koeinsloot2')
self.u2.first_name = 'John'
self.u2.last_name = 'Sander2'
self.u2.save()
self.r2 = Rower.objects.create(user=self.u2,gdproptin=True, ftpset=True,surveydone=True,
gdproptindate=timezone.now()
)
self.w2 = Workout.objects.create(
name='testworkout',workouttype='water',
user=self.r2,date=self.nu.strftime('%Y-%m-%d'),
starttime=workoutstarttime,
startdatetime=row.rowdatetime,
duration=duration,distance=totaldist,
csvfilename=filename
)
@patch('rowers.integrations.sporttracks.requests.post', side_effect=mocked_requests) @patch('rowers.integrations.sporttracks.requests.post', side_effect=mocked_requests)
def test_sporttracks_callback(self, mock_post): def test_sporttracks_callback(self, mock_post):
@@ -1411,6 +1547,20 @@ class STObjects(DjangoTestCase):
self.assertEqual(response.url, '/rowers/workout/'+encoded1+'/edit/') self.assertEqual(response.url, '/rowers/workout/'+encoded1+'/edit/')
self.assertEqual(response.status_code, 302) self.assertEqual(response.status_code, 302)
@patch('rowers.integrations.sporttracks.requests.post', side_effect=mocked_requests)
@patch('rowers.integrations.sporttracks.requests.get', side_effect=mocked_requests)
def test_tp_upload2(self, mock_get, mock_post):
url = '/rowers/workout/'+encoded2+'/sporttracksuploadw/'
response = self.c.get(url)
self.assertRedirects(response,
expected_url = '/rowers/list-workouts/',
status_code=302,target_status_code=200)
self.assertEqual(response.url, '/rowers/list-workouts/')
self.assertEqual(response.status_code, 302)
@patch('rowers.integrations.sporttracks.requests.get', side_effect=mocked_requests) @patch('rowers.integrations.sporttracks.requests.get', side_effect=mocked_requests)
def test_sporttracks_list(self, mock_get): def test_sporttracks_list(self, mock_get):
response = self.c.get('/rowers/workout/sporttracksimport',follow=True) response = self.c.get('/rowers/workout/sporttracksimport',follow=True)
@@ -1462,6 +1612,7 @@ class TPObjects(DjangoTestCase):
self.u.first_name = 'John' self.u.first_name = 'John'
self.u.last_name = 'Sander' self.u.last_name = 'Sander'
self.u.save() self.u.save()
self.r = Rower.objects.create(user=self.u,gdproptin=True, ftpset=True,surveydone=True, self.r = Rower.objects.create(user=self.u,gdproptin=True, ftpset=True,surveydone=True,
gdproptindate=timezone.now() gdproptindate=timezone.now()
) )
@@ -1507,6 +1658,26 @@ class TPObjects(DjangoTestCase):
csvfilename=filename csvfilename=filename
) )
self.u2 = User.objects.create_user('john2',
'ba@ds.ds',
'koeinsloot2')
self.u2.first_name = 'John'
self.u2.last_name = 'Sander2'
self.u2.save()
self.r2 = Rower.objects.create(user=self.u2,gdproptin=True, ftpset=True,surveydone=True,
gdproptindate=timezone.now()
)
self.w2 = Workout.objects.create(
name='testworkout',workouttype='water',
user=self.r2,date=self.nu.strftime('%Y-%m-%d'),
starttime=workoutstarttime,
startdatetime=row.rowdatetime,
duration=duration,distance=totaldist,
csvfilename=filename
)
@patch('rowers.integrations.trainingpeaks.requests.post', side_effect=mocked_requests) @patch('rowers.integrations.trainingpeaks.requests.post', side_effect=mocked_requests)
def test_tp_callback(self, mock_post): def test_tp_callback(self, mock_post):
response = self.c.get('/tp_callback?code=dsdoij232s',follow=True) response = self.c.get('/tp_callback?code=dsdoij232s',follow=True)
@@ -1535,3 +1706,17 @@ class TPObjects(DjangoTestCase):
self.assertEqual(response.url, '/rowers/workout/'+encoded1+'/edit/') self.assertEqual(response.url, '/rowers/workout/'+encoded1+'/edit/')
self.assertEqual(response.status_code, 302) self.assertEqual(response.status_code, 302)
@patch('rowers.integrations.trainingpeaks.requests.post', side_effect=mocked_requests)
@patch('rowers.integrations.trainingpeaks.requests.get', side_effect=mocked_requests)
def test_tp_upload2(self, mock_get, mock_post):
url = '/rowers/workout/'+encoded2+'/tpuploadw/'
response = self.c.get(url)
self.assertRedirects(response,
expected_url = '/rowers/list-workouts/',
status_code=302,target_status_code=200)
self.assertEqual(response.url, '/rowers/list-workouts/')
self.assertEqual(response.status_code, 302)

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.

3
rowers/views/importviews.py
View File

@@ -39,11 +39,10 @@ def default(o): # pragma: no cover
raise TypeError raise TypeError
@login_required() @login_required()
@permission_required('workout.is_workout_owner', fn=get_user_by_userid, raise_exception=True)
def workout_export_view(request, id=0, source='c2'): def workout_export_view(request, id=0, source='c2'):
r = getrequestrower(request) r = getrequestrower(request)
w = get_workout_by_opaqueid(request, id) w = get_workout_by_opaqueid(request, id)
if w.user != request.user: if w.user != request.user.rower:
messages.error(request, 'You can only export your own workouts') messages.error(request, 'You can only export your own workouts')
url = reverse('workouts_view') url = reverse('workouts_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)

2
rowers/views/userviews.py
View File

@@ -550,6 +550,7 @@ def rower_exportsettings_view(request, userid=0):
except APIKey.DoesNotExist: except APIKey.DoesNotExist:
apikey = APIKey.objects.create(user=request.user) apikey = APIKey.objects.create(user=request.user)
apps = Application.objects.filter(user=request.user)
return render(request, 'rower_exportsettings.html', return render(request, 'rower_exportsettings.html',
{'form': form, {'form': form,
@@ -558,6 +559,7 @@ def rower_exportsettings_view(request, userid=0):
'breadcrumbs': breadcrumbs, 'breadcrumbs': breadcrumbs,
'grants': grants, 'grants': grants,
'apikey': apikey.key, 'apikey': apikey.key,
'apps': apps,
}) })