Yaseen

Dockerfile

@@ -1,4 +1,3 @@
-# Python version
 FROM python:3
 
 # Set environment variables

accounts/admin.py

@@ -1,3 +1,6 @@
+
 from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
+from .models import CustomUser
 
-# Register your models here.
+admin.site.register(CustomUser)

accounts/migrations/0001_initial.py

@@ -1,8 +1,8 @@
-# Generated by Django 4.0 on 2021-12-30 12:59
+# Generated by Django 4.0 on 2022-01-02 14:55
 
 import django.contrib.auth.models
+import django.contrib.auth.validators
 from django.db import migrations, models
-import django.db.models.deletion
 import phone_field.models
 
 
@@ -16,23 +16,37 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Account',
+            name='CustomUser',
             fields=[
-                ('user_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='auth.user')),
-                ('age', models.IntegerField()),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
+                ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
+                ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
+                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
+                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
+                ('date_joined', models.DateField(auto_now_add=True)),
+                ('roles', models.CharField(choices=[('Donater', 'Donater'), ('hospital', 'hospital'), ('Blood needer', 'Blood needer')], max_length=50, null=True)),
                 ('blood_type', models.CharField(blank=True, max_length=10, null=True)),
                 ('chronic_diseases', models.BooleanField(blank=True, default=False, null=True)),
-                ('image', models.ImageField(upload_to='image')),
-                ('data', models.DateField(blank=True, null=True)),
-                ('isAuthenticated', models.BooleanField(default=True)),
+                ('image', models.ImageField(default='../uploads/image/320.png', upload_to='image')),
+                ('date', models.DateField(blank=True, default='2022-01-01', null=True)),
                 ('phone_number', phone_field.models.PhoneField(blank=True, help_text='Contact phone number', max_length=31)),
+                ('location', models.CharField(blank=True, max_length=50, null=True)),
+                ('donate', models.BooleanField(default=False)),
+                ('age', models.IntegerField(blank=True, null=True)),
+                ('website', models.CharField(blank=True, max_length=256, null=True)),
+                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
+                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
             ],
             options={
                 'verbose_name': 'user',
                 'verbose_name_plural': 'users',
                 'abstract': False,
             },
-            bases=('auth.user',),
             managers=[
                 ('objects', django.contrib.auth.models.UserManager()),
             ],

hospital/migrations/0003_alter_customuser_image.py → accounts/migrations/0002_alter_customuser_phone_number.py

@@ -1,18 +1,18 @@
-# Generated by Django 4.0 on 2021-12-30 19:40
+# Generated by Django 4.0 on 2022-01-02 14:58
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('hospital', '0002_customuser_image'),
+        ('accounts', '0001_initial'),
     ]
 
     operations = [
         migrations.AlterField(
             model_name='customuser',
-            name='image',
-            field=models.ImageField(upload_to='image'),
+            name='phone_number',
+            field=models.CharField(blank=True, help_text='Contact phone number', max_length=20),
         ),
     ]

accounts/migrations/0003_remove_customuser_donate_alter_customuser_roles.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.0 on 2022-01-02 15:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0002_alter_customuser_phone_number'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='customuser',
+            name='donate',
+        ),
+        migrations.AlterField(
+            model_name='customuser',
+            name='roles',
+            field=models.CharField(blank=True, choices=[('Donater', 'Donater'), ('hospital', 'hospital'), ('Blood needer', 'Blood needer')], max_length=50, null=True),
+        ),
+    ]

accounts/migrations/0004_remove_customuser_age_customuser_date_of_birth.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.0 on 2022-01-02 16:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0003_remove_customuser_donate_alter_customuser_roles'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='customuser',
+            name='age',
+        ),
+        migrations.AddField(
+            model_name='customuser',
+            name='date_of_birth',
+            field=models.DateField(blank=True, default='2000-01-01', null=True),
+        ),
+    ]

accounts/models.py

@@ -1,16 +1,27 @@
 from django.db import models
-from django.contrib.auth.models import User,Group
-from phone_field import PhoneField
-# Create your models here.
-class Account(User):
-    age = models.IntegerField(null=True)
+from django.contrib.auth.models import AbstractUser
+
+class CustomUser(AbstractUser):
+    ROLES = (
+
+        ('Donater', 'Donater'),
+        ('hospital', 'hospital'),
+        ("Blood needer","Blood needer")
+
+    )
+
+    date_joined = models.DateField(auto_now_add=True)
+    roles = models.CharField(max_length=50, choices = ROLES, null=True,blank=True)
     blood_type = models.CharField(max_length=10 ,blank=True,null=True)
     chronic_diseases = models.BooleanField(default=False,blank=True,null=True)
-    image = models.ImageField(upload_to = 'image')
-    data = models.DateField(blank=True,null=True)
-    isAuthenticated = models.BooleanField(default=True)
-    phone_number = PhoneField(blank=True, help_text='Contact phone number')
-    group = models.ForeignKey(Group, related_name="boes", on_delete=models.CASCADE)
+    image = models.ImageField(upload_to = 'image',default='../uploads/image/320.png')
+    date = models.DateField(blank=True,null=True,default='2022-01-01')
+    phone_number = models.CharField(max_length=20,blank=True, help_text='Contact phone number')
     location = models.CharField(max_length=50,blank=True,null=True)
