From f19e9ee0ed81ab282e7ad7d92fee55e101e01b13 Mon Sep 17 00:00:00 2001 From: Izzet-Agayev Date: Wed, 21 May 2025 23:58:46 +0400 Subject: [PATCH 1/2] Add user model --- .../__pycache__/__init__.cpython-311.pyc | Bin 216 -> 216 bytes .../__pycache__/celery.cpython-311.pyc | Bin 929 -> 929 bytes .../__pycache__/settings.cpython-311.pyc | Bin 3325 -> 3365 bytes .../masters/__pycache__/urls.cpython-311.pyc | Bin 587 -> 587 bytes masters/masters/settings.py | 2 ++ masters/users/admin.py | 10 +++++++++- masters/users/models/__init__.py | 1 + masters/users/models/user_models.py | 16 ++++++++++++++++ 8 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 masters/users/models/user_models.py diff --git a/masters/masters/__pycache__/__init__.cpython-311.pyc b/masters/masters/__pycache__/__init__.cpython-311.pyc index 6821cb68a6923892d389c555309a6fab8329fd56..1169f4112ffa4135f36eb137917986f970675ebe 100644 GIT binary patch delta 19 Zcmcb?c!QC9IWI340}v>e>rCW63ji>B1h@bI delta 19 Zcmcb?c!QC9IWI340}#Aetuc}NEC4nP1+4%8 diff --git a/masters/masters/__pycache__/celery.cpython-311.pyc b/masters/masters/__pycache__/celery.cpython-311.pyc index 99e08c09f9e87a6ebb474555725844fd009a7b00..d046b5db297ed13ad17114f1579fb72f2925a0f6 100644 GIT binary patch delta 20 acmZ3;zL1@JIWI340}v>e>ultn#tZ;0^#noy delta 20 acmZ3;zL1@JIWI340}%A?(b&j6jTrzkWd!X2 diff --git a/masters/masters/__pycache__/settings.cpython-311.pyc b/masters/masters/__pycache__/settings.cpython-311.pyc index cd953dc72e4d0b8474a9398bf778e853b5e2e988..0027d05b6691942c83b1c738ef697a4116e7aac3 100644 GIT binary patch delta 383 zcmew>xm1dGIWI340}vFk>Sc6H$(SNAhb5gcN-#w*N+?ArMR;-mW5wh=M*d)lWsD3AtAQ8-QY7cFWimzyr%0tp z19eHI$bd;%Fe#VGn9dRNfN$|))-s&kko>o6(R zGclwxWO2fcRY$cZN*1V54rqvcibj+IP^BVFr3S%&X zrq)Xk*H4r27E3^4Nd}PS&dEU+7mj}=!P(T#xPd>}Fik(4NzJdP(%jR`Gy>r-R875o7Ipxm7VS_)QBT;)>) zxBh{97lMu0T9CHVM`Z*L~rr}3o!d7daZbK(kIuA(GW8CtY5 zr<735?1b2Z$2HVYx70|Dox-C48fHeJ8Bz)~v#pf44j+N6`8ZhW;Znnt5}O-n@ebO& zi!$#C_tD`dy6huD4@a5B!9V-s1u69^T)}u&bSaCWn6%L6w*1mrH)q{-_BW2U5icw; v5w5@y=voa1`J;78`TNGzCiTpTbDzICXXIYUP;u`rHec>bJ}o_vJ(T(vzeztN diff --git a/masters/masters/__pycache__/urls.cpython-311.pyc b/masters/masters/__pycache__/urls.cpython-311.pyc index 5bcd1a85ceca0b78ceba1f71d04b38209705c973..fb8ef8968b065d7299f7a6f3f98682bba5aaaab6 100644 GIT binary patch delta 20 acmX@ja+-yEIWI340}v>e>ult9U;+R$7z8;0 delta 20 acmX@ja+-yEIWI340}%Z9p|O$Mfe8RR-35yP diff --git a/masters/masters/settings.py b/masters/masters/settings.py index f4005b9d..f0ebfb5a 100644 --- a/masters/masters/settings.py +++ b/masters/masters/settings.py @@ -38,6 +38,8 @@ 'core' ] +AUTH_USER_MODEL = 'users.User' + MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', diff --git a/masters/users/admin.py b/masters/users/admin.py index 8c38f3f3..f83fff47 100644 --- a/masters/users/admin.py +++ b/masters/users/admin.py @@ -1,3 +1,11 @@ from django.contrib import admin -# Register your models here. +from .models.user_models import User + + + +@admin.register(User) +class UserAdmin(admin.ModelAdmin): + list_display = ('id', 'phone_number', 'is_master', 'first_name', 'last_name') + search_fields = ('phone_nnumber',) + list_per_page = 20 diff --git a/masters/users/models/__init__.py b/masters/users/models/__init__.py index e69de29b..06da1598 100644 --- a/masters/users/models/__init__.py +++ b/masters/users/models/__init__.py @@ -0,0 +1 @@ +from .user_models import User \ No newline at end of file diff --git a/masters/users/models/user_models.py b/masters/users/models/user_models.py new file mode 100644 index 00000000..477a2ea4 --- /dev/null +++ b/masters/users/models/user_models.py @@ -0,0 +1,16 @@ +from django.db import models +from django.contrib.auth.models import AbstractUser + + + +# Muveqqeti User model (elaveler edilecek) +class User(AbstractUser): + phone_number = models.CharField(max_length=13, unique=True) + is_master = models.BooleanField() + + USERNAME_FIELD = 'phone_number' + REQUIRED_FIELDS = ['first_name', 'last_name', 'is_master'] + + + def __str__(self): + return self.phone_number \ No newline at end of file From 70bc4ad68598048c21ea6904254eeb6080782d3d Mon Sep 17 00:00:00 2001 From: Izzet-Agayev Date: Thu, 22 May 2025 00:49:41 +0400 Subject: [PATCH 2/2] Add user model --- masters/docker-compose | 0 .../masters/__pycache__/wsgi.cpython-311.pyc | Bin 655 -> 655 bytes masters/users/migrations/0001_initial.py | 46 ++++++++++++++++++ masters/users/migrations/__init__.py | 0 masters/users/models/user_models.py | 2 +- 5 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 masters/docker-compose create mode 100644 masters/users/migrations/0001_initial.py create mode 100644 masters/users/migrations/__init__.py diff --git a/masters/docker-compose b/masters/docker-compose new file mode 100644 index 00000000..e69de29b diff --git a/masters/masters/__pycache__/wsgi.cpython-311.pyc b/masters/masters/__pycache__/wsgi.cpython-311.pyc index e7342b1d55ea8cf854189be8317627cbe701dc26..f69d67665309ba4ff2c0ad9d16dfb629ca5f513c 100644 GIT binary patch delta 20 ZcmeBY?Puj)&dbZi00heAIvcrLm;fr=1P1^B delta 20 acmeBY?Puj)&dbZi00bo~G&XX#FaZEAB?N^4 diff --git a/masters/users/migrations/0001_initial.py b/masters/users/migrations/0001_initial.py new file mode 100644 index 00000000..7d9754ce --- /dev/null +++ b/masters/users/migrations/0001_initial.py @@ -0,0 +1,46 @@ +# Generated by Django 5.2.1 on 2025-05-21 20:48 + +import django.contrib.auth.models +import django.contrib.auth.validators +import django.utils.timezone +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ] + + operations = [ + migrations.CreateModel( + name='User', + fields=[ + ('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.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('phone_number', models.CharField(max_length=13, unique=True)), + ('is_master', models.BooleanField()), + ('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, + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + ] diff --git a/masters/users/migrations/__init__.py b/masters/users/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/masters/users/models/user_models.py b/masters/users/models/user_models.py index 477a2ea4..bf145838 100644 --- a/masters/users/models/user_models.py +++ b/masters/users/models/user_models.py @@ -9,7 +9,7 @@ class User(AbstractUser): is_master = models.BooleanField() USERNAME_FIELD = 'phone_number' - REQUIRED_FIELDS = ['first_name', 'last_name', 'is_master'] + REQUIRED_FIELDS = ['first_name', 'last_name', 'is_master', 'username'] def __str__(self):