django-chelseru 2.0.6__py3-none-any.whl → 2.1.0__py3-none-any.whl

{django_chelseru-2.0.6.dist-info → django_chelseru-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-chelseru
-Version: 2.0.6
+Version: 2.1.0
 Summary: Authentication system, online and real-time chat, SMS & BANK system for Iranian SMS services.
 Home-page: https://pipdjango.chelseru.com
 Author: Sobhan Bahman Rashnu
@@ -8,7 +8,7 @@ Author-email: bahmanrashnu@gmail.com
 Project-URL: Documentation, https://github.com/Chelseru/django-chelseru-lour/
 Project-URL: Telegram Group, https://t.me/bahmanpy
 Project-URL: Telegram Channel, https://t.me/ChelseruCom
-Keywords: djangochelseruchat djangochat drfchat online-chat online real-time chat iran chelseru lor lur bahman rashnu rashno lak lour sms djangoauth auth ywt otpauth otp authentication djangootp djangoiransms iransms djangosms djangokavenegar djangomelipayamak sobhan چت  سبحان بهمن رشنو چلسرو جنگو پایتون لر لور آنلاین ریل تایم
+Keywords: djangochelseru chelseru  djangochelseruchat djangochat drfchat online-chat online real-time chat iran chelseru lor lur bahman rashnu rashno lak lour sms djangoauth auth ywt otpauth otp authentication djangootp djangoiransms iransms djangosms djangokavenegar djangomelipayamak sobhan چت  سبحان بهمن رشنو چلسرو جنگو پایتون لر لور آنلاین ریل تایم
 Classifier: Programming Language :: Python :: 3
 Classifier: Framework :: Django
 Classifier: License :: OSI Approved :: MIT License

{django_chelseru-2.0.6.dist-info → django_chelseru-2.1.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
-django_chelseru-2.0.6.dist-info/licenses/LICENSE,sha256=VupU5KV4NteHaNQb-WH31G_WZWezxXoomjiCIAHoQJo,1089
+django_chelseru-2.1.0.dist-info/licenses/LICENSE,sha256=VupU5KV4NteHaNQb-WH31G_WZWezxXoomjiCIAHoQJo,1089
 drfchelseru/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-drfchelseru/admin.py,sha256=uamcWPCCw9_dD00XL8Brp8A1NvfhB5FtUfF9DWQCK9c,1022
+drfchelseru/admin.py,sha256=xKGZuzC-_VnMz0LbN31Owvi0pb4tDRd6dWKnkKyTPY0,4373
 drfchelseru/apps.py,sha256=hOTTzFGLXiTPZeN8p_LLcSECLtsR2Q0SUo8zJzgM-qQ,211
-drfchelseru/consumers.py,sha256=c8h9JYu5QUSKRREFrIrkjpkEQTzG5V8eg2lriaZODsc,2614
+drfchelseru/consumers.py,sha256=uh_EJzkZI_eYBCY03kqaSFd9pvAuAihcQxsXuTlXt4g,2727
 drfchelseru/middlewares.py,sha256=Ej_9GTlVPzfzYAUqxUn7VHJRdlywQmrbSIW43yK5q5U,3818
-drfchelseru/models.py,sha256=jQ5IbS5q4GufZC9W_zgX1Qg8YU_f8V-Jusbh5hQYPhQ,11214
+drfchelseru/models.py,sha256=8tiQ0TJo8kyaoIKAgfN2TiD0SewSQMOlXz43BcfAHlc,11683
 drfchelseru/routing.py,sha256=shAlgzcIwVuVPlvKeWBLCqr6PuBTHyIrWNgHEfnqrxg,165
-drfchelseru/serializers.py,sha256=YaotF1ee6kzgNuqjRX72HsNlteSLKV7DybpmPhy4lOU,2383
+drfchelseru/serializers.py,sha256=yVc9PQHaoihatoJaDiYK7r3F9xQnv0zd6D5JPBbSGtI,2445
 drfchelseru/services.py,sha256=K-VzisPliuKv0BL6Z3U6Tz0ewiVwhUkxt7yn08pemCk,29024
 drfchelseru/settings.py,sha256=LhdRLmUJnNlET0JYnHqRdFzmBD_nEX18qU1C1j0qN0E,11466
-drfchelseru/signals.py,sha256=CI1mZR5RrdOddXBnPC1eMdt9iQkYFDypfgogtfTc2eQ,2714
+drfchelseru/signals.py,sha256=2m4wR_ejGGhqoIZhewwcF0C7zn01OHz2FaKcI41mMzk,2769
 drfchelseru/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 drfchelseru/urls.py,sha256=nT_rYVCeaBzRX_EboAssKGWfPtPHGixtNVeOUcWcy8U,1120
 drfchelseru/validators.py,sha256=jAJASfG4kPcqrGxxIcoR8VjS4L4n_EzZuxJtQ1g9qmo,480
-drfchelseru/views.py,sha256=-3dk7R4GH6TqPvMq7sX2NTNoyEbFJMV8tDvH7Sb67Zg,20108
+drfchelseru/views.py,sha256=bdmdY-YuUGH1XxUWrQAjINtR1nI49ndC8riEZ8xlbdU,21139
 drfchelseru/migrations/0001_initial.py,sha256=LfkWAeQuPXNW3_igM-w_pyKafCeHQF3aReYgMXfMzEE,1034
 drfchelseru/migrations/0002_otpcode_session_user.py,sha256=c3oyBTQo2kjsKr5r_XQrqaq-66F7pui-4H4mEyAXgJk,3126
 drfchelseru/migrations/0003_rename_mobile_otpcode_mobile_number.py,sha256=eiD7t6etg6nOeT7BhJrSfEcR1yTPePXtATgtyu30520,377
@@ -37,7 +37,7 @@ drfchelseru/migrations/0020_payment_paid_at.py,sha256=H6cr-tfjJVjN3tCsCD8ecg9JGJ
 drfchelseru/migrations/0021_alter_payment_message.py,sha256=g5qIvQ-wecdXGcMf7ZhyfL2u85QpgMUOADHE7t4QHog,397
 drfchelseru/migrations/0022_payment_pay_mode_wallet.py,sha256=241lZITO1jQHqXkJKYm8DKUh7w9rmROh65LzNifP3BA,1521
 drfchelseru/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_chelseru-2.0.6.dist-info/METADATA,sha256=tdas5tqKCLoENgehYaatYTllimZm2ScX5E18pA3eEXo,18242
-django_chelseru-2.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_chelseru-2.0.6.dist-info/top_level.txt,sha256=fsaO1F03W3j4AYi0TfDGv5Cjb_Qrh6RSkwkWqfqaMns,12
-django_chelseru-2.0.6.dist-info/RECORD,,
+django_chelseru-2.1.0.dist-info/METADATA,sha256=deqYHC9xLEUr5RxS6pUguGKzLoII_uuB5X0WUHO3SzI,18267
+django_chelseru-2.1.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+django_chelseru-2.1.0.dist-info/top_level.txt,sha256=fsaO1F03W3j4AYi0TfDGv5Cjb_Qrh6RSkwkWqfqaMns,12
+django_chelseru-2.1.0.dist-info/RECORD,,

{django_chelseru-2.0.6.dist-info → django_chelseru-2.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

drfchelseru/admin.py

@@ -1,35 +1,120 @@
 from django.contrib import admin
-from .models import User, OTPCode, Session, MessageSMS, ChatRoom, MessageChat, ChatRoomPermissions, Organization, Payment, Wallet
+from django.utils.html import format_html
+from .models import (
+    User, OTPCode, Session, MessageSMS, Organization, 
+    ChatRoomPermissions, ChatRoom, MessageChat, Wallet, Payment
+)
 
+# --- Inlines ---
+class MessageChatInline(admin.TabularInline):
+    model = MessageChat
+    extra = 0
+    readonly_fields = ('timestamp',)
 
-@admin.register(User)
-class MobileAdmin(admin.ModelAdmin):
-    list_display = ['id', 'user__id', 'user__username', 'mobile', 'user__is_active']
+class WalletInline(admin.StackedInline):
+    model = Wallet
+    can_delete = False
+    verbose_name_plural = 'Wallet Info'
+
+# --- Admins ---
 
+@admin.register(User)
+class UserAdmin(admin.ModelAdmin):
+    list_display = ('user', 'mobile', 'group')
+    search_fields = ('user__username', 'mobile')
+    list_filter = ('group',)
+    inlines = [WalletInline]
 
 @admin.register(OTPCode)
 class OTPCodeAdmin(admin.ModelAdmin):
-    list_display = ['id', 'code', 'mobile_number', 'created_at']
-    ordering = ('-created_at', )
-
+    list_display = ('mobile_number', 'code', 'created_at')
+    search_fields = ('mobile_number', 'code')
+    readonly_fields = ('created_at',)
 
 @admin.register(Session)
 class SessionAdmin(admin.ModelAdmin):
-    list_display = ['id', 'user__id', 'user__username', 'ip_address', 'last_seen']
-    ordering = ('-created_at', )
+    list_display = ('user', 'ip_address', 'device', 'browser', 'last_seen')
+    search_fields = ('user__username', 'ip_address', 'session_key')
+    list_filter = ('created_at', 'browser')
+    readonly_fields = ('created_at', 'last_seen')
 
 @admin.register(MessageSMS)
-class MessageAdmin(admin.ModelAdmin):
-    list_display = ['id', 'mobile_number', 'message_text', 'status']
-    ordering = ('-created_at', )
+class MessageSMSAdmin(admin.ModelAdmin):
+    list_display = ('mobile_number', '_from', 'status', 'created_at')
+    list_filter = ('status', 'created_at')
+    search_fields = ('mobile_number', 'message_text')
+
+@admin.register(Organization)
+class OrganizationAdmin(admin.ModelAdmin):
+    list_display = ('name', 'uname', 'owner', 'created_at')
+    search_fields = ('name', 'uname', 'owner__username')
+
+@admin.register(ChatRoomPermissions)
+class ChatRoomPermissionsAdmin(admin.ModelAdmin):
+    list_display = ('get_users', 'access')
+    list_filter = ('access',)
+    
+    def get_users(self, obj):
+        return ", ".join([u.username for u in obj.user.all()])
+    get_users.short_description = 'Users'
+
+@admin.register(ChatRoom)
+class ChatRoomAdmin(admin.ModelAdmin):
+    list_display = ('id', 'name', 'status', 'organization', 'created_at')
+    list_filter = ('status', 'created_at')
+    search_fields = ('name', 'descriptions')
+    filter_horizontal = ('users', 'pinned_for', 'permissions', 'banneds') # برای انتخاب راحت‌تر ManyToMany
+    inlines = [MessageChatInline]
 
+@admin.register(MessageChat)
+class MessageChatAdmin(admin.ModelAdmin):
+    list_display = ('sender', 'chat_room', 'short_text', 'timestamp')
+    list_filter = ('timestamp',)
+    search_fields = ('text', 'sender__username')
 
+    def short_text(self, obj):
+        return obj.text[:50] + '...' if len(obj.text) > 50 else obj.text
 
+@admin.register(Wallet)
+class WalletAdmin(admin.ModelAdmin):
+    list_display = ('user', 'amount', 'updated_at')
+    search_fields = ('user__username',)
+    readonly_fields = ('created_at', 'updated_at')
 
+@admin.register(Payment)
+class PaymentAdmin(admin.ModelAdmin):
+    list_display = ('order_id', 'user', 'colored_status', 'amount', 'gateway_title', 'created_at')
+    list_filter = ('status', 'pay_mode', 'gateway_title', 'created_at')
+    search_fields = ('order_id', 'authority', 'ref_id', 'user__username', 'mobile')
+    readonly_fields = ('created_at', 'updated_at', 'data', 'data_verify')
+    
+    fieldsets = (
+        ('Basic Info', {
+            'fields': ('status', 'user', 'pay_mode', 'amount', 'order_id', 'description')
+        }),
+        ('Contact Info', {
+            'fields': ('mobile', 'email', 'callback_url')
+        }),
+        ('Gateway Info', {
+            'fields': ('gateway_title', 'gateway_url', 'authority', 'ref_id', 'status_code', 'message')
+        }),
+        ('Card & Security', {
+            'classes': ('collapse',), # این بخش به صورت تاشو نمایش داده می‌شود
+            'fields': ('card_hash', 'card_pan', 'data', 'data_verify', 'paid_at')
+        }),
+    )
 
-admin.site.register(ChatRoom)
-admin.site.register(MessageChat)
-admin.site.register(ChatRoomPermissions)
-admin.site.register(Organization)
-admin.site.register(Payment)
-admin.site.register(Wallet)
+    def colored_status(self, obj):
+        """رنگی کردن وضعیت پرداخت برای تشخیص سریع‌تر"""
+        colors = {
+            'paid': 'green',
+            'unpaid': 'orange',
+            'canceled': 'red',
+            'refounded': 'blue',
+        }
+        return format_html(
+            '<b style="color:{};">{}</b>',
+            colors.get(obj.status, 'black'),
+            obj.status
+        )
+    colored_status.short_description = 'Status'

drfchelseru/consumers.py

@@ -53,7 +53,6 @@ class ChatConsumer(AsyncWebsocketConsumer):
         text_data_json = json.loads(text_data)
         message = text_data_json['message']
         sender_id = self.scope['user'].id
-        # sender_id = text_data_json['sender_id']
         sender = await sync_to_async(User.objects.get)(id=sender_id)
 
         # Save message to database
@@ -68,17 +67,19 @@ class ChatConsumer(AsyncWebsocketConsumer):
             self.room_group_name,
             {
                 'type': 'chat_message',
+                'id': chat_message.id,
                 'message': chat_message.text,
-                'sender': sender.username
+                'created_at': chat_message.created_at.isoformat(),
+                'sender': {
+                    'id': sender.id,
+                    'username': sender.username, 
+                },
+                'chat_room': {
+                    'id': chat_message.chat_room.id
+                }
             }
         )
 
     async def chat_message(self, event):
-        message = event['message']
-        sender = event['sender']
-
         # Send message to WebSocket
-        await self.send(text_data=json.dumps({
-            'message': message,
-            'sender': sender
-        }))
+        await self.send(text_data=json.dumps(event))

drfchelseru/models.py

@@ -149,8 +149,12 @@ class ChatRoom(models.Model):
     name = models.CharField(max_length=45, blank=True, null=True)
     descriptions = models.TextField(blank=True, null=True)
 
+    updated_at = models.DateTimeField(auto_now=True)
     created_at = models.DateTimeField(auto_now_add=True)
 
+    class Meta:
+        unique_together = ()
+
     def __str__(self):
         return f"ID: {self.id}"
 
@@ -163,6 +167,15 @@ class MessageChat(models.Model):
 
     created_at = models.DateTimeField(auto_now_add=True)
 
+    def save(self, *args, **kwargs):
+        # بررسی می‌کنیم که آیا این یک پیام جدید است یا ویرایش شده
+        is_new = self._state.adding 
+        super().save(*args, **kwargs)
+        
+        if is_new:
+            self.chat_room.updated_at = self.created_at
+            self.chat_room.save(update_fields=['updated_at'])
+
     def __str__(self):
         return f"iD: {self.id} | Message from {self.sender.username} at {self.timestamp} | Chatroom ID: {self.chat_room.id}"
     

drfchelseru/serializers.py

@@ -41,6 +41,8 @@ class MessageSerializer(ModelSerializer):
 
 class ChatRoomSerializer(ModelSerializer):
     user_1, user_2 = DefaultUserSerializer(read_only=True), DefaultUserSerializer(read_only=True)
+    users = DefaultUserSerializer(many=True, read_only=True)
+
     class Meta:
         model = ChatRoom
         fields = '__all__'
@@ -73,7 +75,7 @@ class RegisterSerializer(ModelSerializer):
 
     def validate(self, attrs):
         if attrs['password'] != attrs['password2']:
-            raise ValidationError({"password": "رمز عبور و تکرار آن برابر نیستند."})
+            raise ValidationError({"password": "رمز عبور و تکرار آن یکسان نیستند."})
         return attrs
 
     def create(self, validated_data):

drfchelseru/signals.py

@@ -1,9 +1,9 @@
 from django.contrib.auth.models import User as DefaultUser
-from .models import User, Payment, Wallet
+from .models import User, Payment, Wallet, MessageChat, ChatRoom
 from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
 import requests
-
+from django.utils.timezone import now
 from urllib.parse import parse_qs
 from channels.middleware import BaseMiddleware
 from django.contrib.auth.models import AnonymousUser
@@ -38,7 +38,6 @@ def send_email_after_create(sender, instance, **kwargs):
     except:
         pass
 
-    
 
 
 @sync_to_async

drfchelseru/views.py

@@ -6,6 +6,8 @@ from rest_framework.response import Response
 from rest_framework.status import HTTP_200_OK, HTTP_204_NO_CONTENT, HTTP_500_INTERNAL_SERVER_ERROR, HTTP_502_BAD_GATEWAY, HTTP_401_UNAUTHORIZED, HTTP_400_BAD_REQUEST, HTTP_409_CONFLICT, HTTP_404_NOT_FOUND
 from rest_framework.exceptions import NotFound, ValidationError
 from rest_framework import status
+from rest_framework.pagination import PageNumberPagination
+from rest_framework.pagination import CursorPagination
 
 from django.contrib.auth.models import User as UserDefault
 from django.contrib.auth import get_user_model
@@ -17,6 +19,8 @@ from .serializers import MessageSerializer, OTPCodeSerializer, SessionSerializer
 from .models import User, ChatRoom
 from django.utils.timezone import now, timedelta
 from django.db import transaction, IntegrityError, OperationalError
+from django.db.models import Count
+from django.db.models import Q
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
@@ -255,48 +259,85 @@ class SessionList(ListAPIView):
 class ChatRoomViewSet(ModelViewSet):
     serializer_class = ChatRoomSerializer
     permission_classes = [IsAuthenticated]
-    model = serializer_class.Meta.model
+    queryset = ChatRoom.objects.all()
 
     def get_queryset(self):
-        return self.model.objects.filter(user_1=self.request.user) | self.model.objects.filter(user_2=self.request.user)
+        return self.queryset.filter(users=self.request.user)
 
     def perform_create(self, serializer):
-        user = self.request.user
+        user_1 = self.request.user
+        user_id = self.request.data.get("user_id")
+        
+        if not user_id:
+            raise NotFound("user_id ارسال نشده است.")
 
-        user_id = self.request.data.get('user', None)
-        user_2 = UserDefault.objects.filter(id=user_id).first()
+        user_2 = UserGet.objects.filter(id=user_id).first()
         if not user_2:
-            raise NotFound("کاربر مورد نظر با آی دی فرستاده شده یافت نشد.")
-                
-        chat_room = serializer.save(user_1=user, user_2=user_2)
-    
+            raise NotFound("کاربر مورد نظر یافت نشد.")
+
+        # 🔒 جلوگیری از ساخت چت تکراری
+        existing_room = (
+            ChatRoom.objects
+            .filter(users=user_1)
+            .filter(users=user_2)
+        )
+        print(existing_room)
+
+        if existing_room:
+            self.instance = existing_room
+            return
+
+        # 🆕 ساخت چت جدید
+        chat_room = serializer.save()
+        chat_room.users.add(user_1, user_2)
+        chat_room.save()
+
+        self.instance = chat_room
+
+
+# class MessagePagination(PageNumberPagination):
+#     page_size = 30
+
+
+class MessageCursorPagination(CursorPagination):
+    page_size = 30
+    # مرتب‌سازی بر اساس زمان ایجاد (نزولی)
+    # این باعث می‌شود همیشه در اولین درخواست، ۳۰ پیام آخر ارسال شود
+    ordering = '-created_at'
 
 class MessageViewSet(ModelViewSet):
     serializer_class = MessageChatSerializer
     permission_classes = [IsAuthenticated]
+    pagination_class = MessageCursorPagination
 
-    def get_queryset(self):
-        user = self.request.user
 
-        queryset = self.serializer_class.Meta.model.objects.all()
+    def get_queryset(self):
         chat_room_id = self.request.query_params.get('chat_room')
-        if chat_room_id:
-            queryset = queryset.filter(chat_room_id=chat_room_id)
-        return queryset
+
+        if not chat_room_id:
+            return self.serializer_class.Meta.model.objects.none()
+
+        return (
+            self.serializer_class.Meta.model.objects
+            .filter(chat_room_id=chat_room_id)
+            .select_related("sender", "chat_room")
+        )
 
     def perform_create(self, serializer):
         chat_room_id = self.request.data.get('chat_room')
+
         if not chat_room_id:
-            raise ValidationError("فیلد chat_room اجباریه.")
+            raise ValidationError("فیلد chat_room اجباری است.")
 
         try:
             chat = ChatRoom.objects.get(id=chat_room_id)
         except ChatRoom.DoesNotExist:
             raise NotFound("چت‌روم پیدا نشد.")
 
-        message = serializer.save(sender=self.request.user, chat_room=chat)
-        chat = message.chat_room
-        chat.save()
+        serializer.save(
+            sender=self.request.user,
+            chat_room=chat
+        )
 
 
 
@@ -443,4 +484,4 @@ class PaymentCallback(APIView):
 # Authentication method : Passwd
 class RegisterView(CreateAPIView):
     queryset = UserGet.objects.all()
-    serializer_class = RegisterSerializer
+    serializer_class = RegisterSerializer