WebSVN – SmartDukaan – Diff – /trunk/PyDTR/src/dtr/api/Service.py

 from dtr import main
 from dtr.config import PythonPropertyReader
 from dtr.storage import Mongo
 from dtr.storage.DataService import Retailers, Users, CallHistory, RetryConfig, \
     RetailerLinks, Activation_Codes, Agents, Agent_Roles, AgentLoginTimings, \
-    FetchDataHistory, RetailerContacts
+    FetchDataHistory, RetailerContacts, Orders
+from dtr.storage.Mongo import get_mongo_connection
+from dtr.storage.Mysql import fetchResult
 from dtr.utils import FetchLivePrices, DealSheet as X_DealSheet, \
     UserSpecificDeals
 from dtr.utils.utils import getLogger
 from elixir import *
 from operator import and_
 from sqlalchemy.sql.expression import func, func, or_
 from urllib import urlencode
 import contextlib
 import falcon
 import json
+import re
 import string
 import traceback
 import urllib
 import urllib2
 import uuid
-import re
 alphalist = list(string.uppercase)
 alphalist.remove('O')
 numList = ['1','2','3','4','5','6','7','8','9']
 codesys = [alphalist, alphalist, numList, numList, numList]
 CONTACT_PRIORITY = ['sms', 'called', 'ringing']
+RETRY_MAP = {'fresh':'retry', 'folluwpup':'fretry', 'onboarding':'oretry'}
+ASSIGN_MAP = {'retry':'assigned', 'fretry':'fassigned', 'oretry':'oassigned'}
 def getNextCode(codesys, code=None):
     if code is None:
         code = []
         for charcode in codesys:
 class RetailerDetail():
     global RETAILER_DETAIL_CALL_COUNTER
     def getRetryRetailer(self,failback=True):
-        retailer = None
-        status = 'fretry' if self.callType == 'followup' else 'retry'
+        status = RETRY_MAP.get(self.callType)
         retailer = session.query(Retailers).filter_by(status=status).filter(Retailers.next_call_time<=datetime.now()).order_by(Retailers.call_priority).order_by(Retailers.next_call_time).with_lockmode("update").first()
         if retailer is not None:
             lgr.info( "getRetryRetailer " + str(retailer.id))
         else:
             if failback:
                 retailer = self.getNewRetailer(False)
                 return retailer
-        if status=='retry':
-            retailer.status = 'assigned'
-        else:
-            retailer.status = 'fassigned'
+        retailer.status = ASSIGN_MAP.get(status)
         lgr.info( "getRetryRetailer " + str(retailer.id))
         return retailer
     def getNewRetailer(self,failback=True):
         retry = True
                 lgr.info( "Calltype " + self.callType)
                 status=self.callType
                 query = session.query(Retailers).filter(Retailers.status==status)
                 if status=='fresh':
                     query = query.filter_by(is_or=False, is_std=False).filter(or_(Retailers.agent_id==self.agentId, Retailers.agent_id==None)).order_by(Retailers.is_elavated.desc(), -Retailers.agent_id)
-                else:
+                elif status=='followup':
                     query = query.filter(Retailers.next_call_time<=datetime.now()).order_by(Retailers.next_call_time)
+                else:
+                    query = query.filter(Retailers.modified<=datetime.now()).order_by(Retailers.modified)
                 retailer = query.with_lockmode("update").first()
                 if retailer is not None:
                     lgr.info( "retailer " +str(retailer.id))
                     if status=="fresh":
                         userquery = session.query(Users)
                             retailer.status = 'alreadyuser'
                             lgr.info( "retailer.status " + retailer.status)
                             session.commit()
                             continue
                         retailer.status = 'assigned'
-                    else:
+                    elif status=='followup':
                         if isActivated(retailer.id):
                             print "Retailer Already %d activated and marked onboarded"%(retailer.id)
                             continue
                         retailer.status = 'fassigned'
