Reload97 / pysate24-xltunai

Download as
Browse Code ยป

Commit 60f64816524e21d8f656b7ac23a721ead63ef737

Authored by Adhidarma Hadiwinoto
1 parent 545eb797b0
Exists in master

perbaikan advice

Showing 3 changed files with 12 additions and 3 deletions Side-by-side Diff

... ... @@ -285,6 +285,11 @@ def adviceLastSN(requestId, modem):
285 285 logger.info('Failed to get last sn from history, retrying in 15 secs')
286 286 sleep(15)
287 287 adviceLastSN(requestid, modem)
  288 +
  289 + elif lastSNFromHistory == 'P2P TRANSFER':
  290 + topupMessage = "Topup gagal berdasarkan advice. Trx terakhir adalah P2P Transfer."
  291 + pushTopupStatus(requestId, '40', topupMessage)
  292 + DISABLE_SEM = 0
288 293  
289 294 elif lastSNFromHistory == LAST_SN:
290 295 topupMessage = "Topup gagal berdasarkan advice. {0} = {1}. {2}".format(lastSNFromHistory, LAST_SN, message)
... ... @@ -130,3 +130,4 @@ def test_getPulsaFromUssdResponseMessage():
130 130  
131 131 def test_getLastSNFromMessage():
132 132 assert xltunai.getLastSNFromHistoryMessage('Transaksi Terakhir : 20063778248257/5500/12-02-2016 14:37:08/M201312021528418273770285/P201511211752675316198716/RELOAD XL 5000') == '20063778248257'
  133 + assert xltunai.getLastSNFromHistoryMessage('Transaksi Terakhir :\n20063778248257/5500/12-02-2016 14:37:08/M201312021528418273770285/P201511211752675316198716/RELOAD XL 5000') == '20063778248257'
... ... @@ -144,12 +144,15 @@ def getPulsaFromUssdResponseMessage(message):
144 144 def getMasaAktifFromUssdResponseMessage(message):
145 145 masa_aktif = re.findall(' s[\./]d (\w+)\.', message)
146 146 if not masa_aktif:
147   - return;
  147 + return
148 148  
149 149 masa_aktif = time.strptime(masa_aktif[0], '%d%b%y')
150 150 return time.strftime("%Y-%m-%d", masa_aktif)
151 151  
152 152 def getLastSNFromHistoryMessage(message):
153   - sn = re.findall(r"Transaksi Terakhir :\s*(\d+)", message)
  153 + if re.findall(r"P2P TRANSFER", message):
  154 + return 'P2P TRANSFER'
  155 +
  156 + sn = re.findall(r"Transaksi Terakhir\s:\s(\d+)", message)
154 157 if sn:
155   - return sn
  158 + return sn[0]