Commit a3500062 by aa.gusti

perbaikan data

1 parent a2d0fc24
INQ_RESP = \
{
"additionalData": "361198483250691012345678901234564 54P879211 3603110611710004 TUMINO NUANSA MEKARSARI B - 1 / 15 RT 004/006 KA 3538 XCBIRU 001SEPEDA MOTOR R2YAMAHA 54P (CAST WHEEL) AT 20132020090920210909000000000000000000000000000000154000000000000000000000035000000000000000000000000000000000000000000000189000SUKSES 01",
"aggregatorCode": "W0216",
"amountInformation": {
"billAmount": "890000",
"feeAggregator": "0",
"feeBJB": "0",
"totalAmount": "890000"
},
"amountTransaction": "890000",
"billInformation": {
"bills": [
{
"info": "1000000108767"
}, {
"info": "ALBUS DUMBLEDORE"
}, {
"info": "BLACK MAGIC"
}, {
"info": "BLACK MAGIC 101"
}, {
"info": "890000"
}, {
"info": "0"
}, {
"info": "2019"
}, {
"info": "0"
}, {
"info": " "
}, {
"info": " REG"
}, {
"info": " "
}
]
},
"caCode": "CA1830",
"currencyCode": "360",
"destinationAccountNumber": "0012199936360 ",
"featureCode": "009",
"localTransactionDate": "0326",
"merchantType": "6015",
"pay": "PAY",
"posEntryModeCode": "110",
"primaryAccountNumber": "622011888888888888",
"processingCode": "321000",
"responseCode": "00",
"sequenceNumber": "000000880977",
"settlementDate": "0326",
"sourceAccountNumber": "0098889231001",
"systemTraceAuditNumber": "880977",
"terminalAggregator": {
"cardAcceptorName": "NAEE ",
"terminalIdentifierNumber": "1 ",
"terminalName": "TERM "
},
"timeLocalTransaction": "090210",
"track2Data": "622011888888888888=9912?",
"transmissionDateTime": "0107180458"
}
# PAYMENT
PAY_RESP = \
{
"additionalData": "'361198483250691012345678901234564 54P879211 3603110611710004 TUMINO NUANSA MEKARSARI B - 1 / 15 RT 004/006 KA 3538 XCBIRU 001SEPEDA MOTOR R2YAMAHA 54P (CAST WHEEL) AT 20132020090920210909000000000000000000000000000000154000000000000000000000035000000000000000000000000000000000000000000000189000SUKSES 01",
"aggregatorCode": "W0216",
"amountInformation": {
"billAmount": "206500",
"feeAggregator": "0",
"feeBJB": "0",
"totalAmount": "206500"
},
"amountTransaction": "000000890000",
"billInformation": {
"bills": [{
"info": "1000000108767"
}, {
"info": "ALBUS DUMBLEDORE"
}, {
"info": "BLACK MAGIC"
}, {
"info": "BLACK MAGIC 101"
}, {
"info": "890000"
}, {
"info": "0"
}, {
"info": "2019"
}, {
"info": "0"
}, {
"info": " "
}, {
"info": " REG"
}, {
"info": " "
}
]
},
"caCode": "CA1830",
"currencyCode": "360",
"destinationAccountNumber": "0012199936360 ",
"featureCode": "009",
"localTransactionDate": "0326",
"merchantType": "6015",
"numberTransactionBank": '1234567890',
"numberTransactionP": '0987654321',
"pay": "PAY",
"posEntryModeCode": "110",
"primaryAccountNumber": "622011888888888888",
"processingCode": "521000",
"responseCode": "00",
"sequenceNumber": "000000502959",
"settlementDate": "0326",
"sourceAccountNumber": "0098889231001",
"systemTraceAuditNumber": "502959",
"terminalAggregator": {
"cardAcceptorName": "NAEE ",
"terminalIdentifierNumber": "1 ",
"terminalName": "TERM "
},
"timeLocalTransaction": "090210",
"track2Data": "622011888888888888=9912?",
"transmissionDateTime": "0107180458"
}
# import colander # import colander
# from opensipkd.string.row import Row # from opensipkd.string.row import Row
# from .exceptions import InternalError # from .exceptions import InternalError
# todo sebaiknya module ini masulk kedalam BJB-SAM-SAMSAT
import json import json
from iso8583_web.scripts.logger import ( from iso8583_web.scripts.logger import (
log_web_info, log_web_info,
...@@ -12,6 +14,7 @@ from iso8583_web.scripts.views.linkaja.models import LogSam ...@@ -12,6 +14,7 @@ from iso8583_web.scripts.views.linkaja.models import LogSam
from iso8583_web.tools.this_framework import get_settings from iso8583_web.tools.this_framework import get_settings
from datetime import datetime from datetime import datetime
import requests import requests
INQ_CODE = "301099" INQ_CODE = "301099"
PAY_CODE = "541099" PAY_CODE = "541099"
FEAT_CODE = "017" FEAT_CODE = "017"
...@@ -58,23 +61,6 @@ INQ_REQ = { ...@@ -58,23 +61,6 @@ INQ_REQ = {
"sequenceNumber": "1" "sequenceNumber": "1"
} }
PAY_REQ = \
{
"processingCode": PAY_CODE,
"sequenceNumber": "",
"sourceAccountNumber": "0098889231001",
"systemTraceAuditNumber": "",
"terminalAggregator": {
"cardAcceptorName": "NAEE ",
"terminalIdentifierNumber": "1 ",
"terminalName": "TERM "
},
"settlementDate": "0326",
"timeLocalTransaction": "090210",
"track2Data": "622011888888888888=9912?",
"transmissionDateTime": "0107180458"
}
def send_data(json_data, conf): def send_data(json_data, conf):
# settings = get_settings() # settings = get_settings()
...@@ -83,7 +69,6 @@ def send_data(json_data, conf): ...@@ -83,7 +69,6 @@ def send_data(json_data, conf):
bjb_sam_url = "bjb_sam_url" in conf and conf["bjb_sam_url"] or \ bjb_sam_url = "bjb_sam_url" in conf and conf["bjb_sam_url"] or \
"http://localhost:7001/bjb/sambat/test" "http://localhost:7001/bjb/sambat/test"
data = json_data data = json_data
# todo butuh server buat testing json sementara pake static response
if json_data["processingCode"] == INQ_CODE: if json_data["processingCode"] == INQ_CODE:
bjb_sam_url += "/inquiryPaymentRest" bjb_sam_url += "/inquiryPaymentRest"
elif json_data["processingCode"] == PAY_CODE: elif json_data["processingCode"] == PAY_CODE:
...@@ -110,40 +95,41 @@ class Transaksi(object): ...@@ -110,40 +95,41 @@ class Transaksi(object):
if method == "reversal": # data Payment ada (berarti reversal) if method == "reversal": # data Payment ada (berarti reversal)
self.mti = "0400" self.mti = "0400"
self.data["processingCode"] = PAY_CODE self.data["processingCode"] = PAY_CODE
# todo reversal tidak diperbolehkan
elif method == "payment": # data Inq ada (berarti payment) elif method == "payment": # data Inq ada (berarti payment)
db_session = get_db_session() db_session = get_db_session()
pay = db_session.query(LogSam).filter_by(rpc_id=inq.id, # pay = db_session.query(LogSam).filter_by(rpc_id=inq.id,
mti="0200", bit_003=PAY_CODE).first() # mti="0200", bit_003=PAY_CODE).first()
# if pay:
pay = db_session.query(LogSam). \
filter_by(rpc_id=inq.id,
mti="0210", bit_003=PAY_CODE).first()
if pay: if pay:
pay = db_session.query(LogSam).filter_by(rpc_id=inq.id, raise AlreadyPaidError()
mti="0210", bit_003=PAY_CODE).first()
if pay:
raise AlreadyPaidError()
inq = db_session.query(LogSam).filter_by(rpc_id=inq.id, inq = db_session.query(LogSam). \
mti="0210", bit_003=INQ_CODE).first() filter_by(rpc_id=inq.id,
mti="0210", bit_003=INQ_CODE).first()
if not inq: if not inq:
raise BillRefNotFound() raise BillRefNotFound()
self.mti = "0200" self.mti = "0200"
self.data = inq.message self.data = inq.message
self.data["processingCode"] = PAY_CODE self.data["processingCode"] = PAY_CODE
#stan = int(self.data["systemTraceAuditNumber"])+1
#self.data["systemTraceAuditNumber"] = str(stan).zfill(6)
self.set_local_time() self.set_local_time()
#elf.data["systemTraceAuditNumber"] = str(stan).zfill(6) # todo: STAN seunik mungkin karena dikhawatirkan dengan detik yang
self.data["systemTraceAuditNumber"] = self.data["timeLocalTransaction"] # sama terdapat payment dengan STAN yang sama
self.data["systemTraceAuditNumber"] = self.data["timeLocalTransaction"]
else: else:
self.mti = "0200" self.mti = "0200"
# todo apa perlu dicopy?
self.data = INQ_REQ.copy() self.data = INQ_REQ.copy()
# self.data["systemTraceAuditNumber"] = "880977"
self.data["aggregatorCode"] = "agg_code" in conf \ self.data["aggregatorCode"] = "agg_code" in conf \
and conf["agg_code"] or "W0227" and conf["agg_code"] or "W0227"
self.data["caCode"] = "ca_code" in conf and conf["ca_code"] \ self.data["caCode"] = "ca_code" in conf and conf["ca_code"] \
or "CA1864" or "CA1864"
self.data["processingCode"] = INQ_CODE self.data["processingCode"] = INQ_CODE
self.data["billInformation"]["bills"][0]["info"] = p["invoice_id"] self.data["billInformation"]["bills"][0]["info"] = p["invoice_id"]
self.set_local_time() self.set_local_time()
...@@ -193,132 +179,3 @@ INVOICE_PROFILE = [ ...@@ -193,132 +179,3 @@ INVOICE_PROFILE = [
("RESERVED_01", 5) ("RESERVED_01", 5)
] ]
INQ_RESP = \
{
"additionalData": "361198483250691012345678901234564 54P879211 3603110611710004 TUMINO NUANSA MEKARSARI B - 1 / 15 RT 004/006 KA 3538 XCBIRU 001SEPEDA MOTOR R2YAMAHA 54P (CAST WHEEL) AT 20132020090920210909000000000000000000000000000000154000000000000000000000035000000000000000000000000000000000000000000000189000SUKSES 01",
"aggregatorCode": "W0216",
"amountInformation": {
"billAmount": "890000",
"feeAggregator": "0",
"feeBJB": "0",
"totalAmount": "890000"
},
"amountTransaction": "890000",
"billInformation": {
"bills": [
{
"info": "1000000108767"
}, {
"info": "ALBUS DUMBLEDORE"
}, {
"info": "BLACK MAGIC"
}, {
"info": "BLACK MAGIC 101"
}, {
"info": "890000"
}, {
"info": "0"
}, {
"info": "2019"
}, {
"info": "0"
}, {
"info": " "
}, {
"info": " REG"
}, {
"info": " "
}
]
},
"caCode": "CA1830",
"currencyCode": "360",
"destinationAccountNumber": "0012199936360 ",
"featureCode": "009",
"localTransactionDate": "0326",
"merchantType": "6015",
"pay": "PAY",
"posEntryModeCode": "110",
"primaryAccountNumber": "622011888888888888",
"processingCode": "321000",
"responseCode": "00",
"sequenceNumber": "000000880977",
"settlementDate": "0326",
"sourceAccountNumber": "0098889231001",
"systemTraceAuditNumber": "880977",
"terminalAggregator": {
"cardAcceptorName": "NAEE ",
"terminalIdentifierNumber": "1 ",
"terminalName": "TERM "
},
"timeLocalTransaction": "090210",
"track2Data": "622011888888888888=9912?",
"transmissionDateTime": "0107180458"
}
# PAYMENT
PAY_RESP = \
{
"additionalData": "'361198483250691012345678901234564 54P879211 3603110611710004 TUMINO NUANSA MEKARSARI B - 1 / 15 RT 004/006 KA 3538 XCBIRU 001SEPEDA MOTOR R2YAMAHA 54P (CAST WHEEL) AT 20132020090920210909000000000000000000000000000000154000000000000000000000035000000000000000000000000000000000000000000000189000SUKSES 01",
"aggregatorCode": "W0216",
"amountInformation": {
"billAmount": "206500",
"feeAggregator": "0",
"feeBJB": "0",
"totalAmount": "206500"
},
"amountTransaction": "000000890000",
"billInformation": {
"bills": [{
"info": "1000000108767"
}, {
"info": "ALBUS DUMBLEDORE"
}, {
"info": "BLACK MAGIC"
}, {
"info": "BLACK MAGIC 101"
}, {
"info": "890000"
}, {
"info": "0"
}, {
"info": "2019"
}, {
"info": "0"
}, {
"info": " "
}, {
"info": " REG"
}, {
"info": " "
}
]
},
"caCode": "CA1830",
"currencyCode": "360",
"destinationAccountNumber": "0012199936360 ",
"featureCode": "009",
"localTransactionDate": "0326",
"merchantType": "6015",
"numberTransactionBank": '1234567890',
"numberTransactionP": '0987654321',
"pay": "PAY",
"posEntryModeCode": "110",
"primaryAccountNumber": "622011888888888888",
"processingCode": "521000",
"responseCode": "00",
"sequenceNumber": "000000502959",
"settlementDate": "0326",
"sourceAccountNumber": "0098889231001",
"systemTraceAuditNumber": "502959",
"terminalAggregator": {
"cardAcceptorName": "NAEE ",
"terminalIdentifierNumber": "1 ",
"terminalName": "TERM "
},
"timeLocalTransaction": "090210",
"track2Data": "622011888888888888=9912?",
"transmissionDateTime": "0107180458"
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!