[143587] Uploader status update enhancement

crss-metering/application-oracle-query.yml

@@ -2,14 +2,19 @@ mq:
   manifest:
     header:
       insert: >
-        INSERT INTO TXN_MQ_MANIFEST_HEADER (HEADER_ID, TRANSACTION_ID, FILE_COUNT, TAIL_RECEIVED, CATEGORY, UPLOAD_BY, UPLOAD_DATETIME)
+        INSERT INTO TXN_MQ_MANIFEST_HEADER
+        (
+          HEADER_ID, TRANSACTION_ID, FILE_COUNT, NOTIFICATION_SENT, TAIL_RECEIVED, CATEGORY, UPLOAD_BY, UPLOAD_DATETIME
+        )
         VALUES (
-          MQ_MANIFEST_HEADER_SEQ.NEXTVAL, :transactionID, :fileCount, 'N', :category, :uploadedBy, :uploadDateTime
+          MQ_MANIFEST_HEADER_SEQ.NEXTVAL, :transactionID, :fileCount, 'N', 'N', :category, :uploadedBy, :uploadDateTime
         )
       query: >
-        SELECT HEADER_ID AS headerID, TRANSACTION_ID AS transactionID, FILE_COUNT AS fileCount, CATEGORY AS category,
-        TAIL_RECEIVED AS tailReceived
-        FROM TXN_MQ_MANIFEST_HEADER WHERE HEADER_ID = :headerID
+        SELECT HEADER_ID AS headerID, TRANSACTION_ID AS transactionID, 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
+        FROM TXN_MQ_MANIFEST_HEADER
+        WHERE HEADER_ID = :headerID
       count: >
         SELECT COUNT(*) FROM TXN_MQ_MANIFEST_HEADER WHERE TAIL_RECEIVED = 'N' AND HEADER_ID = :headerID
     trailer:
@@ -21,6 +26,17 @@ mq:
         VALUES (
           MQ_MANIFEST_FILE_SEQ.NEXTVAL, :headerID, :transactionID, :fileName, :fileType, :fileSize, :checksum, :uploadDateTime
         )
+      status: >
+        SELECT FILE_ID AS fileID,
+               HEADER_ID AS headerID,
+               TRANSACTION_ID AS transactionID,
+               FILENAME,
+               PROCESS_FLAG AS processFlag,
+               STATUS,
+               ERROR_DETAILS AS errorDetails
+        FROM TXN_MQ_MANIFEST_FILE
+        WHERE HEADER_ID = :headerID
+          AND PROCESS_FLAG = 'Y'
       query: >
         SELECT A.FILE_ID as fileID,
                A.HEADER_ID AS headerID,
@@ -36,7 +52,8 @@ mq:
         FROM TXN_MQ_MANIFEST_FILE A INNER JOIN TXN_MQ_MANIFEST_HEADER B ON A.HEADER_ID = B.HEADER_ID
         WHERE B.HEADER_ID = :headerID
     status: >
-      UPDATE TXN_MQ_MANIFEST_FILE SET PROCESS_FLAG = 'Y', STATUS = :status, ERROR_DETAILS = :errorDetail WHERE FILE_ID = :fileID
+      UPDATE TXN_MQ_MANIFEST_FILE SET PROCESS_FLAG = 'Y', STATUS = :status, ERROR_DETAILS = :errorDetail, PROCESS_DATETIME = :processDateTime
+      WHERE FILE_ID = :fileID
     upload:
       status: >
          select count(*) from txn_mq_manifest_header h

crss-metering/application-pg-query.yml

@@ -2,14 +2,19 @@ mq:
   manifest:
     header:
       insert: >
-        INSERT INTO TXN_MQ_MANIFEST_HEADER (HEADER_ID, TRANSACTION_ID, FILE_COUNT, TAIL_RECEIVED, CATEGORY, UPLOAD_BY, UPLOAD_DATETIME)
+        INSERT INTO TXN_MQ_MANIFEST_HEADER
+        (
+          HEADER_ID, TRANSACTION_ID, FILE_COUNT, NOTIFICATION_SENT, TAIL_RECEIVED, CATEGORY, UPLOAD_BY, UPLOAD_DATETIME
+        )
         VALUES (
-          NEXTVAL('MQ_MANIFEST_HEADER_SEQ'), :transactionID, :fileCount, 'N', :category, :uploadedBy, :uploadDateTime
+          NEXTVAL('MQ_MANIFEST_HEADER_SEQ'), :transactionID, :fileCount, 'N', 'N', :category, :uploadedBy, :uploadDateTime
         )
       query: >
-        SELECT HEADER_ID AS headerID, TRANSACTION_ID AS transactionID, FILE_COUNT AS fileCount, CATEGORY AS category,
-        TAIL_RECEIVED AS tailReceived
-        FROM TXN_MQ_MANIFEST_HEADER WHERE HEADER_ID = :headerID
+        SELECT HEADER_ID AS headerID, TRANSACTION_ID AS transactionID, 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
+        FROM TXN_MQ_MANIFEST_HEADER
+        WHERE HEADER_ID = :headerID
       count: >
         SELECT COUNT(*) FROM TXN_MQ_MANIFEST_HEADER WHERE TAIL_RECEIVED = 'N' AND HEADER_ID = :headerID
     trailer:
@@ -21,6 +26,17 @@ mq:
         VALUES (
           NEXTVAL('MQ_MANIFEST_FILE_SEQ'), :headerID, :transactionID, :fileName, :fileType, :fileSize, :checksum, :uploadDateTime
         )
+      status: >
+        SELECT FILE_ID AS fileID,
+               HEADER_ID AS headerID,
+               TRANSACTION_ID AS transactionID,
+               FILENAME,
+               PROCESS_FLAG AS processFlag,
+               STATUS,
+               ERROR_DETAILS AS errorDetails
+        FROM TXN_MQ_MANIFEST_FILE
+        WHERE HEADER_ID = :headerID
+          AND PROCESS_FLAG = 'Y'
       query: >
         SELECT A.FILE_ID as fileID,
                A.HEADER_ID AS headerID,
@@ -36,7 +52,8 @@ mq:
         FROM TXN_MQ_MANIFEST_FILE A INNER JOIN TXN_MQ_MANIFEST_HEADER B ON A.HEADER_ID = B.HEADER_ID
         WHERE B.HEADER_ID = :headerID
     status: >
-      UPDATE TXN_MQ_MANIFEST_FILE SET PROCESS_FLAG = 'Y', STATUS = :status, ERROR_DETAILS = :errorDetail WHERE FILE_ID = :fileID
+      UPDATE TXN_MQ_MANIFEST_FILE SET PROCESS_FLAG = 'Y', STATUS = :status, ERROR_DETAILS = :errorDetail, PROCESS_DATETIME = :processDateTime
+      WHERE FILE_ID = :fileID
     upload:
       status: >
          select count(*) from txn_mq_manifest_header h

crss-metering/application.yml

@@ -2,6 +2,4 @@ spring:
   http.multipart:
     enabled: true
     maxFileSize: 5MB
-    maxRequestSize: 5MB
-    fileSizeThreshold: 5MB
-    resolveLazily: false
+    resolveLazily: false