Merge pull request #298 from bounswe/backend/feature/refactor-#297

[Backend] Code Refactor
bounswe · Nov 19, 2022 · 3dd5287 · 3dd5287
2 parents b67bb31 + 838ef0d
commit 3dd5287
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/app/backend/authentication/models.py b/app/backend/authentication/models.py
diff --git a/app/backend/authentication/serializers.py b/app/backend/authentication/serializers.py
@@ -21,8 +21,8 @@ def create(self, validated_data):
 class RegistrationSerializer(serializers.ModelSerializer):
 
     email = serializers.EmailField(
-            required=True,
-            validators=[UniqueValidator(queryset=User.objects.all())]
+                required=True,
+                validators=[UniqueValidator(queryset=User.objects.all())]
             )
 
     password = serializers.CharField(write_only=True, required=True, validators=[validate_password])

diff --git a/app/backend/backend/utils.py b/app/backend/backend/utils.py
diff --git a/app/backend/tests/test_models.py b/app/backend/tests/test_models.py
@@ -7,12 +7,20 @@
 
 from tests.constants import *
 
+import django.contrib.auth.hashers
+
+def make_password(password):
+    assert password
+    return django.contrib.auth.hashers.make_password(
+        password=password
+    )
+
 
 class AdminTestCase(TestCase):
     def createAdmin(self):
         models.CustomAdmin.objects.create(
             email=TEST_ADMIN_EMAIL,
-            password=utils.make_password(TEST_PASSWORD),
+            password=make_password(TEST_PASSWORD),
             type=constants.UserType.ADMIN.value,
             admin_username=TEST_ADMIN_USERNAME
         )
@@ -48,7 +56,7 @@ def createMember(self, email = None, member_username = None):
         )
         return models.Member.objects.create(
             email=TEST_MEMBER_EMAIL if email == None else email,
-            password=utils.make_password(TEST_PASSWORD),
+            password=make_password(TEST_PASSWORD),
             type=constants.UserType.MEMBER.value,
             member_username=TEST_MEMBER_USERNAME if member_username == None else member_username,
             info=member_info
@@ -102,7 +110,7 @@ class DoctorTestCase(TestCase):
     def createDoctor(self):
         models.Doctor.objects.create(
             email=TEST_DOCTOR_EMAIL,
-            password=utils.make_password(TEST_PASSWORD),
+            password=make_password(TEST_PASSWORD),
             type=constants.UserType.DOCTOR.value,
             full_name=TEST_DOCTOR_FULLNAME,
             hospital_name=TEST_DOCTOR_HOSPITAL_NAME,