Merge pull request #14 from MohamedHamed12/account

Account
MohamedHamed12 · May 11, 2024 · d403afc · d403afc
2 parents 1d03652 + b32152a
commit d403afc
Show file tree

Hide file tree

Showing 31 changed files with 106 additions and 254 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -16,7 +16,10 @@
             ],
             "django": true,
             "autoStartBrowser": false,
-            "program": "${workspaceFolder}/project/manage.py"
+            "program": "${workspaceFolder}/project/manage.py",
+            "console": "integratedTerminal",
+            // show my code only false
+            // "justMyCode": false
         }
     ]
 }
diff --git a/project/accounts/filters/__init__.py b/project/accounts/filters/__init__.py
@@ -21,6 +21,17 @@ class Meta:
 
 
         }
+
+class UserImageFilter(filters.FilterSet):
+    class Meta:
+        model = UserImage
+        fields = {
+            'user_id': ['exact'],
+        }
+
+
+
+
 class DoctorFilter(filters.FilterSet):
     class Meta:
         model = Doctor

diff --git a/project/accounts/migrations/0001_initial.py b/project/accounts/migrations/0001_initial.py
@@ -1,7 +1,6 @@
-# Generated by Django 5.0.3 on 2024-05-07 13:39
+# Generated by Django 5.0.3 on 2024-05-11 14:42
 
 import django.db.models.deletion
-import shortuuidfield.fields
 from django.conf import settings
 from django.db import migrations, models
 
@@ -29,24 +28,30 @@ class Migration(migrations.Migration):
                 ),
                 ("full_name", models.CharField(max_length=255)),
                 ("email", models.CharField(max_length=255, null=True, unique=True)),
-                ("gender", models.CharField(max_length=255)),
+                ("gender", models.CharField(blank=True, max_length=255, null=True)),
                 (
                     "marital_status",
                     models.CharField(blank=True, max_length=255, null=True),
                 ),
                 ("nationality", models.CharField(default="Egypt", max_length=255)),
-                ("national_id", models.CharField(max_length=255)),
+                ("national_id", models.CharField(max_length=255, unique=True)),
                 ("date_of_birth", models.DateField(blank=True, null=True)),
-                ("notes", models.TextField(blank=True)),
-                ("address", models.JSONField()),
-                ("phone", models.JSONField()),
+                ("notes", models.TextField(blank=True, null=True)),
+                ("address", models.JSONField(blank=True, null=True)),
+                ("phone", models.JSONField(blank=True, null=True)),
                 ("is_deleted", models.BooleanField(default=False)),
                 ("created_at", models.DateTimeField(auto_now_add=True)),
                 ("updated_at", models.DateTimeField(auto_now=True)),
                 ("speciality", models.CharField(max_length=255)),
-                ("license_number", models.CharField(max_length=255)),
-                ("experience_years", models.PositiveIntegerField()),
-                ("work_days", models.CharField(max_length=255)),
+                (
+                    "license_number",
+                    models.CharField(blank=True, max_length=255, null=True),
+                ),
+                (
+                    "experience_years",
+                    models.PositiveIntegerField(blank=True, null=True),
+                ),
+                ("work_days", models.CharField(blank=True, max_length=255, null=True)),
                 (
                     "user",
                     models.OneToOneField(
@@ -74,17 +79,17 @@ class Migration(migrations.Migration):
                 ),
                 ("full_name", models.CharField(max_length=255)),
                 ("email", models.CharField(max_length=255, null=True, unique=True)),
-                ("gender", models.CharField(max_length=255)),
+                ("gender", models.CharField(blank=True, max_length=255, null=True)),
                 (
                     "marital_status",
                     models.CharField(blank=True, max_length=255, null=True),
                 ),
                 ("nationality", models.CharField(default="Egypt", max_length=255)),
-                ("national_id", models.CharField(max_length=255)),
+                ("national_id", models.CharField(max_length=255, unique=True)),
                 ("date_of_birth", models.DateField(blank=True, null=True)),
-                ("notes", models.TextField(blank=True)),
-                ("address", models.JSONField()),
-                ("phone", models.JSONField()),
+                ("notes", models.TextField(blank=True, null=True)),
+                ("address", models.JSONField(blank=True, null=True)),
+                ("phone", models.JSONField(blank=True, null=True)),
                 ("is_deleted", models.BooleanField(default=False)),
                 ("created_at", models.DateTimeField(auto_now_add=True)),
                 ("updated_at", models.DateTimeField(auto_now=True)),
@@ -115,28 +120,25 @@ class Migration(migrations.Migration):
                 ),
                 ("full_name", models.CharField(max_length=255)),
                 ("email", models.CharField(max_length=255, null=True, unique=True)),
-                ("gender", models.CharField(max_length=255)),
+                ("gender", models.CharField(blank=True, max_length=255, null=True)),
                 (
                     "marital_status",
                     models.CharField(blank=True, max_length=255, null=True),
                 ),
                 ("nationality", models.CharField(default="Egypt", max_length=255)),
-                ("national_id", models.CharField(max_length=255)),
+                ("national_id", models.CharField(max_length=255, unique=True)),
                 ("date_of_birth", models.DateField(blank=True, null=True)),
-                ("notes", models.TextField(blank=True)),
-                ("address", models.JSONField()),
-                ("phone", models.JSONField()),
+                ("notes", models.TextField(blank=True, null=True)),
+                ("address", models.JSONField(blank=True, null=True)),
+                ("phone", models.JSONField(blank=True, null=True)),
                 ("is_deleted", models.BooleanField(default=False)),
                 ("created_at", models.DateTimeField(auto_now_add=True)),
                 ("updated_at", models.DateTimeField(auto_now=True)),
