django-chelseru 1.0.7__py3-none-any.whl → 1.0.9__py3-none-any.whl

{django_chelseru-1.0.7.dist-info → django_chelseru-1.0.9.dist-info}/METADATA

@@ -1,14 +1,14 @@
 Metadata-Version: 2.4
 Name: django-chelseru
-Version: 1.0.7
+Version: 1.0.9
 Summary: Authentication system, online and real-time chat, SMS system for Iranian SMS services.
 Home-page: https://pipdjango.chelseru.com
-Author: Sobhan Bahman|Rashnu
+Author: Sobhan Bahman Rashnu
 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 lour sms djangoauth auth ywt otpauth otp authentication djangootp djangoiransms iransms djangosms djangokavenegar djangomelipayamak sobhan چت  سبحان بهمن رشنو چلسرو جنگو پایتون لر لور آنلاین ریل تایم
+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 چت  سبحان بهمن رشنو چلسرو جنگو پایتون لر لور آنلاین ریل تایم
 Classifier: Programming Language :: Python :: 3
 Classifier: Framework :: Django
 Classifier: License :: OSI Approved :: MIT License

{django_chelseru-1.0.7.dist-info → django_chelseru-1.0.9.dist-info}/RECORD

@@ -1,14 +1,14 @@
-django_chelseru-1.0.7.dist-info/licenses/LICENSE,sha256=VupU5KV4NteHaNQb-WH31G_WZWezxXoomjiCIAHoQJo,1089
+django_chelseru-1.0.9.dist-info/licenses/LICENSE,sha256=VupU5KV4NteHaNQb-WH31G_WZWezxXoomjiCIAHoQJo,1089
 drfchelseru/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 drfchelseru/admin.py,sha256=8X67Sy8k5qQzZ4ifuJ_5O-UqVWby4uX53Iq-KNuODxM,948
 drfchelseru/apps.py,sha256=hOTTzFGLXiTPZeN8p_LLcSECLtsR2Q0SUo8zJzgM-qQ,211
-drfchelseru/consumers.py,sha256=x64hPCd5FViFsFMyDIcxPOh2OWVpeNq1BaOdhYk0HUI,2620
-drfchelseru/middlewares.py,sha256=adrhoJE7uo4WISfSIXK41XMQQzMaBshq3r61RblMPAQ,2570
+drfchelseru/consumers.py,sha256=c8h9JYu5QUSKRREFrIrkjpkEQTzG5V8eg2lriaZODsc,2614
+drfchelseru/middlewares.py,sha256=2GT9wTkqfQIUQyVkecul2V4hssvhkKjYpHErvVmvY14,3808
 drfchelseru/models.py,sha256=9Wa-_Xk28zpFQ4HoRbQdcboZpjUFqxKHpZd05Vx8xXs,6296
 drfchelseru/routing.py,sha256=shAlgzcIwVuVPlvKeWBLCqr6PuBTHyIrWNgHEfnqrxg,165
 drfchelseru/serializers.py,sha256=tM7dN362Vdx0UXq6OfNmYh6rTN1bwFoEgOn1MG4CZIY,1299
-drfchelseru/services.py,sha256=FkJlsFtTSiwwQ6g-nkSuV8XvY-dX-abAY_0WGbD0Ppw,10139
-drfchelseru/settings.py,sha256=ksiuFgjf1HZC6dajQXEra67WyUH6vYqjcQT81NdhELw,9051
+drfchelseru/services.py,sha256=RAQsn95ByUoxUOnlRx-mVPr38mjwjP8Ff5tao_9t6YE,11550
+drfchelseru/settings.py,sha256=wKWud5LVHpuNhjRrkg3tvN5FkhSmQ-z8mQwQ42xfERs,11497
 drfchelseru/signals.py,sha256=nmFv208GW9nir9PAB0a1050OMh4I9em0n60O6Mgfwec,2554
 drfchelseru/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 drfchelseru/urls.py,sha256=2RllsBPgojGLxLkyaBsSGk7fU1q44nuA7I_VpeHCmbs,702
@@ -26,7 +26,7 @@ drfchelseru/migrations/0009_alter_chatroom_status.py,sha256=QaAEUpERV8rnN-ifimA-
 drfchelseru/migrations/0010_chatroom_banneds_chatroom_descriptions_chatroom_name_and_more.py,sha256=aeotKPmdFJSjeA2-9VGApLfpx-NJkOrRJI2j2mdkf1U,1198
 drfchelseru/migrations/0011_alter_chatroom_user_1_alter_chatroom_user_2.py,sha256=9R66LzIujkh_4BpWtobpOvx3NALsMKUmtI5GDZXoSxQ,971
 drfchelseru/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_chelseru-1.0.7.dist-info/METADATA,sha256=j4E0jhdk4vn4nXDFIMzpDW7qD-1L8Qg0Al_3kjFMdjQ,10933
