Merge branch 'master' of https://gitlab.exist.com/pemc/config

crss-metering/crss-metering-pg-query.yml

@@ -4,15 +4,16 @@ mq:
       insert: >
         INSERT INTO TXN_MQ_MANIFEST_HEADER
         (
-          HEADER_ID, TRANSACTION_ID, MSP_SHORTNAME, FILE_COUNT, NOTIFICATION_SENT, TAIL_RECEIVED, CATEGORY, UPLOAD_BY, UPLOAD_DATETIME, CONVERTED_TO_FIVE_MIN
+          HEADER_ID, TRANSACTION_ID, MSP_SHORTNAME, FILE_COUNT, NOTIFICATION_SENT, TAIL_RECEIVED, CATEGORY, UPLOAD_BY, UPLOAD_DATETIME, CONVERTED_TO_FIVE_MIN, CLOSURE_TIME_SETTING, ALLOWABLE_DATE_SETTING
         )
         VALUES (
-          NEXTVAL('MQ_MANIFEST_HEADER_SEQ'), :transactionID, :mspShortName, :fileCount, 'N', 'N', :category, :uploadedBy, :uploadDateTime, :convertedToFiveMin
+          NEXTVAL('MQ_MANIFEST_HEADER_SEQ'), :transactionID, :mspShortName, :fileCount, 'N', 'N', :category, :uploadedBy, :uploadDateTime, :convertedToFiveMin, :closureTimeSetting, :allowableDateSetting
         )
       query: >
         SELECT HEADER_ID AS headerID, TRANSACTION_ID AS transactionID, MSP_SHORTNAME AS mspShortName, FILE_COUNT AS fileCount,
           CATEGORY AS category, NOTIFICATION_SENT AS notificationSent, NOTIFICATION_DATETIME AS notificationDateTime,
-          TAIL_RECEIVED AS tailReceived, UPLOAD_BY AS uploadedBy, UPLOAD_DATETIME AS UploadDateTime, CONVERTED_TO_FIVE_MIN AS convertedToFiveMin
+          TAIL_RECEIVED AS tailReceived, UPLOAD_BY AS uploadedBy, UPLOAD_DATETIME AS UploadDateTime, CONVERTED_TO_FIVE_MIN AS convertedToFiveMin,
+          CLOSURE_TIME_SETTING as closureTimeSetting, ALLOWABLE_DATE_SETTING as allowableDateSetting
         FROM TXN_MQ_MANIFEST_HEADER
         WHERE HEADER_ID = :headerID
       count: >