Poysa/develop

authentication/api/serializers.py

@@ -16,7 +16,7 @@
 class UserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
-        fields = ('id', 'email', 'password', 'first_name', 'last_name', 'birth_date')
+        fields = ('id', 'email', 'password', 'first_name', 'last_name', 'birth_date', 'phone_number', 'city', 'gender')
         read_only_fields = ['id']
         extra_kwargs = {'password': {'write_only': True}}  # Ensure password field is write-only
 
@@ -27,7 +27,7 @@ def update(self, instance, validated_data):
 class SafeUserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
-        fields = ('id', 'email', 'first_name', 'last_name', 'birth_date')
+        fields = ('id', 'email', 'first_name', 'last_name', 'birth_date', 'city', 'phone_number', 'gender')
         read_only_fields = ['id']
 
 

authentication/migrations/0006_user_city_user_gender_user_phone_number.py

@@ -0,0 +1,29 @@
+# Generated by Django 5.0.3 on 2024-04-23 08:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0005_user_username'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='city',
+            field=models.CharField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='gender',
+            field=models.CharField(choices=[('M', 'Male'), ('F', 'Female')], default='M'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='phone_number',
+            field=models.CharField(blank=True, null=True),
+        ),
+    ]

authentication/migrations/0007_alter_user_gender.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.3 on 2024-04-26 00:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0006_user_city_user_gender_user_phone_number'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='gender',
+            field=models.CharField(blank=True, choices=[('Male', 'Male'), ('Female', 'Female')], null=True),
+        ),
+    ]

authentication/models.py

@@ -8,6 +8,8 @@
 
 from utils.models import DateTimeStampMixin
 
+from .types import GENDER_CHOICES
+
 class CustomUserManager(BaseUserManager):
 
 
@@ -34,6 +36,12 @@ class User(AbstractUser, PermissionsMixin):
     first_name = models.CharField(max_length=150, blank=True, null=True)
     last_name = models.CharField(max_length=150, blank=True, null=True)
     birth_date = models.DateField(null=True, blank=True)
+    phone_number = models.CharField(null=True, blank=True)
+    city = models.CharField(null=True, blank=True)
+    gender = models.CharField(choices=GENDER_CHOICES, blank=True, null=True)
+
+    def get_gender_display(self):
+        return dict(GENDER_CHOICES).get(self.gender)
 
     USERNAME_FIELD = 'email'
     REQUIRED_FIELDS = []

authentication/types.py

@@ -0,0 +1,4 @@
+GENDER_CHOICES = [
+        ('Male', 'Male'),
+        ('Female', 'Female'),
+    ] 

core/settings/development.py

@@ -14,18 +14,18 @@
 DEBUG = True
 
 
