diff --git a/backend/secfit/diets/models.py b/backend/secfit/diets/models.py index 34a1da701dcaae30864ee9a8bb31f8701014d9e6..7d9586d62bd4ade429a53a9db2f4c99b7d3ae57f 100644 --- a/backend/secfit/diets/models.py +++ b/backend/secfit/diets/models.py @@ -134,19 +134,6 @@ class DietInstance(models.Model): ) -def diet_directory_path(instance, filename): - """Return path for which diet files should be uploaded on the web server - - Args: - instance (DietFile): DietFile instance - filename (str): Name of the file - - Returns: - str: Path where diet file is stored - """ - return f"diets/{instance.instance.diet.id}/{filename}" - - class DietFile(models.Model): """Django model for file associated with a diet. Basically a wrapper. diff --git a/backend/secfit/diets/tests.py b/backend/secfit/diets/tests.py deleted file mode 100644 index 7fbbf7847f5b0f201d408d4017cc865d614e2615..0000000000000000000000000000000000000000 --- a/backend/secfit/diets/tests.py +++ /dev/null @@ -1,6 +0,0 @@ -""" -Tests for the workouts application. -""" -from django.test import TestCase - -# Create your tests here. diff --git a/backend/secfit/diets/urls.py b/backend/secfit/diets/urls.py index 577a25402efe1b1fa37082228bc7d0bab11d1151..dbaaf9d87cfb3cd351bce0644b84bd47c500844b 100644 --- a/backend/secfit/diets/urls.py +++ b/backend/secfit/diets/urls.py @@ -5,9 +5,7 @@ from rest_framework_simplejwt.views import ( TokenObtainPairView, TokenRefreshView, ) -from rest_framework.urlpatterns import format_suffix_patterns -# This is a bit messy and will need to change urlpatterns = format_suffix_patterns( [ path("", views.api_root), @@ -56,7 +54,8 @@ urlpatterns = format_suffix_patterns( path("", include("users.urls")), path("", include("comments.urls")), path("api/auth/", include("rest_framework.urls")), - path("api/token/", TokenObtainPairView.as_view(), name="token_obtain_pair"), + path("api/token/", TokenObtainPairView.as_view(), + name="token_obtain_pair"), path("api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"), path("api/remember_me/", views.RememberMe.as_view(), name="remember_me"), ] diff --git a/backend/secfit/workouts/urls.py b/backend/secfit/workouts/urls.py index 7c46a3f1ff311edc25dd455bb85780c1a1644738..e6d843777c8b783ea70be664480a69719b20f09b 100644 --- a/backend/secfit/workouts/urls.py +++ b/backend/secfit/workouts/urls.py @@ -6,7 +6,6 @@ from rest_framework_simplejwt.views import ( TokenRefreshView, ) -# This is a bit messy and will need to change urlpatterns = format_suffix_patterns( [ path("", views.api_root), @@ -45,7 +44,8 @@ urlpatterns = format_suffix_patterns( path("", include("users.urls")), path("", include("comments.urls")), path("api/auth/", include("rest_framework.urls")), - path("api/token/", TokenObtainPairView.as_view(), name="token_obtain_pair"), + path("api/token/", TokenObtainPairView.as_view(), + name="token_obtain_pair"), path("api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"), path("api/remember_me/", views.RememberMe.as_view(), name="remember_me"), ] diff --git a/backend/secfit/workouts/views.py b/backend/secfit/workouts/views.py index 639ca793560f96469489d7522f53ac8d91cc2287..19053e47273f450adaa7d82d197ab2e54b4aee72 100644 --- a/backend/secfit/workouts/views.py +++ b/backend/secfit/workouts/views.py @@ -70,10 +70,10 @@ class RememberMe( return Response({"remember_me": self.rememberme()}) def post(self, request): - cookieObject = namedtuple("Cookies", request.COOKIES.keys())( + cookie_object = namedtuple("Cookies", request.COOKIES.keys())( *request.COOKIES.values() ) - user = self.get_user(cookieObject) + user = self.get_user(cookie_object) refresh = RefreshToken.for_user(user) return Response( { @@ -82,8 +82,8 @@ class RememberMe( } ) - def get_user(self, cookieObject): - decode = base64.b64decode(cookieObject.remember_me) + def get_user(self, cookie_object): + decode = base64.b64decode(cookie_object.remember_me) user, sign = pickle.loads(decode) # Validate signature diff --git a/frontend/cypress/integration/diet.spec.js b/frontend/cypress/integration/diet.spec.js index eedf1a4f783005bff707f5d612f5c5b1790f60c3..4b49c5a1c64173c4c69e9b025635b0a8f142b10d 100644 --- a/frontend/cypress/integration/diet.spec.js +++ b/frontend/cypress/integration/diet.spec.js @@ -146,24 +146,4 @@ describe('tests diets page', () => { cy.get('.alert') .should('be.visible'); }); - - /* it('alert should be visible if exercise has no data', () => { - cy.get('#inputName') - .type(generateStringWithLengthX(10)); - - cy.get('#inputDateTime') - .type('2021-03-11T10:00') - - cy.get('#inputNotes') - .type(generateStringWithLengthX(10)); - - cy.get('[name="type"]') - .select(cy.get('[name="type"]').first().invoke('val')); - - cy.get('#btn-ok-diet') - .click(); - - cy.get('.alert') - .should('be.visible'); - }); */ }); diff --git a/frontend/cypress/integration/workout.spec.js b/frontend/cypress/integration/workout.spec.js index f2e85028c662bcdeea4632c4264cc8dca39af894..d45ff05f77cceccb8181da9c4eb4e8d7143706fc 100644 --- a/frontend/cypress/integration/workout.spec.js +++ b/frontend/cypress/integration/workout.spec.js @@ -146,24 +146,4 @@ describe('boundary tests workout page', () => { cy.get('.alert') .should('be.visible'); }); - - /* it('alert should be visible if exercise has no data', () => { - cy.get('#inputName') - .type(generateStringWithLengthX(10)); - - cy.get('#inputDateTime') - .type('2021-03-11T10:00') - - cy.get('#inputNotes') - .type(generateStringWithLengthX(10)); - - cy.get('[name="type"]') - .select(cy.get('[name="type"]').first().invoke('val')); - - cy.get('#btn-ok-workout') - .click(); - - cy.get('.alert') - .should('be.visible'); - }); */ });