-    donate = models.BooleanField(default=False)
+    date_of_birth = models.DateField(blank=True,null=True,default='2000-01-01')
+    website = models.CharField(max_length=256 ,blank=True,null=True)
+    def __str__(self):
+        return self.username
+
+
 

accounts/serializer.py

@@ -1,37 +1,51 @@
 from django.db.models import fields
 from rest_framework import serializers
-from .models import Account
+from .models import CustomUser
 from rest_framework_simplejwt.serializers import TokenObtainPairSerializer
 
-class AddSerializer(serializers.ModelSerializer):
+class AddDonaterSerializer(serializers.ModelSerializer):
     password = serializers.CharField(write_only=True)
 
     def create(self, validated_data):
 
-        user = Account.objects.create_user(
+        user = CustomUser.objects.create_user(
             username=validated_data['username'],
             password=validated_data['password'],
-            age=validated_data['age'],
-            group = validated_data['group'],
+            blood_type = validated_data['blood_type'],
+            first_name = validated_data['first_name'],
+            email = validated_data['email'],
+            roles = validated_data['roles']
+        )
+
+        return user
+
+    class Meta:
+        model = CustomUser
+        fields = ('username','password','first_name','email','blood_type','roles'
+        )
+
+class EditDonaterSerializer(serializers.ModelSerializer):
+     def create(self, validated_data):
+
+        user = CustomUser.objects.create_user(
+            username=validated_data['username'],
+            date_of_birth=validated_data['date_of_birth'],
             blood_type = validated_data['blood_type'],
             chronic_diseases = validated_data['chronic_diseases'],
-            data = validated_data['data'],
+            date = validated_data['date'],
             phone_number = validated_data['phone_number'],
             first_name = validated_data['first_name'],
-            last_name = validated_data['last_name'],
             email = validated_data['email'],
             location = validated_data['location'],
-            donate = validated_data['donate'],
-            image = validated_data['image']
+            image = validated_data['image'],
+
         )
 
         return user
-
-    class Meta:
-        model = Account
-        fields = ('id','first_name','last_name','username',
-        'email','password','age','blood_type','phone_number','location',
-        'chronic_diseases','data','donate','group','image'
+     class Meta:
+        model = CustomUser
+        fields = ('username','first_name','email','date_of_birth','image','location','phone_number'
+        ,'date','chronic_diseases','blood_type','date'
         )
 
 class MyTokenObtainPairSerializer(TokenObtainPairSerializer):
@@ -41,9 +55,59 @@ def validate(self, attrs):
         data['refresh'] = str(refresh)
         data['access'] = str(refresh.access_token)
 
-        # Add extra responses here
         data['id'] = self.user.id
         data['username'] = self.user.username
+        data['Role'] = self.user.roles
 
         return data
 
+
+
+## hospital serializer
+
+class AddHospitalUser(serializers.ModelSerializer):
+
+    password = serializers.CharField(write_only=True)
+    # website = serializers.CharField(write_only=True)
+
+    def create(self, validated_data):
+
+        user = CustomUser.objects.create_user(
+            first_name = validated_data['first_name'],
+            username=validated_data['username'],
+            password=validated_data['password'],
+            website = validated_data['website'],
+            email = validated_data['email'],
+            roles =  validated_data['roles']
+        )
+
+        return user
+
+    class Meta:
+        model = CustomUser
+        # Tuple of serialized model fields (see link [2])
+        fields = ( "first_name","username", "password", "website",'email','roles' )
+
+
+class EditHospitalUser(serializers.ModelSerializer):
+
+    password = serializers.CharField(write_only=True)
+    # website = serializers.CharField(write_only=True)
+
+    def create(self, validated_data):
+
+        user = CustomUser.objects.create_user(
+            first_name = validated_data['first_name'],
+            username=validated_data['username'],
+            password=validated_data['password'],
+            website = validated_data['website'],
+            image = validated_data['image'],
+            email = validated_data['email'],
+        )
+
+        return user
+
+    class Meta:
+        model = CustomUser
+        # Tuple of serialized model fields (see link [2])
+        fields = ( "first_name","username", "password", "website",'email','image' )

accounts/urls.py

@@ -1,9 +1,14 @@
 from django.urls import path
-from .views import AddListView,DetailAddView,ListView,CustomObtainAuthToken
+from .views import AddListView,DetailAddView,ListView,CustomObtainAuthToken,countview,CreateHospitalUserView,HospitalDetail,HospitalListView,counthospitalview
 
 urlpatterns = [
-    path('signup',AddListView.as_view(),name= 'add_data'),
-    path('<str:username>',DetailAddView.as_view(),name = 'detail_data'),
-    path("auth/", CustomObtainAuthToken.as_view()),
-    path('view',ListView.as_view(),name = 'list_data')
+    path('donater/signup/',AddListView.as_view(),name= 'add_data'),
+    path('donater/<int:pk>/',DetailAddView.as_view(),name = 'detail_data'),
+    path("donater/auth/", CustomObtainAuthToken.as_view()),
+    path('donater/view/',ListView.as_view(),name = 'list_data'),
+    path('donater/count/',countview.as_view(),name = 'countview'),
+    path('hospital/signup/', CreateHospitalUserView.as_view(), name='signup'),
+    path("hospital/<int:pk>/", HospitalDetail.as_view(), name="hospital_detail"),
+    path("hospital/view/", HospitalListView.as_view(), name="hospital_list"),
+    path('hospital/count/',counthospitalview.as_view(),name = 'counthospitalview'),
 ]