-                ("disease_type", models.CharField(max_length=255)),
-                ("blood_type", models.CharField(max_length=255)),
                 (
-                    "code",
-                    shortuuidfield.fields.ShortUUIDField(
-                        blank=True, editable=False, max_length=22, unique=True
-                    ),
+                    "disease_type",
+                    models.CharField(blank=True, max_length=255, null=True),
                 ),
+                ("blood_type", models.CharField(blank=True, max_length=255, null=True)),
                 (
                     "user",
                     models.OneToOneField(
@@ -168,9 +170,9 @@ class Migration(migrations.Migration):
                 ("is_deleted", models.BooleanField(default=False)),
                 (
                     "user",
-                    models.ForeignKey(
+                    models.OneToOneField(
                         on_delete=django.db.models.deletion.CASCADE,
-                        related_name="images",
+                        related_name="image",
                         to=settings.AUTH_USER_MODEL,
                     ),
                 ),

diff --git a/project/accounts/migrations/0002_alter_doctor_address_alter_doctor_phone_and_more.py b/project/accounts/migrations/0002_alter_doctor_address_alter_doctor_phone_and_more.py
diff --git a/project/accounts/migrations/0003_alter_doctor_gender_alter_doctor_notes_and_more.py b/project/accounts/migrations/0003_alter_doctor_gender_alter_doctor_notes_and_more.py
diff --git a/project/accounts/migrations/0004_remove_patient_code.py b/project/accounts/migrations/0004_remove_patient_code.py
diff --git a/project/accounts/migrations/0005_alter_doctor_experience_years_and_more.py b/project/accounts/migrations/0005_alter_doctor_experience_years_and_more.py
diff --git a/project/accounts/models/models.py b/project/accounts/models/models.py
@@ -17,7 +17,7 @@ class Profile(models.Model):
     gender = models.CharField(max_length=255, null=True,blank=True)
     marital_status = models.CharField(max_length=255 ,null=True,blank=True)
     nationality = models.CharField(max_length=255 ,default="Egypt")
-    national_id= models.CharField(max_length=255)
+    national_id= models.CharField(max_length=255 ,unique=True)
     date_of_birth = models.DateField(blank=True, null=True)
     notes= models.TextField(blank=True,null=True)
     address = models.JSONField(null=True, blank=True)

diff --git a/project/accounts/models/patient.py b/project/accounts/models/patient.py
@@ -2,7 +2,7 @@
 class UserImage(models.Model):
     image = models.ImageField(upload_to='user_images' )
     # user = models.OneToOneField(User, on_delete=models.CASCADE ,related_name='user_images' )
-    user = models.ForeignKey(User, on_delete=models.CASCADE ,related_name='images' )
+    user = models.OneToOneField(User, on_delete=models.CASCADE ,related_name='image' )
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
     is_deleted = models.BooleanField(default=False)

diff --git a/project/accounts/serializers/patient.py b/project/accounts/serializers/patient.py
@@ -23,7 +23,7 @@ class Meta:
 
 class PatientSerializer(serializers.ModelSerializer):
 
-    image = UserImageSerializer(many=True, read_only=True, source='user.images')
+    image = UserImageSerializer( read_only=True, source='user.image')
     address =AddressSerializer( required=False)
     phone=PhoneSerializer(PhoneSerializer,required=False)
     class Meta:

diff --git a/project/accounts/tests/test_patient.py b/project/accounts/tests/test_patient.py
@@ -239,6 +239,12 @@ def test_create_patient(self):
             url, obj, HTTP_AUTHORIZATION='Bearer ' + self.staff_token )
 
         self.assertEqual(response.status_code, 201)
+
+        response = self.client.get(
+            '/accounts/user-image/?user_id='+str(user.id), format='json', HTTP_AUTHORIZATION='Bearer ' + self.staff_token)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.data), 1)
+
         # remvove image
         os.remove("test_image.jpg")
 

diff --git a/project/accounts/views/doctor.py b/project/accounts/views/doctor.py
@@ -31,11 +31,13 @@ class DoctorViewSet(viewsets.ModelViewSet):
 
 
     def create(self , request, *args, **kwargs):
-        msg,user=create_user(request.data)
-        if msg!="created":
-            return Response(msg,status=status.HTTP_400_BAD_REQUEST)
-
-        request.data.update({'user':user.id})
+        serializer = DoctorSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        doctor=serializer.save()
+
+        user=User.objects.create_user(username=serializer.data['national_id'],password=serializer.data['national_id'])
+        doctor.user=user
+        doctor.save()
 
-        return super().create(request, *args, **kwargs) 
+        return Response(DoctorSerializer(doctor).data, status=status.HTTP_201_CREATED)
 
diff --git a/project/accounts/views/employee.py b/project/accounts/views/employee.py
@@ -21,7 +21,16 @@ class EmployeeViewSet(viewsets.ModelViewSet):
     queryset = Employee.objects.all()
     serializer_class = EmployeeSerializer
     permission_classes = [OwnPermission]
-
+    def create(self , request, *args, **kwargs):
+        serializer = EmployeeSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        employee=serializer.save()
+
+        user=User.objects.create_user(username=serializer.data['national_id'],password=serializer.data['national_id'])
+        employee.user=user
+        employee.save()
+
+        return Response(EmployeeSerializer(employee).data, status=status.HTTP_201_CREATED)