-load_dotenv()
+load_dotenv('.env.dev')
 
 
 
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',
-        'NAME': os.getenv('DB_NAME'),
-        'USER': os.getenv('DB_USER'),
-        'PASSWORD': os.getenv('DB_PASS'),
-        'HOST': os.getenv('DB_HOST'),
-        'PORT': os.getenv('DB_PORT'),
+        'NAME': environ.get('DB_NAME'),
+        'USER': "godsword",
+        'PASSWORD': "coolpass",
+        'HOST': environ.get('DB_HOST'),
+        'PORT': environ.get('DB_PORT'),
         'TEST':{
             'NAME': "madaurus_test",
             'USER': 'postgres',
@@ -42,4 +42,16 @@
 #         "ENGINE": "django.db.backends.sqlite3",
 #         "NAME": BASE_DIR / "db.sqlite3",
 #     }
-# }
+# }
+
+
+ALLOWED_HOSTS = ['*']
+
+
+
+
+CORS_ALLOW_ALL_ORIGINS = True
+
+
+
+

docker-compose.yml

@@ -13,15 +13,15 @@ services:
     volumes:
       - ./postgres_data:/var/lib/postgresql/data
 
-  backend:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: django_backend
-    ports:
-      - "8000:8000"
-    depends_on:
-      - postgres
-    env_file:
-      - .env.prod
-    restart: unless-stopped
+  # backend:
+  #   build:
+  #     context: .
+  #     dockerfile: Dockerfile
+  #   container_name: django_backend
+  #   ports:
+  #     - "8000:8000"
+  #   depends_on:
+  #     - postgres
+  #   env_file:
+  #     - .env.prod
+  #   restart: unless-stopped

entrypoint.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 
-python manage.py makemigrations authentication
+python manage.py makemigrations authentication teachers students
 python manage.py makemigrations
 python manage.py migrate
 
-python manage.py runserver 0.0.0.0:8000 --settings=core.settings.production
+python manage.py runserver 0.0.0.0:8000 

students/admin.py

@@ -1,3 +1,9 @@
 from django.contrib import admin
 
+from .models import  Student
 # Register your models here.
+
+
+# admin.site.register(Group)
+# admin.site.register(Promo)
+admin.site.register(Student)

students/api/serializers.py

@@ -2,28 +2,28 @@
 
 from rest_framework import serializers
 
-from students.models import Promo, Group, Student
+from students.models import  Student
 from authentication.api.serializers import UserSerializer, SafeUserSerializer
 
 User = get_user_model()
 
-class PromoSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Promo
-        fields = ['study_year']
+# class PromoSerializer(serializers.ModelSerializer):
+#     class Meta:
+#         model = Promo
+#         fields = ['study_year']
 
 
-class GroupSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Group
-        fields = ['group', 'promo']
+# class GroupSerializer(serializers.ModelSerializer):
+#     class Meta:
+#         model = Group
+#         fields = ['group', 'promo']
 
 class CreateStudentSerializer(serializers.ModelSerializer):
     user = UserSerializer()
 
     class Meta:
         model = Student
-        fields = ['id', 'user', 'group', 'registration_number']
+        fields = ['id', 'user', 'group', 'promo', 'registration_number']
         read_only_fields = ('id',)
 
     def create(self, validated_data):
@@ -36,35 +36,52 @@ def create(self, validated_data):
         else:
             raise serializers.ValidationError("Error creating user")
 
-
 class UpdateStudentSerializer(serializers.ModelSerializer):
-    user_email = serializers.EmailField(source='user.email')
-    user_first_name = serializers.CharField(source='user.first_name')
-    user_last_name = serializers.CharField(source='user.last_name')
-
+    user = SafeUserSerializer()
+
     class Meta:
         model = Student
-        fields = ['user_email', 'user_first_name', 'user_last_name', 'group', 'registration_number']
-
+        fields = ['id', 'user', 'group', 'promo', 'registration_number']
+        read_only_fields = ('id',)
+
     def update(self, instance, validated_data):
-        instance.group = validated_data.get('group', instance.group)
-        instance.registration_number = validated_data.get('registration_number', instance.registration_number)
+        user_data = validated_data.pop('user', None)
+        if user_data:
+            user_instance = instance.user
+            for attr, value in user_data.items():
+                setattr(user_instance, attr, value)
+            user_instance.save()
+        return super().update(instance, validated_data)
+
+
+# class UpdateStudentSerializer(serializers.ModelSerializer):
+#     user_email = serializers.EmailField(source='user.email')
+#     user_first_name = serializers.CharField(source='user.first_name')
+#     user_last_name = serializers.CharField(source='user.last_name')
+
+#     class Meta:
+#         model = Student
+#         fields = ['user_email', 'user_first_name', 'user_last_name',   'group', 'registration_number']
+
+#     def update(self, instance, validated_data):
+#         instance.group = validated_data.get('group', instance.group)
+#         instance.registration_number = validated_data.get('registration_number', instance.registration_number)
 
-        user_data = validated_data.get('user', {})
-        user = instance.user
-        user_email = user_data.get('email')
-        if user_email:
-            user.email = user_email
-        user_first_name = user_data.get('first_name')
-        if user_first_name:
-            user.first_name = user_first_name
-        user_last_name = user_data.get('last_name')
-        if user_last_name:
-            user.last_name = user_last_name
+#         user_data = validated_data.get('user', {})
+#         user = instance.user
+#         user_email = user_data.get('email')
+#         if user_email:
+#             user.email = user_email
+#         user_first_name = user_data.get('first_name')
+#         if user_first_name:
+#             user.first_name = user_first_name
+#         user_last_name = user_data.get('last_name')
+#         if user_last_name:
+#             user.last_name = user_last_name
 
-        user.save()
-        instance.save()
-        return instance
+        # user.save()
+        # instance.save()
+        # return instance
 
 class SafeUserSerializer(serializers.ModelSerializer):
     class Meta:
@@ -76,5 +93,5 @@ class SafeStudentSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Student
-        fields = ['id', 'user', 'group', 'registration_number']
+        fields = ['id', 'user', 'group', 'promo', 'registration_number']
         read_only_fields = ('id',)

students/api/urls.py

@@ -2,13 +2,13 @@
 from rest_framework import routers
 
 
-from .views import PromoViewSet, GroupViewSet, StudentViewSet, CreateManyStudentsView
+from .views import  StudentViewSet, CreateManyStudentsView
 
 router = routers.DefaultRouter()
 
-router.register(r'promos', PromoViewSet)
-router.register(r'groups', GroupViewSet)
-router.register(r'students', StudentViewSet)
+# router.register(r'promos', PromoViewSet)
+# router.register(r'groups', GroupViewSet)
+router.register(r'', StudentViewSet)
 
 
 

students/api/views.py

@@ -3,17 +3,17 @@
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from .serializers import PromoSerializer, GroupSerializer, CreateStudentSerializer, SafeStudentSerializer, UpdateStudentSerializer
-from students.models import Promo, Group, Student
+from .serializers import CreateStudentSerializer, SafeStudentSerializer, UpdateStudentSerializer
+from students.models import Student
 
 
-class PromoViewSet(viewsets.ModelViewSet):
-    queryset = Promo.objects.all()
-    serializer_class = PromoSerializer
+# class PromoViewSet(viewsets.ModelViewSet):
+#     queryset = Promo.objects.all()
+#     serializer_class = PromoSerializer
 
-class GroupViewSet(viewsets.ModelViewSet):
-    queryset = Group.objects.all()
-    serializer_class = GroupSerializer
+# class GroupViewSet(viewsets.ModelViewSet):
+#     queryset = Group.objects.all()
+#     serializer_class = GroupSerializer
 
 
 class StudentViewSet(viewsets.ModelViewSet):
@@ -25,7 +25,7 @@ def get_serializer_class(self):
         if self.action == 'create':
             return CreateStudentSerializer
         elif self.action in ['update', 'partial_update']:
-            return UpdateStudentSerializer  # Assuming you've defined the UpdateStudentSerializer
+            return UpdateStudentSerializer 
         elif self.action == 'list':
             return SafeStudentSerializer
         return self.serializer_class

students/migrations/0004_alter_group_group.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.3 on 2024-04-23 09:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('students', '0003_student_registration_number'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='group',
+            name='group',
+            field=models.CharField(max_length=255),
+        ),
+    ]