Config changes related to metering service

- Added file upload size constraints
- Optimized devoracle profile

crss-metering/crss-metering-devoracle.yml

@@ -1,16 +1,9 @@
 # Experimental configuration to run metering in a developer's environment connecting to some staging services (database and messaging)
 spring:
-  datasource:
-    platform: oracle
-    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-    username: crss_metering
-    password: crss_metering
-    driverClassName: oracle.jdbc.OracleDriver
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 20
   rabbitmq:
-    host: pemc-oracle.ss.exist.com
+    username: guest
+    password: guest
+    host: localhost
     ports:
       - "5672:5672"
       - "15672:15672"
@@ -41,69 +34,12 @@ eureka:
 security:
   oauth2:
     client:
-      accessTokenUri: http://app:8080/admin/oauth/access_token
-      userAuthorizationUri: http://app:8080/admin/oauth/authorize
+      accessTokenUri: http://localhost:8082/oauth/access_token
+      userAuthorizationUri: http://localhost:8082/oauth/authorize
       clientId: crss
       clientSecret: crsssecret
       authorized-grant-types: authorization_code,refresh_token,password
       scope: openid
       access-token-validity-seconds: 3600
     resource:
-      userInfoUri: http://app:8080/admin/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: WARN
-    org.springframework.cloud: WARN
-    org.hibernate.SQL: DEBUG
-
-mq:
-  manifest:
-    header: >
-      INSERT INTO TXN_MQ_MANIFEST_HEADER (header_id, transaction_id, msp_id, file_count, category,
-      upload_by, upload_datetime) VALUES (HIBERNATE_SEQUENCE.NEXTVAL, ?, ?, ?, ?, ?, ?)
-    trailer: >
-      UPDATE TXN_MQ_MANIFEST_HEADER SET tail_received = 'Y' WHERE transaction_id = ?
-    file: >
-      INSERT INTO TXN_MQ_MANIFEST_FILE (file_id, header_id, transaction_id, filename, filetype,
-      filesize, checksum) VALUES (HIBERNATE_SEQUENCE.NEXTVAL, ?, ?, ?, ?, ?, ?)
-  meter:
-    # TODO: Reduce redundant codes
-    daily: >
-      INSERT INTO TXN_METER_DATA_DAILY VALUES(
-      HIBERNATE_SEQUENCE.NEXTVAL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
-      ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-    monthly: >
-      INSERT INTO TXN_METER_DATA_MONTHLY VALUES(
-      HIBERNATE_SEQUENCE.NEXTVAL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
-      ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-bcq:
-  manifest: >
-    INSERT INTO TXN_BCQ_UPLOAD_FILE (FILE_ID, TRANSACTION_ID, FILE_NAME, FILE_SIZE, STATUS, SUBMITTED_DATE)
-    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, ?, ?, ?, ?, ?, ?, ?)
-    update: >
-      UPDATE TXN_BCQ_HEADER SET FILE_ID = ? WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT = ? AND TRADING_DATE = ?
-    count: >
-      SELECT COUNT(*) FROM TXN_BCQ_HEADER WHERE SELLING_MTN = ? AND BUYING_PARTICIPANT = ? AND DECLARATION_DATE = ?
-  data:
-    insert: >
-      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 = ?
-  display:
-    data: >
-      SELECT A.SELLING_PARTICIPANT_NAME, A.SELLING_PARTICIPANT_SHORT_NAME, A.SELLING_MTN,
-      A.BUYING_PARTICIPANT, A.TRADING_DATE, B.TRANSACTION_ID, B.SUBMITTED_DATE, A.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 = ?
-    pagination: >
-      OFFSET ? ROWS FETCH NEXT ? ROWS ONLY
+      userInfoUri: http://localhost:8082/user

crss-metering/crss-metering.yml

@@ -13,6 +13,13 @@ spring:
     ports:
       - "5672:5672"
       - "15672:15672"
+  http:
+    multipart:
+      enabled: true
+      maxFileSize: 2MB
+      maxRequestSize: 5MB
+      fileSizeThreshold: 5MB
+      resolveLazily: false
 
 server:
   port: 8080