9 Commits

Author SHA1 Message Date
xoliqberdiyev
aa1e4ca6fc feat: auto-evaluation update api serializer class changed 2026-04-17 15:01:25 +05:00
github-actions[bot]
04ef567d5c 🔄 Update image to 68 [CI SKIP] 2026-04-16 10:33:44 +00:00
b604fff1c2 Merge pull request 'fi' (#49) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m51s
Reviewed-on: #49
2026-04-16 10:32:13 +00:00
github-actions[bot]
37459e8485 🔄 Update image to 67 [CI SKIP] 2026-04-16 10:28:48 +00:00
f231d889a5 Merge pull request 'add base url' (#48) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m49s
Reviewed-on: #48
2026-04-16 10:27:19 +00:00
github-actions[bot]
6b1a9439ce 🔄 Update image to 66 [CI SKIP] 2026-04-16 10:15:07 +00:00
d26e2b0147 Merge pull request 'fix' (#47) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m49s
Reviewed-on: #47
2026-04-16 10:13:37 +00:00
github-actions[bot]
bc157da00d 🔄 Update image to 65 [CI SKIP] 2026-04-16 10:09:53 +00:00
9c40908cc7 Merge pull request 'some changes' (#46) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m54s
Reviewed-on: #46
2026-04-16 10:08:16 +00:00
5 changed files with 145 additions and 9 deletions

View File

@@ -13,7 +13,7 @@ from config.env import env
def home(request):
return HttpResponse("OK: #264548c3b1036f4b57edd4143dcb417e459a4e71")
return HttpResponse("OK: #b604fff1c24372a82672f64cc8235e7948d505c5")
urlpatterns = [

View File

@@ -99,6 +99,122 @@ class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer):
]
class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
property_rights = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
value_determined = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
form_ownership = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
value_determined = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
rate_type = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
class Meta:
model = AutoEvaluationModel
fields = [
# Step 1
"registration_number",
"contract_date",
"object_inspection_date",
"rate_date",
"rate_report_date",
"rate_object_name",
"object_type",
# Step 2
"object_owner_type",
"object_owner_individual_person_f_name",
"object_owner_individual_person_l_name",
"object_owner_individual_person_p_name",
"object_owner_individual_person_passport_num",
"object_owner_legal_entity",
"object_owner_legal_inn",
"property_rights",
"form_ownership",
"value_determined",
"rate_type",
# Step 3
"object_location_province",
"object_location_district",
"object_location_city",
"object_location_neighborhood",
"object_location_street",
"object_location_home",
"object_location_highways",
"object_location_covenience",
# Step 4
"tex_passport_serie_num",
"tex_passport_gived_date",
"tex_passport_gived_location",
"car_type",
"car_wheel",
"car_brand",
"car_model",
"car_number",
"manufacture_year",
"car_dvigatel_number",
"car_color",
]
def validate_tex_passport_serie_num(self, value):
if value and not re.match(r"^[A-Z]{3}\s?\d{7}$", value):
raise serializers.ValidationError(
"Format: AAA 1234567 (3 harf + 7 raqam)"
)
return value
def validate_object_owner_individual_person_passport_num(self, value):
if value and not re.match(r"^[A-Z]{2}\s?\d{7}$", value):
raise serializers.ValidationError(
"Format: AA 1234567 (2 harf + 7 raqam)"
)
return value
def validate(self, attrs):
owner_type = attrs.get("object_owner_type")
if owner_type == 1:
required_fields = {
"object_owner_individual_person_f_name": "Ismi",
"object_owner_individual_person_l_name": "Familiyasi",
"object_owner_individual_person_p_name": "Sharifi",
"object_owner_individual_person_passport_num": "Passport raqami",
}
for field, label in required_fields.items():
if not attrs.get(field):
raise serializers.ValidationError(
{field: f"Jismoniy shaxs uchun {label} majburiy."}
)
elif owner_type == 2:
if not attrs.get("object_owner_legal_entity"):
raise serializers.ValidationError(
{"object_owner_legal_entity": "Yuridik shaxs nomi majburiy."}
)
if not attrs.get("object_owner_legal_inn"):
raise serializers.ValidationError(
{"object_owner_legal_inn": "INN raqami majburiy."}
)
return attrs
class CreateAutoevaluationSerializer(serializers.ModelSerializer):
property_rights = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),

View File

@@ -16,7 +16,8 @@ from core.apps.evaluation.serializers.auto import (
CreateAutoevaluationSerializer,
ListAutoevaluationSerializer,
RetrieveAutoevaluationSerializer,
AutoEvaluationAppraisersSerializer
AutoEvaluationAppraisersSerializer,
UpdateAutoevaluationSerializer
)
@@ -28,7 +29,7 @@ class AutoEvaluationView(BaseViewSetMixin, ModelViewSet):
"vehicle",
).all()
serializer_class = ListAutoevaluationSerializer
permission_classes = [AllowAny]
permission_classes = [IsAuthenticated]
filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
filterset_class = AutoevaluationFilter
@@ -72,6 +73,8 @@ class AutoEvaluationView(BaseViewSetMixin, ModelViewSet):
"list": ListAutoevaluationSerializer,
"retrieve": RetrieveAutoevaluationSerializer,
"create": CreateAutoevaluationSerializer,
"update": UpdateAutoevaluationSerializer,
"partial_update": UpdateAutoevaluationSerializer,
}
@@ -136,8 +139,8 @@ class AutoEvaluationListAppraisersView(GenericAPIView):
query = auto_evaluation.appraisers.all()
if search_query:
query = query.filter(
Q(phone__icontains=search_query) |
Q(first_name__icontains=search_query) |
Q(phone__icontains=search_query) |
Q(first_name__icontains=search_query) |
Q(last_name__icontains=search_query)
)
page = self.paginate_queryset(query)

View File

@@ -71,11 +71,28 @@ class AdminEvaluationrequestView(BaseViewSetMixin, ModelViewSet):
"tex_passport",
]
ordering_fields = [
"id",
"rate_type",
"rate_type_display",
"object_type",
"object_type_display",
"customer_inn_number",
"owner_inn_number",
"tex_passport",
"value_determined",
"rate_goal",
"property_rights",
"form_ownership",
"worked_hours",
"chassi",
"need_delivering",
"location",
"location_name",
"status",
"status_display",
"user",
"created_at",
"updated_at",
"rate_type",
"object_type",
"status",
]
ordering = ["-created_at"]

View File

@@ -84,7 +84,7 @@ services:
max-file: "5"
web:
image: husanjon/sifatbaho:64
image: husanjon/sifatbaho:68
env_file:
- .env
environment: