django-chelseru 2.0.1__tar.gz → 2.0.3__tar.gz

{django_chelseru-2.0.1/django_chelseru.egg-info → django_chelseru-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-chelseru
-Version: 2.0.1
+Version: 2.0.3
 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

{django_chelseru-2.0.1 → django_chelseru-2.0.3/django_chelseru.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-chelseru
-Version: 2.0.1
+Version: 2.0.3
 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

{django_chelseru-2.0.1 → django_chelseru-2.0.3}/drfchelseru/services.py

@@ -124,22 +124,23 @@ class KavenegarCom:
     def send_message_lookup(self, message, template_id, **kwargs):
         try:
             api_url = f'https://api.kavenegar.com/v1/{self.API_KEY}/verify/lookup.json'
+            message = ''.join(list(map(lambda x: x if x != ' ' else '-', message.strip())))
             data = {
                 'receptor': self.RECEIVER,
                 'template': template_id,
-                'token': message.strip(),
+                'token': message,
             }
             if kwargs.get('token2'):
-                data['token2'] = kwargs.get('token2').strip()
+                data['token2'] = ''.join(list(map(lambda x: x if x != ' ' else '-', kwargs.get('token2').strip())))
 
             if kwargs.get('token3'):
-                data['token3'] = kwargs.get('token3').strip()
+                data['token3'] = ''.join(list(map(lambda x: x if x != ' ' else '-', kwargs.get('token3').strip())))
 
             if kwargs.get('token10'):
-                data['token10'] = kwargs.get('token10')
+                data['token10'] = kwargs.get('token10').strip()
 
             if kwargs.get('token20'):
-                data['token20'] = kwargs.get('token20')
+                data['token20'] = kwargs.get('token20').strip()
 
             response = requests.post(url=api_url, data=data)
             return response
@@ -259,7 +260,6 @@ def send_message(mobile_number, message_text, data=None, template_id=None):
             else:
                 response = service.send_message(message=message_text)
                     
-            print(response.json())
             response_json = response.json()
             entries = response_json.get('entries', [])
             _return = response_json.get('return', {})

{django_chelseru-2.0.1 → django_chelseru-2.0.3}/drfchelseru/views.py

@@ -13,11 +13,18 @@ from .validators import mobile_number as mobile_validator
 from .serializers import MessageSerializer, OTPCodeSerializer, SessionSerializer, ChatRoomSerializer, MessageChatSerializer, PaymentSerializer
 from .models import User, ChatRoom
 from django.utils.timezone import now, timedelta
-from django.db import transaction
+from django.db import transaction, IntegrityError, OperationalError
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
+import traceback
+import time
+import logging
+
+
+logger = logging.getlogger(__name__)
+
 
 class MessageSend(APIView):
     permission_classes = (AllowAny, )
@@ -164,18 +171,14 @@ class Authentication(APIView):
         try:
             if 'mobile_number' not in request.data:
                 return Response({'error': 'mobile_number is required.'}, status=HTTP_204_NO_CONTENT)
-            # assert 'mobile_number' in request.data, 'mobile_number is required.'
             mobile_number = request.data['mobile_number']
             if not mobile_number:
                 return Response({'error': 'mobile_number may not be blank.'}, status=HTTP_204_NO_CONTENT)
-            # assert mobile_number, 'mobile_number may not be blank.'
             mobile_number_isvalid = mobile_validator(mobile_number)
             if mobile_number_isvalid != True:
                 return Response({'error': mobile_number_isvalid}, status=HTTP_204_NO_CONTENT)
-            # assert mobile_number_isvalid == True, mobile_number_isvalid
             if 'code' not in request.data:
                 return Response({'error': 'code is required.'}, status=HTTP_204_NO_CONTENT)
-            # assert 'code' in request.data, 'code is required.'
             
             icheck = auth_init_check()
             if icheck and isinstance(icheck, dict) and 'AUTH_SERVICE' in icheck and 'AUTH_METHOD' in icheck:
@@ -185,9 +188,36 @@ class Authentication(APIView):
                     return Response({'error': 'The code sent to this mobile number was not found.'}, status=HTTP_401_UNAUTHORIZED)
                 
                 if otp.check_code():
+                    user = None
                     # login / signup
-                    group = int(request.data['group']) if 'group' in request.data else 0
-                    user, created = User.objects.get_or_create(mobile=mobile_number, group=group)
+                    try:
+                        group = int(request.data.get('group'), 0)
+                    except (ValueError, TypeError):
+                        group = 0
+
+                    try:
+                        with transaction.atomic():
+                            user, created = User.objects.get_or_create(mobile=mobile_number, group=group)
+                    
+                    except IntegrityError as e:
+                        logger.warning("IntegrityError on get_or_create for mobile=%s, group=%s: %s", mobile_number, group, e)
+                        time.sleep(0.05)
+                        try:
+                            user = User.objects.get(mobile=mobile_number, group=group)
+                            created = False
+                        except User.DoesNotExist:
+                            logger.error("After IntegrityError, user still not exists for mobile=%s. Trace: %s", mobile_number, traceback.format_exc())
+                            return Response({'error': 'Server error while creating user.'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+                    except OperationalError as e:
+                        logger.error("OperationalError when accessing DB for mobile=%s: %s\n%s", mobile_number, e, traceback.format_exc())
+                        return Response({'error': 'Database operational error, try again later.'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+                    except Exception as e:
+                        logger.exception("Unexpected error in user get_or_create for mobile=%s: %s", mobile_number, e)
+                        return Response({'error': 'An internal error occurred.'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+                    
+
+                    # user, created = User.objects.get_or_create(mobile=mobile_number, group=group)
                     if user:
                         auth_method = icheck['AUTH_METHOD']
                         auth_service = icheck['AUTH_SERVICE']
@@ -206,9 +236,10 @@ class Authentication(APIView):
                                 raise   
         except AssertionError as e:
             return Response({'error': str(e)}, status=HTTP_204_NO_CONTENT)
-        except:
-            pass
-        return Response({'error': 'An error occurred while generating or sending the otpcode, please contact the www.chelseru.com support team.'}, status=HTTP_500_INTERNAL_SERVER_ERROR)
+        except Exception:
+            logger.exception("Error while creating tokens for user (mobile=%s). user object: %r", mobile_number, user)
+            return Response({'error': 'Token generation failed.'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        # return Response({'error': 'An error occurred while generating or sending the otpcode, please contact the www.chelseru.com support team.'}, status=HTTP_500_INTERNAL_SERVER_ERROR)
 
 
 class SessionList(ListAPIView):

{django_chelseru-2.0.1 → django_chelseru-2.0.3}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='django-chelseru',
-    version='2.0.1',
+    version='2.0.3',
     packages=find_packages(),
     include_package_data=True,
     install_requires=[