-django_chelseru-1.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_chelseru-1.0.7.dist-info/top_level.txt,sha256=fsaO1F03W3j4AYi0TfDGv5Cjb_Qrh6RSkwkWqfqaMns,12
-django_chelseru-1.0.7.dist-info/RECORD,,
+django_chelseru-1.0.9.dist-info/METADATA,sha256=sJiV6cXgiGsm0lYOZVWqr50BJPOtQI21aDJ6RoLzGXE,10944
+django_chelseru-1.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_chelseru-1.0.9.dist-info/top_level.txt,sha256=fsaO1F03W3j4AYi0TfDGv5Cjb_Qrh6RSkwkWqfqaMns,12
+django_chelseru-1.0.9.dist-info/RECORD,,

drfchelseru/consumers.py

@@ -10,7 +10,7 @@ User = get_user_model()
 class ChatConsumer(AsyncWebsocketConsumer):
     @sync_to_async
     def is_user_in_chat_room(self, user, chat_room):
-        if chat_room.users.filter(user__id=user.id).exists():
+        if chat_room.users.filter(id=user.id).exists():
             return True
         return user == chat_room.user_1 or user == chat_room.user_2
 

drfchelseru/middlewares.py

@@ -9,6 +9,8 @@ from rest_framework_simplejwt.tokens import AccessToken
 from django.contrib.auth import get_user_model
 from asgiref.sync import sync_to_async
 
+from .settings import auth_init_check, AUTH_SERVICE_DJSESSION, AUTH_SERVICE_DJSESSION
+
 
 class TakeUserSessionMiddlaware:
     def __init__(self, get_response):
@@ -21,26 +23,55 @@ class TakeUserSessionMiddlaware:
             user_agent = request.META.get('HTTP_USER_AGENT', '')
             ip = self.get_client_ip(request)
 
-            if not request.session.session_key:
-                request.session.create()
-            
-            session_key = request.session.session_key
-
-            session, created = Session.objects.get_or_create(
-                user = request.user,
-                session_key = session_key,
-                defaults = {
-                    'user_agent': user_agent,
-                    'ip_address': ip,
-                    'device': user_agents.parse(user_agent).device.family,
-                    'browser': user_agents.parse(user_agent).browser.family,
-                }
-            )
-
-            session.user_agent = user_agent
-            session.ip_address = ip
-            session.last_seen = datetime.now()
-            session.save()
+            icheck = auth_init_check()
+            session = None
+
+            if icheck['AUTH_SERVICE'] == AUTH_SERVICE_DJSESSION:
+                if not request.session.session_key:
+                    request.session.create()
+                session_key = request.session.session_key
+
+                try:
+                    # get session
+                    session = Session.objects.get(session_key=session_key)
+                
+                except Session.DoesNotExist:
+                    # create
+                    session = Session.objects.create(
+                        user = request.user,
+                        session_key = session_key,
+                    )
+
+            elif icheck['AUTH_SERVICE'] == AUTH_SERVICE_JWT:
+                try:
+                    session = Session.objects.get(user=request.user)
+                except Session.DoesNotExist:
+                    pass
+                
+            if session:
+                session.user_agent = user_agent
+                session.ip_address = ip_address
+                session.device = user_agents.parse(user_agent).device.family
+                session.browser = user_agents.parse(user_agent).browser.family
+                session.last_seen = datetime.now()
+
+                session.save()
+
+            # session, created = Session.objects.get_or_create(
+            #     user = request.user,
+            #     session_key = session_key,
+            #     defaults = {
+            #         'user_agent': user_agent,
+            #         'ip_address': ip,
+            #         'device': user_agents.parse(user_agent).device.family,
+            #         'browser': user_agents.parse(user_agent).browser.family,
+            #     }
+            # )
+
+            # session.user_agent = user_agent
+            # session.ip_address = ip
+            # session.last_seen = datetime.now()
+            # session.save()
         
         return response
     

drfchelseru/services.py

@@ -5,7 +5,7 @@ from zeep import Client
 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
 
 
-from .settings import sms_init_check
+from .settings import sms_init_check, bank_init_check
 
 
 class ParsianWebcoIr:
@@ -237,3 +237,51 @@ def send_message(mobile_number, message_text, data=None, template_id=None):
             return False, {'details': 'Invalid response structure.', 'error': str(e)}
 
     return response_bool, {'data': response_data, 'obj_status': obj_status, 'status': response_status_code}
