Reload97 / pysate24-xltunai

Download as
Browse Code ยป

Commit 545eb797b0f1045184485126bcf3e5cdf04ce742

Authored by Adhidarma Hadiwinoto
1 parent caaf6687dc
Exists in master

remove signal

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

... ... @@ -185,7 +185,7 @@ def pushTopupStatus(request_id, response_code, _message, dontparsesn = False):
185 185 if response_code == '00' and not dontparsesn:
186 186 sn = xltunai.getSNFromMessage(message)
187 187 LAST_SN = sn
188   - message = 'SN={0};{1}. Signal Strength: {2}'.format(sn, message, modem.signalStrength)
  188 + message = 'SN={0};{1}'.format(sn, message)
189 189  
190 190 push_message = CHIPINFO + '$' + message
191 191  
... ... @@ -126,3 +126,7 @@ def test_getPulsaFromUssdResponseMessage():
126 126 assert xltunai.getMasaAktifFromUssdResponseMessage('Pulsa 41875 s/d 16Sep15. Mendadak DISKON 1 JUTA pelanggan pertama!') == '2015-09-16'
127 127 assert xltunai.getMasaAktifFromUssdResponseMessage('Pulsa 53000 s.d 10Sep15. Pkt TalkMania-XTRA 250Mnt, Rp3375!') == '2015-09-10'
128 128 assert xltunai.getMasaAktifFromUssdResponseMessage('Pulsa 41875 s/d. Mendadak DISKON 1 JUTA pelanggan pertama!') == None
  129 +
  130 +
  131 +def test_getLastSNFromMessage():
  132 + assert xltunai.getLastSNFromHistoryMessage('Transaksi Terakhir : 20063778248257/5500/12-02-2016 14:37:08/M201312021528418273770285/P201511211752675316198716/RELOAD XL 5000') == '20063778248257'
... ... @@ -150,6 +150,6 @@ def getMasaAktifFromUssdResponseMessage(message):
150 150 return time.strftime("%Y-%m-%d", masa_aktif)
151 151  
152 152 def getLastSNFromHistoryMessage(message):
153   - sn = re.findall(r"Transaksi Terakhir: (\d+)", message)
  153 + sn = re.findall(r"Transaksi Terakhir :\s*(\d+)", message)
154 154 if sn:
155 155 return sn