Cloudbank version & properties (#861)

Cloudbank updates

Author: andytael

cloudbank-v32/README.md

@@ -2,7 +2,7 @@
 
 **NOTE:** This document and application is WIP.
 
-To run Cloud Bank you need OBaaS version 1.1.1 [Oracle Backend for Spring Boot and Microservices](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/138899911)
+To run Cloud Bank you need OBaaS version 1.1.3 [Oracle Backend for Spring Boot and Microservices](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/138899911)
 
 ## Build CloudBank
 
@@ -169,7 +169,7 @@ deploy --service-name transfer --artifact-path transfer/target/transfer-0.0.1-SN
 
     In the CloudBank directory run the following command. *NOTE*, you must add the API-KEY to the command
 
-    ````shell
+    ```shell
     (cd apisix-routes; source ./create-all-routes.sh <YOUR-API-KEY>)
     ```
 
@@ -333,13 +333,13 @@ This is an example of the `customer32` application:
         Transfer-Encoding: chunked
         Date: Thu, 02 Nov 2023 18:06:45 GMT
 
-        [{"journalId":7,"journalType":"PENDING","accountId":1,"lraId":"0","lraState":null,"journalAmount":256}]
+        [{"journalId":1,"journalType":"PENDING","accountId":1,"lraId":"0","lraState":null,"journalAmount":256}]
         ```
 
     1. Clearance of check - Note the JournalID from earlier step
 
          ```shell
-         curl -i -X POST -H 'Content-Type: application/json' -d '{"journalId": 7}' http://<EXTERNAL-ID>/api/v1/testrunner/clear
+         curl -i -X POST -H 'Content-Type: application/json' -d '{"journalId": 1}' http://<EXTERNAL-ID>/api/v1/testrunner/clear
          ```
 
         output should be similar to:
@@ -350,7 +350,7 @@ This is an example of the `customer32` application:
          Transfer-Encoding: chunked
          Date: Thu, 02 Nov 2023 18:09:17 GMT
 
-         {"journalId":7}
+         {"journalId":1}
          ```
 
     1. Check application log
@@ -381,7 +381,7 @@ This is an example of the `customer32` application:
        Transfer-Encoding: chunked
        Date: Thu, 02 Nov 2023 18:36:31 GMT
 
-       [{"journalId":7,"journalType":"DEPOSIT","accountId":1,"lraId":"0","lraState":null,"journalAmount":256}]`
+       [{"journalId":1,"journalType":"DEPOSIT","accountId":1,"lraId":"0","lraState":null,"journalAmount":256}]`
        ```
 
 1. Run LRA Test Cases

cloudbank-v32/account/pom.xml

@@ -15,13 +15,13 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<name>account</name>
 	<description>Account Application</description>
-
+<!-- 
 	<properties>
 		<oracle-springboot-starter.version>23.4.0</oracle-springboot-starter.version>
 		<oracle-microtx-starter.version>23.4.1</oracle-microtx-starter.version>
 		<liquibase.version>4.25.1</liquibase.version>
 		<datasource-micrometer-spring-boot.version>1.0.3</datasource-micrometer-spring-boot.version>
-	</properties>
+	</properties> -->
 
 	<dependencies>
 		<dependency>

cloudbank-v32/account/src/main/java/com/example/accounts/model/Account.java

@@ -3,8 +3,6 @@
 
 package com.example.accounts.model;
 
-import java.util.Date;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -13,10 +11,7 @@
 import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Generated;
-import org.hibernate.annotations.GenerationTime;
 
-@SuppressWarnings("deprecation") // TODO: Needs to be removed
 @Data
 @NoArgsConstructor
 @Entity
@@ -36,11 +31,7 @@ public class Account {
 
     @Column(name = "CUSTOMER_ID")
     private String accountCustomerId;
-    
-    @Generated(GenerationTime.INSERT)
-    @Column(name = "ACCOUNT_OPENED_DATE", updatable = false, insertable = false)
-    private Date accountOpenedDate;
-    
+
     @Column(name = "ACCOUNT_OTHER_DETAILS")
     private String accountOtherDetails;
 

cloudbank-v32/account/src/main/resources/application.yaml

@@ -51,10 +51,6 @@ eureka:
     register-with-eureka: true
     enabled: true
 
-#lra:
-#  coordinator:
-#    url: ${MP_LRA_COORDINATOR_URL}
-
 management:
   endpoint:
     health:
@@ -84,6 +80,5 @@ logging:
   level:
     root: INFO
     com.example: INFO
-  pattern:
-    level: '%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]'
+
 

cloudbank-v32/account/src/main/resources/db/changelog/data.sql

@@ -1,6 +1,6 @@
 -- liquibase formatted sql
 
--- changeset gotsysdba:1 runAlways:true
+-- changeset account:1 runAlways:true
 DELETE FROM ACCOUNT.JOURNAL;
 TRUNCATE TABLE ACCOUNT.ACCOUNTS;
 

cloudbank-v32/account/src/main/resources/db/changelog/table.sql

@@ -1,23 +1,23 @@
 -- liquibase formatted sql
 
---changeset gotsysdba:1
+--changeset account:1
 --preconditions onFail:MARK_RAN onerror:MARK_RAN
 --precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM ACCOUNT.ACCOUNTS WHERE 1=2
 DROP TABLE ACCOUNT.ACCOUNTS CASCADE CONSTRAINTS;
 
---changeset gotsysdba:2
+--changeset account:2
 --preconditions onFail:MARK_RAN onerror:MARK_RAN
 --precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM ACCOUNT.JOURNAL WHERE 1=2
-DROP TABLE ACCOUNT.JOURNAL;
+DROP TABLE ACCOUNT.JOURNAL CASCADE CONSTRAINTS;
 
---changeset gotsysdba:3
+--changeset account:3
 CREATE TABLE ACCOUNT.ACCOUNTS (
                                   ACCOUNT_ID NUMBER GENERATED ALWAYS AS IDENTITY (START WITH 1 CACHE 20),
                                   ACCOUNT_NAME VARCHAR2(40) NOT NULL,
                                   ACCOUNT_TYPE VARCHAR2(2) CHECK (ACCOUNT_TYPE IN ('CH', 'SA', 'CC', 'LO')),
                                   CUSTOMER_ID VARCHAR2 (20),
                                   ACCOUNT_OPENED_DATE DATE DEFAULT SYSDATE NOT NULL,
-                                  ACCOUNT_OTHER_DETAILS VARCHAR2(4000),
+                                  ACCOUNT_OTHER_DETAILS VARCHAR2(256),
                                   ACCOUNT_BALANCE NUMBER
 ) LOGGING;
 ALTER TABLE ACCOUNT.ACCOUNTS ADD CONSTRAINT ACCOUNTS_PK PRIMARY KEY (ACCOUNT_ID) USING INDEX LOGGING;

cloudbank-v32/account/src/main/resources/db/changelog/txeventq.sql

@@ -16,25 +16,34 @@ grant execute on dbms_aqjms_internal to account;
 --changeset atael:2 endDelimiter:/
 begin
     -- deposits
-    dbms_aqadm.create_queue_table(
-            queue_table        => 'ACCOUNT.deposits_qt',
-            queue_payload_type => 'SYS.AQ$_JMS_TEXT_MESSAGE',
-            multiple_consumers => false);
-    dbms_aqadm.create_queue(
-            queue_name         => 'ACCOUNT.deposits',
-            queue_table        => 'ACCOUNT.deposits_qt');
-    dbms_aqadm.start_queue(
-            queue_name         => 'ACCOUNT.deposits');
+    begin
+        dbms_aqadm.create_queue_table(
+                queue_table        => 'ACCOUNT.deposits_qt',
+                queue_payload_type => 'SYS.AQ$_JMS_TEXT_MESSAGE',
+                multiple_consumers => false);
+        dbms_aqadm.create_queue(
+                queue_name         => 'ACCOUNT.deposits',
+                queue_table        => 'ACCOUNT.deposits_qt');
+        dbms_aqadm.start_queue(
+                queue_name         => 'ACCOUNT.deposits');
+    exception when others then
+        dbms_output.put_line(SQLCODE);
+    end;
+
     -- clearances
-    dbms_aqadm.create_queue_table(
-            queue_table        => 'ACCOUNT.clearances_qt',
-            queue_payload_type => 'SYS.AQ$_JMS_TEXT_MESSAGE',
-            multiple_consumers => false);
-    dbms_aqadm.create_queue(
-            queue_name         => 'ACCOUNT.clearances',
-            queue_table        => 'ACCOUNT.clearances_qt');
-    dbms_aqadm.start_queue(
-            queue_name         => 'ACCOUNT.clearances');
+    begin
+        dbms_aqadm.create_queue_table(
+                queue_table        => 'ACCOUNT.clearances_qt',
+                queue_payload_type => 'SYS.AQ$_JMS_TEXT_MESSAGE',
+                multiple_consumers => false);
+        dbms_aqadm.create_queue(
+                queue_name         => 'ACCOUNT.clearances',
+                queue_table        => 'ACCOUNT.clearances_qt');
+        dbms_aqadm.start_queue(
+                queue_name         => 'ACCOUNT.clearances');
+    exception when others then
+        dbms_output.put_line(SQLCODE);
+    end;
 end;
 /
 

cloudbank-v32/apisix-routes/create-accounts-route.sh

@@ -17,6 +17,7 @@ curl http://localhost:9180/apisix/admin/routes/1000 \
     "labels": { 
         "version": "1.0" 
     },
+    "desc": "ACCOUNT Service",
     "uri": "/api/v1/account*",
     "methods": [
       "GET",

cloudbank-v32/apisix-routes/create-creditscore-route.sh

@@ -17,6 +17,7 @@ curl http://localhost:9180/apisix/admin/routes/1001 \
     "labels": { 
         "version": "1.0" 
     },
+    "desc": "CREDITSCORE Service",
     "uri": "/api/v1/creditscore*",
     "methods": [
       "GET",

cloudbank-v32/apisix-routes/create-customer-route.sh

@@ -17,6 +17,7 @@ curl http://localhost:9180/apisix/admin/routes/1003 \
     "labels": { 
         "version": "1.0" 
     },
+    "desc": "CUSTOMER Service",
     "uri": "/api/v1/customer*",
     "methods": [
       "GET",