[BCQ] Add buying participant name in related BCQ queries

crss-metering/crss-metering-dev.yml

@@ -83,14 +83,15 @@ bcq:
     VALUES (NEXTVAL('HIBERNATE_SEQUENCE'), ?, ?, ?, ?)
   header:
     insert: >
-      INSERT INTO TXN_BCQ_HEADER (BCQ_HEADER_ID, FILE_ID, SELLING_MTN, BUYING_PARTICIPANT, SELLING_PARTICIPANT_NAME,
-      SELLING_PARTICIPANT_SHORT_NAME, STATUS, DECLARATION_DATE) VALUES (NEXTVAL('HIBERNATE_SEQUENCE'), ?, ?, ?, ?, ?, ?, ?)
+      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, DECLARATION_DATE)
+      VALUES (NEXTVAL('HIBERNATE_SEQUENCE'), ?, ?, ?, ?, ?, ?, ?)
     update: >
-      UPDATE TXN_BCQ_HEADER SET FILE_ID = ? WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT = ? AND TRADING_DATE = ?
+      UPDATE TXN_BCQ_HEADER SET FILE_ID = ? WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT_SHORT_NAME = ? AND TRADING_DATE = ?
     count: >
-      SELECT COUNT(*) FROM TXN_BCQ_HEADER WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT = ? AND TRADING_DATE = ?
+      SELECT COUNT(*) FROM TXN_BCQ_HEADER WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT_SHORT_NAME = ? AND TRADING_DATE = ?
     id: >
-      SELECT BCQ_HEADER_ID FROM TXN_BCQ_HEADER WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT = ? AND TRADING_DATE = ?
+      SELECT BCQ_HEADER_ID FROM TXN_BCQ_HEADER WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT_SHORT_NAME = ? AND TRADING_DATE = ?
     status: >
       UPDATE TXN_BCQ_HEADER SET STATUS = ? WHERE BCQ_HEADER_ID = ?
   data:
@@ -104,7 +105,7 @@ bcq:
   display:
     data: >
       SELECT BCQ_HEADER_ID, SELLING_PARTICIPANT_NAME, SELLING_PARTICIPANT_SHORT_NAME, SELLING_MTN,
-      BUYING_PARTICIPANT, TRADING_DATE, TRANSACTION_ID, SUBMITTED_DATE, STATUS
+      BUYING_PARTICIPANT_NAME, BUYING_PARTICIPANT_SHORT_NAME, 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
     count: >
       SELECT COUNT(*) FROM TXN_BCQ_HEADER A INNER JOIN TXN_BCQ_UPLOAD_FILE B ON A.FILE_ID = B.FILE_ID

crss-metering/crss-metering.yml

@@ -96,14 +96,15 @@ bcq:
     VALUES (HIBERNATE_SEQUENCE.NEXTVAL, ?, ?, ?, ?)
   header:
     insert: >
-      INSERT INTO TXN_BCQ_HEADER (BCQ_HEADER_ID, FILE_ID, SELLING_MTN, BUYING_PARTICIPANT, SELLING_PARTICIPANT_NAME,
-      SELLING_PARTICIPANT_SHORT_NAME, STATUS, TRADING_DATE) VALUES (HIBERNATE_SEQUENCE.NEXTVAL, ?, ?, ?, ?, ?, ?, ?)
+      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)
+      VALUES (HIBERNATE_SEQUENCE.NEXTVAL, ?, ?, ?, ?, ?, ?, ?, ?)
     update: >
-      UPDATE TXN_BCQ_HEADER SET FILE_ID = ? WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT = ? AND TRADING_DATE = ?
+      UPDATE TXN_BCQ_HEADER SET FILE_ID = ? WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT_SHORT_NAME = ? AND TRADING_DATE = ?
     count: >
-      SELECT COUNT(*) FROM TXN_BCQ_HEADER WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT = ? AND TRADING_DATE = ?
+      SELECT COUNT(*) FROM TXN_BCQ_HEADER WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT_SHORT_NAME = ? AND TRADING_DATE = ?
     id: >
-      SELECT BCQ_HEADER_ID FROM TXN_BCQ_HEADER WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT = ? AND TRADING_DATE = ?
+      SELECT BCQ_HEADER_ID FROM TXN_BCQ_HEADER WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT_SHORT_NAME = ? AND TRADING_DATE = ?
     status: >
       UPDATE TXN_BCQ_HEADER SET STATUS = ? WHERE BCQ_HEADER_ID = ?
   data:
@@ -117,12 +118,12 @@ bcq:
   display:
     data: >
       SELECT BCQ_HEADER_ID, SELLING_PARTICIPANT_NAME, SELLING_PARTICIPANT_SHORT_NAME, SELLING_MTN,
-      BUYING_PARTICIPANT, TRADING_DATE, TRANSACTION_ID, SUBMITTED_DATE, STATUS
+      BUYING_PARTICIPANT_NAME, BUYING_PARTICIPANT_SHORT_NAME, 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
     count: >
       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, TRADING_DATE, TRANSACTION_ID, SUBMITTED_DATE, STATUS
+      BUYING_PARTICIPANT_NAME, BUYING_PARTICIPANT_SHORT_NAME, 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)