From 479fee6a5c093edd928454f6bd6cebe72e8c6cee Mon Sep 17 00:00:00 2001 From: Colin Powell Date: Thu, 23 Feb 2023 11:03:19 -0500 Subject: [PATCH] Its a webhook, not a websocket --- tests/scrobbles_tests/test_aggregators.py | 2 +- tests/scrobbles_tests/test_views.py | 10 +++++----- vrobbler/apps/scrobbles/urls.py | 12 ++++++------ vrobbler/apps/scrobbles/views.py | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/scrobbles_tests/test_aggregators.py b/tests/scrobbles_tests/test_aggregators.py index 53b3802..3cfc3c7 100644 --- a/tests/scrobbles_tests/test_aggregators.py +++ b/tests/scrobbles_tests/test_aggregators.py @@ -16,7 +16,7 @@ from scrobbles.models import Scrobble def build_scrobbles(client, request_data, num=7, spacing=2): - url = reverse('scrobbles:mopidy-websocket') + url = reverse('scrobbles:mopidy-webhook') user = get_user_model().objects.create(username='Test User') UserProfile.objects.create(user=user, timezone='US/Eastern') for i in range(num): diff --git a/tests/scrobbles_tests/test_views.py b/tests/scrobbles_tests/test_views.py index fc94647..bfbc2cf 100644 --- a/tests/scrobbles_tests/test_views.py +++ b/tests/scrobbles_tests/test_views.py @@ -10,7 +10,7 @@ from podcasts.models import Episode @pytest.mark.django_db def test_get_not_allowed_from_mopidy(client, valid_auth_token): - url = reverse('scrobbles:mopidy-websocket') + url = reverse('scrobbles:mopidy-webhook') headers = {'Authorization': f'Token {valid_auth_token}'} response = client.get(url, headers=headers) assert response.status_code == 405 @@ -18,7 +18,7 @@ def test_get_not_allowed_from_mopidy(client, valid_auth_token): @pytest.mark.django_db def test_bad_mopidy_request_data(client, valid_auth_token): - url = reverse('scrobbles:mopidy-websocket') + url = reverse('scrobbles:mopidy-webhook') headers = {'Authorization': f'Token {valid_auth_token}'} response = client.post(url, headers) assert response.status_code == 400 @@ -32,7 +32,7 @@ def test_bad_mopidy_request_data(client, valid_auth_token): def test_scrobble_mopidy_track( client, mopidy_track_request_data, valid_auth_token ): - url = reverse('scrobbles:mopidy-websocket') + url = reverse('scrobbles:mopidy-webhook') headers = {'Authorization': f'Token {valid_auth_token}'} response = client.post( url, @@ -55,7 +55,7 @@ def test_scrobble_mopidy_same_track_different_album( mopidy_track_diff_album_request_data, valid_auth_token, ): - url = reverse('scrobbles:mopidy-websocket') + url = reverse('scrobbles:mopidy-webhook') headers = {'Authorization': f'Token {valid_auth_token}'} response = client.post( url, @@ -84,7 +84,7 @@ def test_scrobble_mopidy_same_track_different_album( def test_scrobble_mopidy_podcast( client, mopidy_podcast_request_data, valid_auth_token ): - url = reverse('scrobbles:mopidy-websocket') + url = reverse('scrobbles:mopidy-webhook') headers = {'Authorization': f'Token {valid_auth_token}'} response = client.post( url, diff --git a/vrobbler/apps/scrobbles/urls.py b/vrobbler/apps/scrobbles/urls.py index e834ccf..870fdcd 100644 --- a/vrobbler/apps/scrobbles/urls.py +++ b/vrobbler/apps/scrobbles/urls.py @@ -32,14 +32,14 @@ urlpatterns = [ name='lastfm-import', ), path( - 'websocket/jellyfin/', - views.jellyfin_websocket, - name='jellyfin-websocket', + 'webhook/jellyfin/', + views.jellyfin_webhook, + name='jellyfin-webhook', ), path( - 'websocket/mopidy/', - views.mopidy_websocket, - name='mopidy-websocket', + 'webhook/mopidy/', + views.mopidy_webhook, + name='mopidy-webhook', ), path('export/', views.export, name='export'), ] diff --git a/vrobbler/apps/scrobbles/views.py b/vrobbler/apps/scrobbles/views.py index b584e84..78b59d4 100644 --- a/vrobbler/apps/scrobbles/views.py +++ b/vrobbler/apps/scrobbles/views.py @@ -216,7 +216,7 @@ def lastfm_import(request): @csrf_exempt @permission_classes([IsAuthenticated]) @api_view(['POST']) -def jellyfin_websocket(request): +def jellyfin_webhook(request): data_dict = request.data if ( @@ -248,7 +248,7 @@ def jellyfin_websocket(request): @csrf_exempt @permission_classes([IsAuthenticated]) @api_view(['POST']) -def mopidy_websocket(request): +def mopidy_webhook(request): try: data_dict = json.loads(request.data) except TypeError: