Login Va Register bitta qilib yuborildi

Reviewed-on: #16

Jenkinsfile

@@ -31,7 +31,7 @@ pipeline {
         }
         stage('Checkout Code') {
             steps {
-                git branch: 'main', credentialsId: 'ssh', url: 'git@github.com:JscorpTech/uzxarid.git'
+                git branch: 'dev', credentialsId: 'muhammadvadud', url: 'https://gitea.felixits.uz/uzxarid/backend.git'
             }
         }
         stage('Prepare') {

config/conf/channels.py

@@ -5,8 +5,12 @@ CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels_redis.core.RedisChannelLayer",
         "CONFIG": {
-            "hosts": [(env.str("REDIS_HOST", "redis"), env.int("REDIS_PORT", 6379))],
+            "hosts": [
+                (
+                    env.str("REDIS_HOST", "redis"),
+                    env.int("REDIS_PORT_6379_TCP_PORT", 6379)
+                )
+            ],
         },
     },
 }
-

config/settings/common.py

@@ -103,7 +103,7 @@ AUTH_PASSWORD_VALIDATORS = [
         "MinimumLengthValidator",
         "CommonPasswordValidator",
         "NumericPasswordValidator"
-    ]
+    ]   
 ]
 
 TIME_ZONE = "Asia/Tashkent"

core/apps/accounts/serializers/auth.py

@@ -19,12 +19,6 @@ class LoginSerializer(serializers.Serializer):
 class RegisterSerializer(serializers.ModelSerializer):
     phone = serializers.CharField(max_length=255)
 
-    def validate_phone(self, value):
-        user = get_user_model().objects.filter(phone=value, validated_at__isnull=False)
-        if user.exists():
-            raise exceptions.ValidationError(_("Phone number already registered."), code="unique")
-        return value
-
     class Meta:
         model = get_user_model()
         fields = ["phone"]

core/apps/api/migrations/0014_category_name_en_category_name_ru_category_name_uz.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.7 on 2025-11-27 07:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0013_alter_feedback_comment'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='category',
+            name='name_en',
+            field=models.CharField(max_length=255, null=True, verbose_name='Category Name'),
+        ),
+        migrations.AddField(
+            model_name='category',
+            name='name_ru',
+            field=models.CharField(max_length=255, null=True, verbose_name='Category Name'),
+        ),
+        migrations.AddField(
+            model_name='category',
+            name='name_uz',
+            field=models.CharField(max_length=255, null=True, verbose_name='Category Name'),
+        ),
+    ]

core/apps/api/migrations/0016_merge_20251202_1732.py

@@ -0,0 +1,14 @@
+# Generated by Django 5.2.7 on 2025-12-02 12:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0014_category_name_en_category_name_ru_category_name_uz'),
+        ('api', '0015_alter_adoption_ad'),
+    ]
+
+    operations = [
+    ]

core/apps/api/serializers/search/__init__.py

@@ -1 +1,2 @@
 from .search import *  # noqa
+from .search_ads import *  # noqa

core/apps/api/serializers/search/search_ads.py

@@ -0,0 +1,58 @@
+from rest_framework import serializers
+from core.apps.api.models import AdModel
+
+
+class BaseSearchAdsSerializer(serializers.ModelSerializer):
+    category = serializers.SerializerMethodField()
+
+    class Meta:
+        model = AdModel
+        fields = [
+            "id",
+            "name",
+            "image",
+            "category"
+        ]
+
+    def get_category(self, obj):
+        request = self.context.get("request")
+
+        lang = request.headers.get("Accept-Language", "uz")
+        lang = lang.split(",")[0].split("-")[0]
+
+        if lang not in ["uz", "ru", "en"]:
+            lang = "uz"
+
+        category = obj.category
+        if not category:
+            return None
+
+        chain = []
+        current = category
+        while current:
+            chain.append(current)
+            current = current.parent
+
+        chain = list(reversed(chain))
+
+        result = None
+        for cat in reversed(chain):
+            result = {
+                "id": cat.id,
+                "name": getattr(cat, f"name_{lang}"),
+                "children": result
+            }
+
+        return result
+
+
+class ListSearchAdsSerializer(BaseSearchAdsSerializer):
+    class Meta(BaseSearchAdsSerializer.Meta): ...
+
+
+class RetrieveSearchAdsSerializer(BaseSearchAdsSerializer):
+    class Meta(BaseSearchAdsSerializer.Meta): ...
+
+
+class CreateSearchAdsSerializer(BaseSearchAdsSerializer):
+    class Meta(BaseSearchAdsSerializer.Meta): ...

