penambahan field kecamatan & kelurahan pada table bphtb_report

CHANGES.txt

+3.1.5 2024-10-23
+----------------
+- Tambah field kecamatan_op dan kelurahan_op pada table bphtb_report untuk
+  kebutuhan rekonsiliasi data.
+
 3.1.4 2024-05-07
 3.1.4 2024-05-07
 ----------------
 ----------------
 - Tambah PBB H2H Only
 - Tambah PBB H2H Only

payment_report/bphtb/default.py

@@ -29,11 +29,15 @@ from opensipkd.bphtb.models.customer import CustomerMixin
 from opensipkd.bphtb.models.perolehan import PerolehanMixin
 from opensipkd.bphtb.models.perolehan import PerolehanMixin
 from opensipkd.bphtb.models.invoice import InvoiceMixin
 from opensipkd.bphtb.models.invoice import InvoiceMixin
 from opensipkd.bphtb.models.payment import PaymentMixin
 from opensipkd.bphtb.models.payment import PaymentMixin
+from opensipkd.bphtb.models.kecamatan import KecamatanMixin
+from opensipkd.bphtb.models.kelurahan import KelurahanMixin
 from opensipkd.bphtb.models.default import (
 from opensipkd.bphtb.models.default import (
     Payment,
     Payment,
     Invoice,
     Invoice,
     Perolehan,
     Perolehan,
     Customer,
     Customer,
+    Kecamatan,
+    Kelurahan,
     )
     )
 from opensipkd.bphtb.structure import NOP
 from opensipkd.bphtb.structure import NOP
 from opensipkd.bphtb.services.default.structure import INVOICE_ID
 from opensipkd.bphtb.services.default.structure import INVOICE_ID
@@ -247,9 +251,13 @@ class App(BaseApp):
         self.Perolehan = Perolehan
         self.Perolehan = Perolehan
         self.Invoice = Invoice
         self.Invoice = Invoice
         self.Payment = Payment
         self.Payment = Payment
+        self.Kecamatan = Kecamatan
+        self.Kelurahan = Kelurahan
         self.base_q_cust = self.prod_session.query(self.Customer)
         self.base_q_cust = self.prod_session.query(self.Customer)
         self.base_q_perolehan = self.prod_session.query(self.Perolehan)
         self.base_q_perolehan = self.prod_session.query(self.Perolehan)
         self.base_q_pay = self.prod_session.query(self.Payment)
         self.base_q_pay = self.prod_session.query(self.Payment)
+        self.base_q_kecamatan = self.prod_session.query(self.Kecamatan)
+        self.base_q_kelurahan = self.prod_session.query(self.Kelurahan)
 
 
     def set_alternative_models(self):
     def set_alternative_models(self):
         self.base_q_inv = self.prod_session.query(AlternativeInvoice)
         self.base_q_inv = self.prod_session.query(AlternativeInvoice)
@@ -429,6 +437,14 @@ class App(BaseApp):
         q = self.base_q_perolehan.filter_by(id=inv.perolehan_id)
         q = self.base_q_perolehan.filter_by(id=inv.perolehan_id)
         return q.first()
         return q.first()
 
 
+    def get_kecamatan_nama(self, inv):
+        q = self.base_q_kecamatan.filter_by(kd_propinsi=inv.kd_propinsi, kd_dati2=inv.kd_dati2, kd_kecamatan=inv.kd_kecamatan)
+        return q.first()
+
+    def get_kelurahan_nama(self, inv):
+        q = self.base_q_kelurahan.filter_by(kd_propinsi=inv.kd_propinsi, kd_dati2=inv.kd_dati2, kd_kecamatan=inv.kd_kecamatan, kd_kelurahan=inv.kd_kelurahan)
+        return q.first()
+
     def create_data_sukabumi_kota(self, pay):
     def create_data_sukabumi_kota(self, pay):
         inv = self.get_invoice(pay)
         inv = self.get_invoice(pay)
         if not inv:
         if not inv:
@@ -502,6 +518,8 @@ class App(BaseApp):
             raise InvalidSource(msg)
             raise InvalidSource(msg)
         cust = self.get_customer(inv)
         cust = self.get_customer(inv)
         perolehan = self.get_perolehan(inv)
         perolehan = self.get_perolehan(inv)
+        kecamatan = self.get_kecamatan_nama(inv)
+        kelurahan = self.get_kelurahan_nama(inv)
         invoice_id = FixLength(INVOICE_ID)
         invoice_id = FixLength(INVOICE_ID)
         invoice_id['Tahun'] = inv.tahun
         invoice_id['Tahun'] = inv.tahun
         invoice_id['Kode'] = inv.kode
         invoice_id['Kode'] = inv.kode
@@ -529,4 +547,5 @@ class App(BaseApp):
             bumi_luas=pay.bumi_luas, bng_luas=pay.bng_luas,
             bumi_luas=pay.bumi_luas, bng_luas=pay.bng_luas,
             nilai_bphtb=pay.bayar, jenis_perolehan=perolehan.nama,
             nilai_bphtb=pay.bayar, jenis_perolehan=perolehan.nama,
             ppat=cust.nama.strip(), channel_id=channel_id,
             ppat=cust.nama.strip(), channel_id=channel_id,
-            channel_nama=channel_nama)
+            channel_nama=channel_nama, kecamatan_op=kecamatan.nm_kecamatan, 
+            kelurahan_op=kelurahan.nm_kelurahan)

payment_report/models.py

@@ -141,8 +141,12 @@ class Bphtb(Base, Common):
     channel_nama = Column(String(32), nullable=False)
     channel_nama = Column(String(32), nullable=False)
     # bphtb.bphtb_reversal.tgl
     # bphtb.bphtb_reversal.tgl
     tgl_batal = Column(DateTime(timezone=True))
     tgl_batal = Column(DateTime(timezone=True))
+    
     status_pembayaran = Column(Integer)
     status_pembayaran = Column(Integer)
-
+    # pbb.ref_kecamatan.nm_kecamatan
+    kecamatan_op = Column(String(64))
+    # pbb.ref_kelurahan.nm_kelurahan
+    kelurahan_op = Column(String(64))
 
 
 class Pbb(Base, Common):
 class Pbb(Base, Common):
     __tablename__ = 'pbb_report'
     __tablename__ = 'pbb_report'