From 4a737d42873a6a4d58c950fb42bd6afbdd80be0f Mon Sep 17 00:00:00 2001 From: Diego Calvo Date: Fri, 12 Mar 2021 15:03:50 +0100 Subject: [PATCH 1/4] user can update notify --- core/serializers.py | 2 +- core/tests.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/serializers.py b/core/serializers.py index 6a2039e..0121405 100644 --- a/core/serializers.py +++ b/core/serializers.py @@ -85,7 +85,7 @@ class UpdateUserSerializer(serializers.ModelSerializer): class Meta: model = models.CustomUser - fields = ('full_name', 'email') + fields = ('full_name', 'email', 'notify') def validate_email(self, value): user = self.context['request'].user diff --git a/core/tests.py b/core/tests.py index 2ed7ca1..f687a3d 100644 --- a/core/tests.py +++ b/core/tests.py @@ -169,7 +169,6 @@ class CustomUserViewSetTest(APITestCase): data = { "email": "new_email@mail.com", "full_name": "New Full Name", - 'provider': 'PROVIDER', 'notify': True, } @@ -183,6 +182,10 @@ class CustomUserViewSetTest(APITestCase): # Assert forbidden code self.assertEqual(response.status_code, status.HTTP_200_OK) + # Assert instance has been modified + for key in data: + self.assertEqual(data[key], response.data[key]) + # admin user def test_admin_user_can_create_instance(self): """Admin user can create new instance From 048f6dbb708d941939b512161ba1b47e8f6676be Mon Sep 17 00:00:00 2001 From: Diego Calvo Date: Mon, 15 Mar 2021 11:45:44 +0100 Subject: [PATCH 2/4] perform_create in MyProductsViewSet for creating with creator and company --- products/views.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/products/views.py b/products/views.py index 4e132ae..44f8d9e 100644 --- a/products/views.py +++ b/products/views.py @@ -74,6 +74,9 @@ class MyProductsViewSet(viewsets.ModelViewSet): def get_queryset(self): return self.model.objects.filter(company=self.request.user.company).order_by('-created') + def perform_create(self, serializer): + serializer.save(creator=self.request.user, company=self.request.user.company) + class AdminProductsViewSet(viewsets.ModelViewSet): """ Allows user with role 'SITE_ADMIN' to access all product instances From d11c4a5c36e4cfa648687429a660ea4412b3834f Mon Sep 17 00:00:00 2001 From: Diego Calvo Date: Mon, 15 Mar 2021 12:04:27 +0100 Subject: [PATCH 3/4] revert last commit --- products/views.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/products/views.py b/products/views.py index 44f8d9e..99d314b 100644 --- a/products/views.py +++ b/products/views.py @@ -74,8 +74,6 @@ class MyProductsViewSet(viewsets.ModelViewSet): def get_queryset(self): return self.model.objects.filter(company=self.request.user.company).order_by('-created') - def perform_create(self, serializer): - serializer.save(creator=self.request.user, company=self.request.user.company) class AdminProductsViewSet(viewsets.ModelViewSet): From cf60622d23b43f8e4d8b91b7ec45e2e15e8c19af Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 15 Mar 2021 11:24:43 +0000 Subject: [PATCH 4/4] added file to ignore contents of static folder --- static/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 static/.gitignore diff --git a/static/.gitignore b/static/.gitignore new file mode 100644 index 0000000..c96a04f --- /dev/null +++ b/static/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file