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

 from datetime import datetime, timedelta
 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,\
+    RetailerLinks, Activation_Codes, Agents, Agent_Roles, AgentLoginTimings, \
-    FetchDataHistory
+    FetchDataHistory, RetailerContacts
 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 or_
 from urllib import urlencode
 import contextlib
 import falcon
 import json
+import string
 import traceback
 import urllib
 import urllib2
 import uuid
-from operator import and_
-import string
 alphalist = list(string.uppercase)
 alphalist.remove('O')
 numList = ['1','2','3','4','5','6','7','8','9']
 codesys = [alphalist, alphalist, numList, numList, numList]
                     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:
                     query = query.filter(Retailers.next_call_time<=datetime.now())
                 retailer = query.with_lockmode("update").first()
                 if retailer is not None:
+                    if isActivated(retailer.id):
+                        print retailer
+                        continue
                     lgr.info( "retailer " +str(retailer.id))
                     if status=="fresh":
                         userquery = session.query(Users)
                         if retailer.contact2 is not None:
                             userquery = userquery.filter(Users.mobile_number.in_([retailer.contact1,retailer.contact2]))
         callLater = self.callLater
         alreadyUser = self.alReadyUser
         verifiedLinkSent = self.verifiedLinkSent
         self.retailerId = int(jsonReq.get('retailerid'))
+        self.smsNumber = jsonReq.get('smsnumber')
         try:
             self.retailer = session.query(Retailers).filter_by(id=self.retailerId).first()
             self.callDisposition = jsonReq.get('calldispositiontype')
             self.callHistory = CallHistory()
             self.callHistory.agent_id=self.agentId
         if lastLink is not None:
             if len(lastLink.code)==len(codesys):
                 newCode=lastLink.code
         return getNextCode(codesys, newCode)
     def callLater(self,):
         self.retailer.status = 'retry' if self.callType == 'fresh' else 'fretry'
         self.retailer.call_priority = None
         if self.callDisposition == 'call_later':
             if self.callHistory.disposition_description is not None:
             self.retailer.next_call_time = self.callHistory.call_time + timedelta(days=1)
             self.callHistory.disposition_description = 'App link sent via ' + self.callHistory.disposition_description+ '. followup on' + datetime.strftime(self.retailer.next_call_time, '%d/%m/%Y %H:%M:%S')
         else:
             self.retailer.status = 'followup'
             self.retailer.next_call_time = self.callHistory.call_time + timedelta(days=7)
             self.callHistory.disposition_description = 'App link sent via' + self.callHistory.disposition_description + '. Followup again on ' + datetime.strftime(self.retailer.next_call_time, '%d/%m/%Y %H:%M:%S')
+        addContactToRetailer(self.agentId, self.retailerId, self.smsNumber, self.callLater(), 'sms')
         session.commit()
         return True
+def isActivated(retailerId):
+    try:
+        retailerLink = session.query(RetailerLinks).filter_by(retailer_id=retailerId).first()
+        user = session.query(Users).filter_by(referrer=retailerLink.code).first()
+        if user is None:
+            mobileNumbers = list(session.query(RetailerContacts.mobile_number).filter_by(retailer_id=retailerId).all())
+            user = session.query(Users).filter(Users.mobile_number.in_(mobileNumbers)).first()
+            if user is None:
+                return False
+            else:
+                retailerLink.mapped_contact = user.mobile_number
+        retailerLink.is_activated = True
+        retailerLink.user_id = user.id
+        return True
+    finally:
+        session.close()
+class AddContactToRetailer():
+    def on_post(self,req,resp, agentId):
+        agentId = int(agentId)
+        try:
+            jsonReq = json.loads(req.stream.read(), encoding='utf-8')
+            retailerId = int(jsonReq.get("retailerid"))
+            mobile = jsonReq.get("mobile")
+            callType = jsonReq.get("calltype")
+            contactType = jsonReq.get("contacttype")
+            addContactToRetailer(agentId, retailerId, mobile, callType, contactType)
+            session.commit()
+        finally:
+            session.close()
+def addContactToRetailer(agentId, retailerId, mobile, callType, contactType):
+    retailerContacts = session.query(RetailerContacts).filter_by(retailer_id=retailerId).filter_by(mobile_number=mobile).first()
+    if retailerContacts is None:
+        retailerContact = RetailerContacts()
+        retailerContact.agent_id = agentId
+        retailerContact.call_type = callType
+        retailerContact.contact_type = contactType
+        retailerContact.mobile_number = mobile
 class Login():
     def on_get(self, req, resp, agentId, role):
         try:
             self.agentId = int(agentId)

Subversion Repositories SmartDukaan

(root)/trunk/PyDTR/src/dtr/api/Service.py – Rev 15241 → 15254