[BCQ] Some refactoring and query changes

crss-metering/crss-metering-dev.yml

@@ -99,12 +99,10 @@ bcq:
       SELECT REFERENCE_MTN, END_TIME, BCQ FROM TXN_BCQ_DATA WHERE BCQ_HEADER_ID = ?
   display:
     data: >
-      SELECT SELLING_PARTICIPANT_NAME, SELLING_PARTICIPANT_SHORT_NAME, SELLING_MTN,
+      SELECT BCQ_HEADER_ID, SELLING_PARTICIPANT_NAME, SELLING_PARTICIPANT_SHORT_NAME, SELLING_MTN,
       BUYING_PARTICIPANT, TRADING_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
-      WHERE A.TRADING_DATE = ?
     count: >
       SELECT COUNT(*) FROM TXN_BCQ_HEADER A INNER JOIN TXN_BCQ_UPLOAD_FILE B ON A.FILE_ID = B.FILE_ID
-      WHERE A.TRADING_DATE = ?
-    wrapper: >
+    paginate: >
       {SELECT_QUERY} LIMIT ({PAGE_NO} + 1) * {PAGE_SIZE} OFFSET {PAGE_NO} * {PAGE_SIZE}

crss-metering/crss-metering.yml

@@ -112,15 +112,13 @@ bcq:
       SELECT REFERENCE_MTN, END_TIME, BCQ FROM TXN_BCQ_DATA WHERE BCQ_HEADER_ID = ?
   display:
     data: >
-      SELECT SELLING_PARTICIPANT_NAME, SELLING_PARTICIPANT_SHORT_NAME, SELLING_MTN,
+      SELECT BCQ_HEADER_ID, SELLING_PARTICIPANT_NAME, SELLING_PARTICIPANT_SHORT_NAME, SELLING_MTN,
       BUYING_PARTICIPANT, TRADING_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
-      WHERE A.TRADING_DATE = ?
     count: >
       SELECT COUNT(*) FROM TXN_BCQ_HEADER A INNER JOIN TXN_BCQ_UPLOAD_FILE B ON A.FILE_ID = B.FILE_ID
-      WHERE A.TRADING_DATE = ?
-    wrapper: >
-      SELECT SELLING_PARTICIPANT_NAME, SELLING_PARTICIPANT_SHORT_NAME, SELLING_MTN,
+    paginate: >
+      SELECT BCQ_HEADER_ID, SELLING_PARTICIPANT_NAME, SELLING_PARTICIPANT_SHORT_NAME, SELLING_MTN,
       BUYING_PARTICIPANT, TRADING_DATE, TRANSACTION_ID, SUBMITTED_DATE, STATUS
       FROM (SELECT AB.*, ROWNUM RNUM FROM ({SELECT_QUERY}) AB WHERE ROWNUM < ((({PAGE_NO} + 1) * {PAGE_SIZE}) + 1))
       WHERE RNUM >= (({PAGE_NO} * {PAGE_SIZE}) + 1)