[BCQ] Refactor and add billing id in related queries

crss-metering/crss-metering-dev.yml

@@ -77,35 +77,80 @@ mq:
       ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 bcq:
   manifest: >
-    INSERT INTO TXN_BCQ_UPLOAD_FILE (FILE_ID, TRANSACTION_ID, FILE_NAME, FILE_SIZE, SUBMITTED_DATE)
+    INSERT INTO TXN_BCQ_UPLOAD_FILE (
+      FILE_ID,
+      TRANSACTION_ID,
+      FILE_NAME,
+      FILE_SIZE,
+      SUBMITTED_DATE)
     VALUES (NEXTVAL('HIBERNATE_SEQUENCE'), ?, ?, ?, ?)
   header:
     insert: >
-      INSERT INTO TXN_BCQ_HEADER (BCQ_HEADER_ID, FILE_ID, SELLING_MTN, BUYING_PARTICIPANT_NAME, BUYING_PARTICIPANT_SHORT_NAME,
-      SELLING_PARTICIPANT_NAME, SELLING_PARTICIPANT_SHORT_NAME, STATUS, TRADING_DATE, DEADLINE_DATE)
-      VALUES (NEXTVAL('HIBERNATE_SEQUENCE'), ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      INSERT INTO TXN_BCQ_HEADER (
+        BCQ_HEADER_ID,
+        FILE_ID,
+        SELLING_MTN,
+        BILLING_ID,
+        BUYING_PARTICIPANT_NAME,
+        BUYING_PARTICIPANT_SHORT_NAME,
+        SELLING_PARTICIPANT_NAME,
+        SELLING_PARTICIPANT_SHORT_NAME,
+        STATUS,
+        TRADING_DATE,
+        DEADLINE_DATE)
+      VALUES (NEXTVAL('HIBERNATE_SEQUENCE'), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     update: >
-      UPDATE TXN_BCQ_HEADER SET FILE_ID = ? WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT_SHORT_NAME = ? AND TRADING_DATE = ?
+      UPDATE TXN_BCQ_HEADER SET
+        FILE_ID = ?
+      WHERE SELLING_MTN = ? AND BILLING_ID = ? AND TRADING_DATE = ? AND SELLING_PARTICIPANT_SHORT_NAME = ?
     count: >
-      SELECT COUNT(*) FROM TXN_BCQ_HEADER WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT_SHORT_NAME = ? AND TRADING_DATE = ?
+      SELECT COUNT(*) FROM TXN_BCQ_HEADER
+      WHERE SELLING_MTN = ? AND BILLING_ID = ? AND TRADING_DATE = ? AND SELLING_PARTICIPANT_SHORT_NAME = ?
     id: >
-      SELECT BCQ_HEADER_ID FROM TXN_BCQ_HEADER WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT_SHORT_NAME = ? AND TRADING_DATE = ?
+      SELECT BCQ_HEADER_ID FROM TXN_BCQ_HEADER
+      WHERE SELLING_MTN = ? AND BILLING_ID = ? AND TRADING_DATE = ? AND SELLING_PARTICIPANT_SHORT_NAME = ?
     status: >
       UPDATE TXN_BCQ_HEADER SET STATUS = ? WHERE BCQ_HEADER_ID = ?
   data:
     insert: >
-      INSERT INTO TXN_BCQ_DATA (BCQ_DATA_ID, BCQ_HEADER_ID, REFERENCE_MTN, START_TIME, END_TIME, BCQ)
+      INSERT INTO TXN_BCQ_DATA (
+        BCQ_DATA_ID,
+        BCQ_HEADER_ID,
+        REFERENCE_MTN,
+        START_TIME,
+        END_TIME,
+        BCQ)
       VALUES (NEXTVAL('HIBERNATE_SEQUENCE'), ?, ?, ?, ?, ?)
     update: >
-      UPDATE TXN_BCQ_DATA SET REFERENCE_MTN = ?, BCQ = ? WHERE END_TIME = ? AND BCQ_HEADER_ID = ?
+      UPDATE TXN_BCQ_DATA SET
+        REFERENCE_MTN = ?,
+        BCQ = ?
+       WHERE END_TIME = ? AND BCQ_HEADER_ID = ?
     details: >
-      SELECT REFERENCE_MTN, END_TIME, BCQ FROM TXN_BCQ_DATA WHERE BCQ_HEADER_ID = ?
+      SELECT
+        REFERENCE_MTN,
+        END_TIME,
+        BCQ
+      FROM TXN_BCQ_DATA
+      WHERE BCQ_HEADER_ID = ?
   display:
     data: >
-      SELECT BCQ_HEADER_ID, SELLING_PARTICIPANT_NAME, SELLING_PARTICIPANT_SHORT_NAME, SELLING_MTN,
-      BUYING_PARTICIPANT_NAME, BUYING_PARTICIPANT_SHORT_NAME, TRADING_DATE, DEADLINE_DATE,
-      TRANSACTION_ID, SUBMITTED_DATE, STATUS FROM TXN_BCQ_HEADER A INNER JOIN TXN_BCQ_UPLOAD_FILE B ON A.FILE_ID = B.FILE_ID
+      SELECT
+        BCQ_HEADER_ID,
+        SELLING_MTN,
+        BILLING_ID,
+        BUYING_PARTICIPANT_NAME,
+        BUYING_PARTICIPANT_SHORT_NAME,
+        SELLING_PARTICIPANT_NAME,
+        SELLING_PARTICIPANT_SHORT_NAME,
+        TRADING_DATE,
+        DEADLINE_DATE,
+        TRANSACTION_ID,
+        SUBMITTED_DATE,
+        STATUS
+      FROM TXN_BCQ_HEADER A INNER JOIN TXN_BCQ_UPLOAD_FILE B ON A.FILE_ID = B.FILE_ID
     count: >
-      SELECT COUNT(*) FROM TXN_BCQ_HEADER A INNER JOIN TXN_BCQ_UPLOAD_FILE B ON A.FILE_ID = B.FILE_ID
+      SELECT COUNT(*)
+      FROM TXN_BCQ_HEADER A INNER JOIN TXN_BCQ_UPLOAD_FILE B ON A.FILE_ID = B.FILE_ID
     paginate: >
       {SELECT_QUERY} LIMIT ({PAGE_NO} + 1) * {PAGE_SIZE} OFFSET {PAGE_NO} * {PAGE_SIZE}

crss-metering/crss-metering.yml

@@ -112,38 +112,86 @@ mq:
       ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 bcq:
   manifest: >
-    INSERT INTO TXN_BCQ_UPLOAD_FILE (FILE_ID, TRANSACTION_ID, FILE_NAME, FILE_SIZE, SUBMITTED_DATE)
+    INSERT INTO TXN_BCQ_UPLOAD_FILE (
+      FILE_ID,
+      TRANSACTION_ID,
+      FILE_NAME,
+      FILE_SIZE,
+      SUBMITTED_DATE)
     VALUES (HIBERNATE_SEQUENCE.NEXTVAL, ?, ?, ?, ?)
   header:
     insert: >
-      INSERT INTO TXN_BCQ_HEADER (BCQ_HEADER_ID, FILE_ID, SELLING_MTN, BUYING_PARTICIPANT_NAME, BUYING_PARTICIPANT_SHORT_NAME,
-      SELLING_PARTICIPANT_NAME, SELLING_PARTICIPANT_SHORT_NAME, STATUS, TRADING_DATE, DEADLINE_DATE)
-      VALUES (HIBERNATE_SEQUENCE.NEXTVAL, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      INSERT INTO TXN_BCQ_HEADER (
+        BCQ_HEADER_ID,
+        FILE_ID,
+        SELLING_MTN,
+        BILLING_ID,
+        BUYING_PARTICIPANT_NAME,
+        BUYING_PARTICIPANT_SHORT_NAME,
+        SELLING_PARTICIPANT_NAME,
+        SELLING_PARTICIPANT_SHORT_NAME,
+        STATUS,
+        TRADING_DATE,
+        DEADLINE_DATE)
+      VALUES (HIBERNATE_SEQUENCE.NEXTVAL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     update: >
-      UPDATE TXN_BCQ_HEADER SET FILE_ID = ? WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT_SHORT_NAME = ? AND TRADING_DATE = ?
+      UPDATE TXN_BCQ_HEADER SET
+        FILE_ID = ?
+      WHERE SELLING_MTN = ? AND BILLING_ID = ? AND TRADING_DATE = ? AND SELLING_PARTICIPANT_SHORT_NAME = ?
     count: >
-      SELECT COUNT(*) FROM TXN_BCQ_HEADER WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT_SHORT_NAME = ? AND TRADING_DATE = ?
+      SELECT COUNT(*) FROM TXN_BCQ_HEADER
+      WHERE SELLING_MTN = ? AND BILLING_ID = ? AND TRADING_DATE = ? AND SELLING_PARTICIPANT_SHORT_NAME = ?
     id: >
-      SELECT BCQ_HEADER_ID FROM TXN_BCQ_HEADER WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT_SHORT_NAME = ? AND TRADING_DATE = ?
+      SELECT BCQ_HEADER_ID FROM TXN_BCQ_HEADER
+      WHERE SELLING_MTN = ? AND BILLING_ID = ? AND TRADING_DATE = ? AND SELLING_PARTICIPANT_SHORT_NAME = ?
     status: >
       UPDATE TXN_BCQ_HEADER SET STATUS = ? WHERE BCQ_HEADER_ID = ?
   data:
     insert: >
-      INSERT INTO TXN_BCQ_DATA (BCQ_DATA_ID, BCQ_HEADER_ID, REFERENCE_MTN, START_TIME, END_TIME, BCQ)
+      INSERT INTO TXN_BCQ_DATA (
+        BCQ_DATA_ID,
+        BCQ_HEADER_ID,
+        REFERENCE_MTN,
+        START_TIME,
+        END_TIME,
+        BCQ)
       VALUES (HIBERNATE_SEQUENCE.NEXTVAL, ?, ?, ?, ?, ?)
     update: >
-      UPDATE TXN_BCQ_DATA SET REFERENCE_MTN = ?, BCQ = ? WHERE END_TIME = ? AND BCQ_HEADER_ID = ?
+      UPDATE TXN_BCQ_DATA SET
+        REFERENCE_MTN = ?,
+        BCQ = ?
+       WHERE END_TIME = ? AND BCQ_HEADER_ID = ?
     details: >
-      SELECT REFERENCE_MTN, END_TIME, BCQ FROM TXN_BCQ_DATA WHERE BCQ_HEADER_ID = ?
+      SELECT
+        REFERENCE_MTN,
+        END_TIME,
+        BCQ
+      FROM TXN_BCQ_DATA
+      WHERE BCQ_HEADER_ID = ?
   display:
     data: >
-      SELECT BCQ_HEADER_ID, SELLING_PARTICIPANT_NAME, SELLING_PARTICIPANT_SHORT_NAME, SELLING_MTN,
-      BUYING_PARTICIPANT_NAME, BUYING_PARTICIPANT_SHORT_NAME, TRADING_DATE, DEADLINE_DATE,
-      TRANSACTION_ID, SUBMITTED_DATE, STATUS FROM TXN_BCQ_HEADER A INNER JOIN TXN_BCQ_UPLOAD_FILE B ON A.FILE_ID = B.FILE_ID
+      SELECT
+        BCQ_HEADER_ID,
+        SELLING_MTN,
+        BILLING_ID,
+        BUYING_PARTICIPANT_NAME,
+        BUYING_PARTICIPANT_SHORT_NAME,
+        SELLING_PARTICIPANT_NAME,
+        SELLING_PARTICIPANT_SHORT_NAME,
+        TRADING_DATE,
+        DEADLINE_DATE,
+        TRANSACTION_ID,
+        SUBMITTED_DATE,
+        STATUS
+      FROM TXN_BCQ_HEADER A INNER JOIN TXN_BCQ_UPLOAD_FILE B ON A.FILE_ID = B.FILE_ID
     count: >
-      SELECT COUNT(*) FROM TXN_BCQ_HEADER A INNER JOIN TXN_BCQ_UPLOAD_FILE B ON A.FILE_ID = B.FILE_ID
+      SELECT COUNT(*)
+      FROM TXN_BCQ_HEADER A INNER JOIN TXN_BCQ_UPLOAD_FILE B ON A.FILE_ID = B.FILE_ID
     paginate: >
-      SELECT BCQ_HEADER_ID, SELLING_PARTICIPANT_NAME, SELLING_PARTICIPANT_SHORT_NAME, SELLING_MTN,
-      BUYING_PARTICIPANT_NAME, BUYING_PARTICIPANT_SHORT_NAME, TRADING_DATE, DEADLINE_DATE, TRANSACTION_ID, SUBMITTED_DATE, STATUS
-      FROM (SELECT AB.*, ROWNUM RNUM FROM ({SELECT_QUERY}) AB WHERE ROWNUM < ((({PAGE_NO} + 1) * {PAGE_SIZE}) + 1))
+      SELECT * FROM (
+        SELECT
+         AB.*,
+         ROWNUM RNUM
+       FROM ({SELECT_QUERY}) AB
+       WHERE ROWNUM < ((({PAGE_NO} + 1) * {PAGE_SIZE}) + 1))
       WHERE RNUM >= (({PAGE_NO} * {PAGE_SIZE}) + 1)