sifatbaho/backend-v1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve migrations conflict

Browse Source
This commit is contained in:
Shaxobff
2026-04-25 12:52:15 +05:00
parent 5249f7e6f7 eded642bd7
commit ae65d9d793
13 changed files with 228 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
core/apps/accounts/migrations/0004_permissiontoaction_permissiontotab_permission_role_and_more.py
View File

@@ -1,78 +0,0 @@
# Generated by Django 5.2.7 on 2026-04-24 12:33
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('accounts', '0003_user_avatar'),
]
operations = [
migrations.CreateModel(
name='PermissionToAction',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('name', models.CharField(max_length=200)),
('code', models.CharField(max_length=100, unique=True)),
],
options={
'verbose_name': 'Harakatlar uchun ruxsatnoma',
'verbose_name_plural': 'Harakatlar uchun ruxsatnomalar',
},
),
migrations.CreateModel(
name='PermissionToTab',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('name', models.CharField(max_length=200)),
('code', models.CharField(max_length=100, unique=True)),
('permission_to_actions', models.ManyToManyField(related_name='permission_to_tabs', to='accounts.permissiontoaction')),
],
options={
'verbose_name': "Bo'lim uchun ruxsatnoma",
'verbose_name_plural': "Bo'lim uchun ruxsatnomalar",
},
),
migrations.CreateModel(
name='Permission',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('name', models.CharField(max_length=200)),
('code', models.CharField(max_length=100, unique=True)),
('permission_tab', models.ManyToManyField(related_name='permissions', to='accounts.permissiontotab')),
],
options={
'verbose_name': 'Sahifa uchun ruxsatnoma',
'verbose_name_plural': 'Sahifa uchun ruxsatnomalar',
},
),
migrations.CreateModel(
name='Role',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=200, unique=True)),
('comment', models.CharField(blank=True, max_length=200, null=True)),
('permission_to_actions', models.ManyToManyField(blank=True, related_name='roles', to='accounts.permissiontoaction')),
('permission_to_tabs', models.ManyToManyField(blank=True, related_name='roles', to='accounts.permissiontotab')),
('permissions', models.ManyToManyField(blank=True, related_name='roles', to='accounts.permission')),
],
options={
'verbose_name': 'Rol',
'verbose_name_plural': 'Rollar',
},
),
migrations.AddField(
model_name='user',
name='permission',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='accounts.role'),
),
]

2
core/apps/accounts/models/user.py
View File

@@ -18,7 +18,7 @@ class User(auth_models.AbstractUser):
default=RoleChoice.USER,
)
avatar = models.ImageField(upload_to="avatars/", null=True, blank=True)
permission = models.ForeignKey(Role, on_delete=models.SET_NULL, null=True)
permission = models.ForeignKey(Role, on_delete=models.SET_NULL, null=True, blank=True, related_name='users')
USERNAME_FIELD = "phone"
objects = UserManager()

18
core/apps/evaluation/migrations/0035_autoevaluationmodel_is_archived.py
View File

@@ -1,18 +0,0 @@
# Generated by Django 5.2.7 on 2026-04-24 12:33
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('evaluation', '0034_remove_certificatemodel_file_url_and_more'),
]
operations = [
migrations.AddField(
model_name='autoevaluationmodel',
name='is_archived',
field=models.BooleanField(default=False, verbose_name='is archived'),
),
]

11
core/apps/evaluation/serializers/auto/AvgCost.py Normal file
View File

@@ -0,0 +1,11 @@
from rest_framework import serializers
class AvgCostSerializer(serializers.Serializer):
brand = serializers.CharField(max_length=100)
condition = serializers.CharField(max_length=100)
model = serializers.CharField(max_length=100)
complication = serializers.CharField(max_length=100)
manufacture_date = serializers.DateField()
distance_covered = serializers.IntegerField()
color = serializers.CharField(max_length=100)

18
core/apps/evaluation/views/avg_cost.py Normal file
View File

@@ -0,0 +1,18 @@
from rest_framework import generics
from rest_framework.response import Response
from rest_framework import permissions
from core.apps.evaluation.serializers.auto.AvgCost import AvgCostSerializer
from core.services.grpc.auto import get_auto_avg_cost
class AvgCostView(generics.GenericAPIView):
serializer_class = AvgCostSerializer
permission_classes = [permissions.IsAuthenticated]
def post(self):
serializer = self.get_serializer(data=self.request.data)
if serializer.is_valid():
avg_cost = get_auto_avg_cost(serializer.validated_data)
return Response(avg_cost, status=200)
return Response(serializer.errors, status=400)