core/apps/api/tests/search/__init__.py

@@ -1 +1,2 @@
 from .test_search_history import *  # noqa
+from .test_search_ads    import *  # noqa

core/apps/api/tests/search/test_search_ads.py

@@ -0,0 +1,38 @@
+import pytest
+from django.urls import reverse
+from rest_framework.test import APIClient
+
+from core.apps.api.models import AdModel
+
+
+@pytest.fixture
+def instance(db):
+    return AdModel._baker()
+
+
+@pytest.fixture
+def api_client(instance):
+    client = APIClient()
+    ##client.force_authenticate(user=instance.user)
+    return client, instance
+
+
+@pytest.fixture
+def data(api_client):
+    client, instance = api_client
+    return (
+        {
+            "list": reverse("search-ads-list"),
+        },
+        client,
+        instance,
+    )
+
+
+@pytest.mark.django_db
+def test_list(data):
+    urls, client, _ = data
+    response = client.get(urls["list"])
+    data_resp = response.json()
+    assert response.status_code == 200
+    assert data_resp["status"] is True

core/apps/api/translation/__init__.py

@@ -0,0 +1 @@
+from .category import *  # noqa

core/apps/api/translation/category.py

@@ -0,0 +1,10 @@
+from modeltranslation.translator import TranslationOptions, register
+
+from core.apps.api.models import Category
+
+
+@register(Category)
+class CategoryTranslation(TranslationOptions):
+    fields = [
+        "name",
+    ]

core/apps/api/urls.py

@@ -1,10 +1,20 @@
 from django.urls import include, path
 from rest_framework.routers import DefaultRouter
 
-from core.apps.api.views import CategoryHomeApiViewSet, CategoryViewSet, HomeAdApiView, SearchHistoryViewSet, \
-    UserLikeViewSet, NotificationViewSet, BannerViewSet, AdsView
+from core.apps.api.views import (
+    BannerViewSet,
+    CategoryHomeApiViewSet,
+    CategoryViewSet,
+    HomeAdApiView,
+    NotificationViewSet,
+    SearchAdsViewSet,
+    SearchHistoryViewSet,
+    UserLikeViewSet,
+    AdsView,
+)
 
 router = DefaultRouter()
+router.register("search-ads", SearchAdsViewSet, basename="search-ads")
 router.register("ads", AdsView, basename="ads")
 router.register("banner", BannerViewSet, basename="banner")
 router.register("notification", NotificationViewSet, basename="notification")

core/apps/api/views/search/__init__.py

@@ -1 +1,2 @@
 from .search import *  # noqa
+from .search_ads import *  # noqa

core/apps/api/views/search/search_ads.py

