Upgrade django 3.2.25 (#22)

* Added deprecations command to makefile

* Fixed assertDictContainsSubset deprecation warning

* Generated openapi schema

* Added flake8 file

* 120 line length editorconfig file

* Fix old docker-compose examples

Author: mrroot5

.editorconfig

@@ -23,4 +23,4 @@ insert_final_newline = true
 indent_size = 2
 # Python config
 [*.py]
-max_line_length = 100
+max_line_length = 120

.flake8

@@ -0,0 +1,10 @@
+[flake8]
+exclude =
+    .git,
+    .github
+    .vscode
+    __pycache__,
+    build
+    environment
+max-complexity = 10
+max-line-length = 120

Makefile

@@ -1,7 +1,7 @@
 .PHONY: shell, test, dev, start, build, migrate, shell_plus
 
 PROJECT_NAME=django_atomic_transactions
-DOCKER_COMPOSE=docker-compose -p ${PROJECT_NAME} -f environment/docker-compose.yml
+DOCKER_COMPOSE=docker compose -p ${PROJECT_NAME} -f environment/docker-compose.yml
 DOCKER_COMPOSE_RUN_WEB=${DOCKER_COMPOSE} run --rm
 
 default: build
@@ -27,6 +27,9 @@ uvicorn:
 test: build
 	${DOCKER_COMPOSE_RUN_WEB} web python manage.py test --failfast api
 
+deprecations: build migrate
+	${DOCKER_COMPOSE_RUN_WEB} web python -Wa manage.py test --failfast api
+
 shell:
 	${DOCKER_COMPOSE_RUN_WEB} web ash
 

README.md

@@ -8,14 +8,14 @@ Only superusers could change wallet balance.
 
 ## Requirements
 
+### Old docker implementations
+
 * docker engine >= 19.03.
 * docker-compose >= 1.27.
 
-## Tested on
+### New docker with docker-compose integrated
 
-* Ubuntu 18.04 (Bionic).
-* docker engine == 20.10.9.
-* docker-compose == 1.28.4.
+* docker version >= 28.3.3
 
 ## How to use this project?
 
@@ -69,20 +69,20 @@ make loaddata
 make tests
 ```
 
-### Using docker-compose
+### Using docker compose
 
 #### Step 1: Build
 
 ```shell
-docker-compose -p django_atomic_transactions -f environment/docker-compose.yml build
+docker compose -p django_atomic_transactions -f environment/docker compose.yml build
 ```
 
 #### Step 2: Migrate
 
 Apply django migrations:
 
 ```shell
-docker-compose -p django_atomic_transactions -f environment/docker-compose.yml run --rm --service-ports web migrate
+docker compose -p django_atomic_transactions -f environment/docker compose.yml run --rm --service-ports web migrate
 ```
 
 #### Step 3: Run service
@@ -92,29 +92,29 @@ docker-compose -p django_atomic_transactions -f environment/docker-compose.yml r
 Run django runserver command:
 
 ```shell
-docker-compose -p django_atomic_transactions -f environment/docker-compose.yml run --rm --service-ports web dev
+docker compose -p django_atomic_transactions -f environment/docker compose.yml run --rm --service-ports web dev
 ```
 
 * **Uvicorn**
 
 Run uvicorn server:
 
 ```shell
-docker-compose -p django_atomic_transactions -f environment/docker-compose.yml run --rm --service-ports web uvicorn
+docker compose -p django_atomic_transactions -f environment/docker compose.yml run --rm --service-ports web uvicorn
 ```
 
 #### Step 4: Load sample data
 
 Apply `initial_data.json` fixture. This action will erase all previous data:
 
 ```shell
-docker-compose -p django_atomic_transactions -f environment/docker-compose.yml run --rm --service-ports web loaddata
+docker compose -p django_atomic_transactions -f environment/docker compose.yml run --rm --service-ports web loaddata
 ```
 
 #### Step 5: Run tests
 
 ```shell
-docker-compose -p django_atomic_transactions -f environment/docker-compose.yml run --rm --service-ports web python manage.py test --failfast api
+docker compose -p django_atomic_transactions -f environment/docker compose.yml run --rm --service-ports web python manage.py test --failfast api
 ```
 
 ## Know issues
@@ -154,4 +154,4 @@ This will improve performance.
 ...
 
 Are you here yet? OK, nice one. I should invite you to a cup of coffee.
-Just give me your wallet username and password to get in touch hehehe (yep, a simple joke).
+Just give me your wallet username and password to get in touch hehehe (yep, a silly joke).

src/api/serializers.py

@@ -26,7 +26,9 @@ class ClientAccountSerializer(serializers.ModelSerializer):
 
     def __init__(self, instance=None, data=empty, **kwargs):
         super().__init__(instance, data, **kwargs)
-        if self.context.get('request').user.is_staff:
+        request = self.context.get('request')
+
+        if request and request.user.is_staff:
             self.Meta.exclude = ()
         else:
             self.Meta.exclude = ('user_account',)

src/api/tests.py

@@ -1,15 +1,14 @@
-from typing import Optional, List
-
 import re
+from typing import List, Optional
+
 from django.contrib.auth.models import User
 from django.test import TransactionTestCase
+from faker import Faker
 from rest_framework.reverse import reverse
 from rest_framework.test import APITestCase
 
 from api.models import ClientAccount, ClientWallet, ClientWalletTransaction
 
-from faker import Faker
-
 
 # api.tests.ClientAccountApiTests.test_create_regular_user_and_sign_in
 class CommonApiTests(APITestCase):
@@ -31,11 +30,6 @@ def create_user_auth(
         user.save()
         return user
 
-        # group, is_created = Group.objects.get_or_create(name='testgroup')
-        # user.groups.add(group)
-        # for perm in Permission.objects.all():
-        #     group.permissions.add(perm)
-
     def create_client_account(
         self, name: Optional[str] = default_user_username,
         surname: Optional[str] = default_user_username,
@@ -62,18 +56,6 @@ def create_client_transaction(
             amount=amount,
             client_wallet_account=client_wallet, **kwargs
         )
-    # def create_user_auth(cls):
-    #     user, is_created = User.objects.get_or_create(username='testuser')
-    #     user.set_password('aaa')
-    #     user.is_staff = True
-    #     user.is_active = True
-    #     user.is_superuser = True
-    #     user.save()
-    #
-    #     group, is_created = Group.objects.get_or_create(name='testgroup')
-    #     user.groups.add(group)
-    #     for perm in Permission.objects.all():
-    #         group.permissions.add(perm)
 
     def set_url(self, name: str, kwargs: object = None) -> None:
         self.url = reverse(name, kwargs=kwargs)
@@ -128,7 +110,11 @@ def test_create_regular_user_and_sign_in(self):
         self.set_url('api:user_api-list')
         response = self.client.post(self.url, data=payload, format='json')
         self.assertEqual(201, response.status_code)
-        self.assertDictContainsSubset(response_data, response.json())
+
+        response_data_unique_items = set(response_data.items())
+        response_json_unique_items = set(response.json().items())
+        self.assertTrue(response_data_unique_items.issubset(response_json_unique_items))
+
         self.assertTrue(
             self.client.login(username=payload.get('username'), password=payload.get('password')),
             msg='Login error'
@@ -151,7 +137,11 @@ def test_create_staff_user_and_sign_in(self):
         self.set_url('api:user_api-list')
         response = self.client.post(self.url, data=payload, format='json')
         self.assertEqual(201, response.status_code)
-        self.assertDictContainsSubset(response_data, response.json())
+
+        response_data_unique_items = set(response_data.items())
+        response_json_unique_items = set(response.json().items())
+        self.assertTrue(response_data_unique_items.issubset(response_json_unique_items))
+
         self.assertTrue(
             self.client.login(username=payload.get('username'), password=payload.get('password')),
             msg='Login error'
@@ -183,7 +173,10 @@ def test_update_regular_user(self):
         self.set_url('api:user_api-detail', kwargs=api_url_params)
         response = self.client.patch(self.url, data=payload, format='json')
         self.assertEqual(200, response.status_code)
-        self.assertDictContainsSubset(response_data, response.json())
+
+        response_data_unique_items = set(response_data.items())
+        response_json_unique_items = set(response.json().items())
+        self.assertTrue(response_data_unique_items.issubset(response_json_unique_items))
 
     def test_update_staff_user(self):
         username_password = self.fake.unique.name().lower().replace(' ', '_')
@@ -212,7 +205,10 @@ def test_update_staff_user(self):
 
         response = self.client.patch(self.url, data=payload, format='json')
         self.assertEqual(200, response.status_code)
-        self.assertDictContainsSubset(response_data, response.json())
+
+        response_data_unique_items = set(response_data.items())
+        response_json_unique_items = set(response.json().items())
+        self.assertTrue(response_data_unique_items.issubset(response_json_unique_items))
 
 
 class ClientAccountApiTests(CommonApiTests):
@@ -261,7 +257,11 @@ def test_create_as_regular_user(self):
         self.set_url('api:client_api-list')
         response = self.client.post(self.url, data=payload, format='json')
         self.assertEqual(201, response.status_code)
-        self.assertDictContainsSubset(payload, response.json())
+
+        payload_unique_items = set(payload.items())
+        response_json_unique_items = set(response.json().items())
+        self.assertTrue(payload_unique_items.issubset(response_json_unique_items))
+
         self.assertTrue(ClientAccount.objects.get(user_account=user.id))
         self.client.logout()
 
@@ -283,7 +283,11 @@ def test_create_a_regular_user_as_staff_user(self):
         self.set_url('api:client_api-list')
         response = self.client.post(self.url, data=payload, format='json')
         self.assertEqual(201, response.status_code)
-        self.assertDictContainsSubset(payload, response.json())
+
+        payload_unique_items = set(payload.items())
+        response_json_unique_items = set(response.json().items())
+        self.assertTrue(payload_unique_items.issubset(response_json_unique_items))
+
         self.client.logout()
 
     def test_partial_update(self):
@@ -298,7 +302,11 @@ def test_partial_update(self):
         self.set_url('api:client_api-detail', kwargs=api_url_params)
         response = self.client.patch(self.url, data=payload, format='json')
         self.assertEqual(200, response.status_code)
-        self.assertDictContainsSubset(payload, response.json())
+
+        payload_unique_items = set(payload.items())
+        response_json_unique_items = set(response.json().items())
+        self.assertTrue(payload_unique_items.issubset(response_json_unique_items))
+
         self.client.logout()
 
     def test_staff_updates_regular_user_account(self):
@@ -313,7 +321,11 @@ def test_staff_updates_regular_user_account(self):
         self.set_url('api:client_api-detail', kwargs=api_url_params)
         response = self.client.patch(self.url, data=payload, format='json')
         self.assertEqual(200, response.status_code)
-        self.assertDictContainsSubset(payload, response.json())
+
+        payload_unique_items = set(payload.items())
+        response_json_unique_items = set(response.json().items())
+        self.assertTrue(payload_unique_items.issubset(response_json_unique_items))
+
         self.client.logout()
 
     def test_regular_user_can_not_update_staff_account(self):
@@ -418,7 +430,11 @@ def test_create_regular_user_wallets_as_regular_user(self):
             self.set_url(f'{self.api_reverse_url}-list')
             response = self.client.post(self.url, data=payload, format='json')
             self.assertEqual(201, response.status_code)
-            self.assertDictContainsSubset(response_data, response.json())
+
+        response_data_unique_items = set(response_data.items())
+        response_json_unique_items = set(response.json().items())
+        self.assertTrue(response_data_unique_items.issubset(response_json_unique_items))
+
         print(f'{num_iterations} wallets done')
         self.client.logout()
 
@@ -464,7 +480,11 @@ def test_create_regular_user_wallets_as_staff_user(self):
             self.set_url(f'{self.api_reverse_url}-list')
             response = self.client.post(self.url, data=payload, format='json')
             self.assertEqual(201, response.status_code)
-            self.assertDictContainsSubset(response_data, response.json())
+
+        response_data_unique_items = set(response_data.items())
+        response_json_unique_items = set(response.json().items())
+        self.assertTrue(response_data_unique_items.issubset(response_json_unique_items))
+
         print(f'{num_iterations} transactions done')
         self.client.logout()
 
@@ -494,7 +514,11 @@ def test_create_staff_user_wallets_as_staff_user(self):
             self.set_url(f'{self.api_reverse_url}-list')
             response = self.client.post(self.url, data=payload, format='json')
             self.assertEqual(201, response.status_code)
-            self.assertDictContainsSubset(response_data, response.json())
+
+        response_data_unique_items = set(response_data.items())
+        response_json_unique_items = set(response.json().items())
+        self.assertTrue(response_data_unique_items.issubset(response_json_unique_items))
+
         print(f'{num_iterations} transactions done')
         self.client.logout()
 
@@ -660,7 +684,11 @@ def test_create_regular_user_transactions_as_regular_user(self):
             self.set_url('api:client_wallet_transaction_api-list')
             response = self.client.post(self.url, data=payload, format='json')
             self.assertEqual(201, response.status_code)
-            self.assertDictContainsSubset(response_data, response.json())
+
+        response_data_unique_items = set(response_data.items())
+        response_json_unique_items = set(response.json().items())
+        self.assertTrue(response_data_unique_items.issubset(response_json_unique_items))
+
         print(f'{num_iterations} transactions done')
         self.client.logout()
 
@@ -720,7 +748,11 @@ def test_create_regular_user_transactions_as_staff_user(self):
             self.set_url('api:client_wallet_transaction_api-list')
             response = self.client.post(self.url, data=payload, format='json')
             self.assertEqual(201, response.status_code)
-            self.assertDictContainsSubset(response_data, response.json())
+
+        response_data_unique_items = set(response_data.items())
+        response_json_unique_items = set(response.json().items())
+        self.assertTrue(response_data_unique_items.issubset(response_json_unique_items))
+
         print(f'{num_iterations} transactions done')
         self.client.logout()
 
@@ -760,7 +792,11 @@ def test_create_staff_user_transactions_as_staff_user(self):
             self.set_url('api:client_wallet_transaction_api-list')
             response = self.client.post(self.url, data=payload, format='json')
             self.assertEqual(201, response.status_code)
-            self.assertDictContainsSubset(response_data, response.json())
+
+        response_data_unique_items = set(response_data.items())
+        response_json_unique_items = set(response.json().items())
+        self.assertTrue(response_data_unique_items.issubset(response_json_unique_items))
+
         print(f'{num_iterations} transactions done')
         self.client.logout()