+
+
+
+
+class ZarinpalCom:
+    """
+    merchant_id
+    currency
+    """
+    def __init__(self, merchant_id):
+        self.merchant_id = merchant_id
+
+    def create_payment(self, amount, callback_url, description, order_id=None, mobile=None, email=None, currency=None, **metadata):
+        '''
+        curl -X POST \
+            https://payment.zarinpal.com/pg/v4/payment/request.json \
+            -H 'accept: application/json' \
+            -H 'content-type: application/json' \
+            -d '{
+            "merchant_id": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            "amount": 1000,
+            "callback_url": "http://your-site.com/verify",
+            "description": "Transaction description.",
+            "metadata": {"mobile": "09121234567","email": "info.test@gmail.com"}
+            }
+            ___
+
+            {
+            "data": {
+                "code": 100,
+                "message": "Success",
+                "authority": "A0000000000000000000000000000wwOGYpd",
+                "fee_type": "Merchant",
+                "fee": 100
+            },
+            "errors": []
+            }
+        '''
+        try:
+            icheck = bank_init_check()
+            if not icheck:
+                raise ImproperlyConfigured('Configure Bank in DJANGO_CHELSERU.')
+            
+        except ImproperlyConfigured as e:
+            raise
+        except:
+            pass
+    pass

drfchelseru/settings.py

@@ -29,6 +29,14 @@ DJANGO_CHELSERU = {
             'T7': 7,
             'T8': 8,
             'T9': 9,
+        },    
+    },
+    'BANK': {
+        'GATEWAY': 'ZARINPAL_COM',
+        'SETTINGS': {
+            'MERCHANT_ID': '',
+            'CALLBACK_URL': '',
+            'CURRENCY': 'IRT',      # IRR, IRT
         }
     }
 }
@@ -39,9 +47,15 @@ from django.core.exceptions import ImproperlyConfigured
 
 SERVICE_NAME = 'DJANGO_CHELSERU'
 
+AUTH_SERVICE_JWT = 'rest_framework_simplejwt'
+AUTH_SERVICE_DJSESSION = 'django_session'
+
 AUTH_METHOD = [(0, 'OTP'), (1, 'PASSWD')]
-AUTH_SERVICES = [(0, 'rest_framework_simplejwt')]
+AUTH_SERVICES = [(0, AUTH_SERVICE_JWT)]
 SMS_SERVICES = [(0, 'PARSIAN_WEBCO_IR'),(1, 'MELI_PAYAMAK_COM') ,(2, 'KAVENEGAR_COM')]
+GATEWAYS = ((0, 'ZARINPAL_COM'),)
+CURRENCIES = ((0, 'IRT'), (1, 'IRR'))
+
 
 def auth_init_check():
     try:
@@ -185,3 +199,61 @@ def sms_init_check():
     return False
 
 
+def bank_init_check():
+    gateway = None
+    options = {
+        'currency': 'IRT',
+    }
+    try:
+        if not hasattr(settings, SERVICE_NAME):
+            raise ImproperlyConfigured(f'{SERVICE_NAME} must be defined in settings.py.')
+        
+        else:
+            bank = getattr(settings, SERVICE_NAME).get('BANK')
+            if not bank:
+                raise ImproperlyConfigured(f'BANK key must be defined in {SERVICE_NAME}')
+            else:
+                gateway = bank.get('GATEWAY')
+                if gateway not in list(map(lambda x: x[1], GATEWAYS)):
+                    raise ImproperlyConfigured(f'GATEWAY must be choice between {list(map(lambda x:x[1], GATEWAYS))}.')
+                
+                else:
+                    _settings = bank.get('SETTINGS')
+                    if not _settings:
+                        raise ImproperlyConfigured(f'SETTINGS key must be defined in BANK')
+                    else:
+                        _merchant_id = _settings.get('MERCHANT_ID')
+                        _callback_url = _settings.get('CALLBACK_URL')
+                        _currency = _settings.get('CORRENCY')
+
+                        if not _merchant_id:
+                            raise ImproperlyConfigured(f'MERCHANT_ID key must be defined in SETTINGS.')
+                        if not _callback_url:
+                            raise ImproperlyConfigured(f'CALLBACK_URL key must be defined in SETTINGS.')
+                        
+                        options['merchant_id'] = _merchant_id
+                        options['callback_url'] = _callback_url
+
+                        if _currency:
+                            options['currency'] = _currency
+
+        return {'gateway': gateway, 'settings': options}
+    except ImproperlyConfigured as e:
+        print(f"Configuration Error: {e}")
+        raise
+    except:
+        pass
+
+    return False
+
+
+'''
+'BANK': {
+        'GATEWAY': 'ZARINPAL_COM',
+        'SETTINGS': {
+            'MERCHANT_ID': '',
+            'CALLBACK_URL': '',
+            'CURRENCY': 'IRT',      # IRR, IRT
+        }
+    }
+'''