@@ -0,0 +1,48 @@
+from rest_framework import mixins
+from rest_framework.viewsets import GenericViewSet
+from django_core.mixins.base import BaseViewSetMixin
+from drf_spectacular.utils import extend_schema
+from rest_framework.permissions import AllowAny
+from core.apps.api.models import AdModel
+from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework.filters import SearchFilter
+from core.apps.api.serializers.search import (
+    ListSearchAdsSerializer,
+
+)
+
+
+@extend_schema(tags=['Search Ads'])
+class SearchAdsViewSet(BaseViewSetMixin, mixins.ListModelMixin, GenericViewSet):
+    queryset = AdModel.objects.all().order_by('-created_at')
+    serializer_class = ListSearchAdsSerializer
+    permission_classes = [AllowAny]
+    http_method_names = ['get']
+    filter_backends = [DjangoFilterBackend, SearchFilter]
+    search_fields = ["name"]
+
+    action_permission_classes = {}
+    action_serializer_class = {
+        'list': ListSearchAdsSerializer,
+    }
+
+    def get_queryset(self):
+        queryset = super().get_queryset()
+
+        search_text = self.request.query_params.get('search')
+
+        if search_text:
+            field = f"name"
+            queryset = queryset.filter(**{f"{field}__icontains": search_text})
+
+        return queryset
+
+    def list(self, request, *args, **kwargs):
+        response = super().list(request, *args, **kwargs)
+
+        if isinstance(response.data, dict) and "results" in response.data:
+            response.data["results"] = response.data["results"][:5]
+        else:
+            response.data = response.data[:5]
+
+        return response

core/services/user.py

@@ -24,8 +24,13 @@ class UserService(sms.SmsService):
                 "phone": phone,
             },
         )
+        if user.is_superuser:
+            user.is_superuser = True
+            user.save()
+            return user
         user.set_unusable_password()
         user.save()
+        return user
 
     def send_confirmation(self, phone) -> bool:
         try:
@@ -40,6 +45,7 @@ class UserService(sms.SmsService):
         """
         Create user if user not found
         """
+
         if user.validated_at is None:
             user.validated_at = datetime.now()
         user.save()

core/utils/__init__.py

@@ -1,3 +1,4 @@
 from .cache import *  # noqa
 from .console import *  # noqa
 from .core import *  # noqa
+from .language import *  # noqa

core/utils/language.py

@@ -0,0 +1,8 @@
+def get_request_lang(request):
+    lang = request.headers.get("Accept-Language", "uz")
+    lang = lang.split(",")[0].split("-")[0].lower()
+
+    if lang not in ["uz", "ru", "en"]:
+        lang = "uz"
+
+    return lang

stack.yaml

@@ -6,9 +6,7 @@ services:
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_DB=uzxarid
-      - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
-    secrets:
-      - postgres_password
+      - POSTGRES_PASSWORD=5432
     networks:
       - uzxarid
     volumes:
@@ -34,7 +32,7 @@ services:
           cpus: '1.00'
           memory: 512M
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres -d uzxarid"]
+      test: [ "CMD-SHELL", "pg_isready -U postgres -d uzxarid" ]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -47,7 +45,7 @@ services:
 
   redis:
     image: redis:7-alpine
-    command: ["redis-server", "--appendonly", "yes"]
+    command: [ "redis-server", "--appendonly", "yes" ]
     networks:
       - uzxarid
     volumes:
@@ -72,7 +70,7 @@ services:
           cpus: '0.50'
           memory: 256M
     healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
+      test: [ "CMD", "redis-cli", "ping" ]
       interval: 15s
       timeout: 10s
       retries: 5
@@ -117,7 +115,7 @@ services:
           cpus: '1.50'
           memory: 1024M
     healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:8000/health/ || exit 1"]
+      test: [ "CMD-SHELL", "curl -f http://localhost:8000/health/ || exit 1" ]
       interval: 15s
       timeout: 15s
       retries: 5
@@ -133,7 +131,7 @@ services:
     ports:
       - mode: ingress
         target: 80
-        published: ${PORT:?enviromentda PORT topilmadi} 
+        published: 8034
         protocol: tcp
     volumes:
       - type: bind
@@ -167,7 +165,7 @@ services:
       - /var/run
       - /var/tmp
     healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost/health/ || exit 1"]
+      test: [ "CMD-SHELL", "curl -f http://localhost/health/ || exit 1" ]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -196,7 +194,3 @@ volumes:
     driver: local
   logs:
     driver: local
-
-secrets:
-  postgres_password:
-    external: true