+                    else:
+                        retailer.status = 'oassigned'
                     retailer.retry_count = 0
                     retailer.invalid_retry_count = 0
                     lgr.info( "Found Retailer " +  str(retailer.id) + " with status " + status + " assigned to " + str(self.agentId))
                 else:
                 fetchInfo.last_action = 'disposition'
                 fetchInfo.last_action_time = last_disposition.created
             fetchInfo.retailer_id = retailer.id
             session.commit()
             otherContacts = [r for r, in session.query(RetailerContacts.mobile_number).filter_by(retailer_id=retailer.id).order_by(RetailerContacts.contact_type).all()]
-            resp.body = json.dumps(todict(getRetailerObj(retailer, otherContacts)), encoding='utf-8')
+            resp.body = json.dumps(todict(getRetailerObj(retailer, otherContacts, self.callType)), encoding='utf-8')
             return
         finally:
             session.close()
         if retailer is None:
             resp.body = "{}"
         else:
+            print "It should never come here"
             resp.body = json.dumps(todict(getRetailerObj(retailer)), encoding='utf-8')
     def on_post(self, req, resp, agentId, callType):
         returned = False
     else:
         mapped_with = 'code'
     retailerLink.mapped_with = mapped_with
     retailerLink.user_id = user.id
     retailer = session.query(Retailers).filter_by(id=retailerId).first()
-    retailer.status = 'onboarded'
+    retailer.status = 'onboarding'
     session.commit()
     print "retailerLink.retailer_id", retailerLink.retailer_id
     session.close()
     return True
         retailerContact.call_type = callType
         retailerContact.contact_type = contactType
         retailerContact.mobile_number = mobile
     else:
         if CONTACT_PRIORITY.index(retailerContact.contact_type) > CONTACT_PRIORITY.index(contactType):
-            retailerContact.contact_type = callType
+            retailerContact.contact_type = contactType
 class Login():
             if retailer is not None:
                 retailerLink = session.query(RetailerLinks).filter_by(retailer_id=retailer.id).first()
                 if retailerLink is not None:
                     retailerLink.user_id = user.id
                     retailerLink.mapped_with=mappedWith
-                    retailer.status = 'onboarded'
+                    retailer.status = 'onboarding'
                     result = True
                     session.commit()
             return result
     finally:
         session.close()
             data[classkey] = obj.__class__.__name__
         return data
     else:
         return obj
-def getRetailerObj(retailer, otherContacts1=None):
+def getRetailerObj(retailer, otherContacts1=None, callType=None):
     print "before otherContacts1",otherContacts1
     otherContacts = [] if otherContacts1 is None else otherContacts1
     print "afotherContacts1",otherContacts
     obj = Mock()
     obj.title = retailer.title
     obj.contact1 = None if len(otherContacts)==0 else otherContacts[0]
     if obj.contact1 is not None:
         obj.contact2 = None if len(otherContacts)==1 else otherContacts[1]
     obj.scheduled = (retailer.call_priority is not None)
     obj.status = retailer.status
+    if callType == 'onboarding':
+        try:
+            userId, = session.query(RetailerLinks.user_id).filter(RetailerLinks.retailer_id==retailer.id).first()
+            obj.userId = userId
+            result = fetchResult("select * from useractive where user_id=%d"%(userId))
+            if result == ():
+                obj.last_active = None
+            else:
+                obj.last_active =datetime.strftime(result[0][0], '%d/%m/%Y %H:%M:%S')
+            ordersCount = session.query(Orders).filter_by(user_id = userId).filter(~Orders.status.in_('ORDER_NOT_CREATED_KNOWN', 'ORDER_ALREADY_CREATED_IGNORED')).count()
+            obj.orders = ordersCount
+        finally:
+            session.close()
     return obj
 def make_tiny(code):
     url = 'https://play.google.com/store/apps/details?id=com.saholic.profittill&referrer=utm_source%3D0%26utm_medium%3DCRM%26utm_term%3D001%26utm_campaign%3D' + code
     request_url = ('http://tinyurl.com/api-create.php?' + urlencode({'url':url}))
             resp.body = json.dumps({"Retailers":retailersJsonArray}, encoding='utf-8')
             return
         finally:
             session.close()
-#def update_pin():
 class Mock(object):
     pass
 def tagActivatedReatilers():

Subversion Repositories SmartDukaan

(root)/trunk/PyDTR/src/dtr/api/Service.py – Rev 15351 → 15358