Merge pull request #167 from ConsumerDataStandardsAustralia/feature/testdata-integration-banking

Loading of testdata for Banking

Author: vadkor

client-cli/README.md

@@ -29,11 +29,11 @@ or, if you want to point to your own keystore:
 
     docker run -p 8686:8686 -it -v /your/local/path/to/java-artefacts/client-cli/keystore:/keystore consumerdatastandardsaustralia/client-cli:x.x.x
 
-Where `x.x.x` is the version, say, `2.1.0`
+Where `x.x.x` is the version, say, `2.2.0`
 
 Run locally-built image:
 
-    docker run -p 8383:8383 consumerdatastandardsaustralia/data-holder:2.1.1-SNAPSHOT
+    docker run -p 8383:8383 consumerdatastandardsaustralia/data-holder:2.2.1-SNAPSHOT
 
 ### Command Reference
 
@@ -183,8 +183,8 @@ or in the application.properties file before launching the application with `mvn
 
 Example:
 
-    java -Dserver=http://localhost:8383/cds-au/v1 -jar target/client-cli-2.1.0.jar
+    java -Dserver=http://localhost:8383/cds-au/v1 -jar target/client-cli-2.2.0.jar
 
 or
 
-    java -Dserver=http://localhost:8383/cds-au/v1 -jar target/client-cli-2.1.1-SNAPSHOT.jar
+    java -Dserver=http://localhost:8383/cds-au/v1 -jar target/client-cli-2.2.1-SNAPSHOT.jar

client/src/main/java/au/org/consumerdatastandards/client/ApiClient.java

@@ -65,7 +65,7 @@ public ApiClient(boolean validating) {
         json = new JSON(validating);
 
         // Set default User-Agent.
-        setUserAgent("CDS Client/2.1.0/java");
+        setUserAgent("CDS Client/2.2.0/java");
 
         addDefaultHeader("Accept", "application/json");
         addDefaultHeader("Content-Type", "application/json");

data-holder/README.md

@@ -20,7 +20,7 @@ If you want to pass a [test data file](https://github.com/ConsumerDataStandardsA
 
     java -jar target/data-holder-x.x.x.jar /your/local/path/to/testdata-cli/samples/output/u1-output.json
 
-Where `x.x.x` is the version, say, `2.1.0`
+Where `x.x.x` is the version, say, `2.2.0`
 
 ## Docker
 
@@ -36,8 +36,8 @@ If you want to pass a [test data file](https://github.com/ConsumerDataStandardsA
 
     docker run -p 8383:8383 -v /your/local/path/to/testdata-cli/samples/output/u1-output.json:/testdata/u1-output.json consumerdatastandardsaustralia/data-holder:x.x.x /testdata/u1-output.json
 
-Where `x.x.x` is the version, say, `2.1.0`
+Where `x.x.x` is the version, say, `2.2.0`
 
 Run locally-built image:
 
-    docker run -p 8383:8383 consumerdatastandardsaustralia/data-holder:2.1.1-SNAPSHOT
+    docker run -p 8383:8383 consumerdatastandardsaustralia/data-holder:2.2.1-SNAPSHOT

data-holder/src/main/java/au/org/consumerdatastandards/holder/api/banking/BankingAccountsApiController.java

@@ -136,6 +136,8 @@ public ResponseEntity<ResponseBankingTransactionList> getTransactions(String acc
         HttpHeaders headers = generateResponseHeaders(xFapiInteractionId, supportedVersion);
         Integer actualPage = getPagingValue(page, 1);
         Integer actualPageSize = getPagingValue(pageSize, 25);
+        newestTime = (newestTime == null ? OffsetDateTime.now() : newestTime);
+        oldestTime = (oldestTime == null ? newestTime.minusDays(90) : oldestTime);
         Page<BankingTransaction> transactionPage = transactionService.findTransactions(
             accountId, maxAmount, minAmount, newestTime, oldestTime, text, PageRequest.of(actualPage - 1, actualPageSize));
         validatePageRange(actualPage, transactionPage.getTotalPages(), xFapiInteractionId);

data-holder/src/main/java/au/org/consumerdatastandards/holder/model/CommonPhysicalAddress.java

@@ -25,12 +25,20 @@ public enum AddressUType {
 
     private AddressUType addressUType;
 
-    @ManyToOne
+    @ManyToOne(cascade = CascadeType.ALL)
     private CommonPAFAddress paf;
 
     @Embedded
     private CommonSimpleAddress simple;
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public CommonPhysicalAddress addressUType(AddressUType addressUType) {
         this.addressUType = addressUType;
         return this;

data-holder/src/main/java/au/org/consumerdatastandards/holder/model/banking/BankingAccountDetail.java

@@ -43,11 +43,6 @@ public enum SpecificAccountUType {
 
     void setDepositRate(String depositRate);
 
-    @ApiModelProperty(value = "Fully described deposit rates for this account based on the equivalent structure in Product Reference")
-    List<BankingProductDepositRateV1> getDepositRates();
-
-    void setDepositRates(List<BankingProductDepositRateV1> depositRates);
-
     @ApiModelProperty(value = "Array of features of the account based on the equivalent structure in Product Reference with the following additional field")
     List<BankingAccountProductFeature> getFeatures();
 
@@ -63,11 +58,6 @@ public enum SpecificAccountUType {
 
     void setLendingRate(String lendingRate);
 
-    @ApiModelProperty(value = "Fully described lending rates for this account based on the equivalent structure in Product Reference")
-    List<BankingProductLendingRateV1> getLendingRates();
-
-    void setLendingRates(List<BankingProductLendingRateV1> lendingRates);
-
     @ApiModelProperty
     BankingLoanAccount getLoan();
 

data-holder/src/main/java/au/org/consumerdatastandards/holder/model/banking/BankingAccountDetailV1.java

@@ -122,7 +122,11 @@ public class BankingAccountDetailV1 implements BankingAccountDetail {
     /**
      * Array of features of the account based on the equivalent structure in Product Reference with the following additional field
      */
-    @OneToMany
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinTable(
+        name = "banking_account_features",
+        joinColumns = @JoinColumn(name = "banking_account_id"),
+        inverseJoinColumns = @JoinColumn(name = "feature_id"))
     private List<BankingAccountProductFeature> features;
 
     /**
@@ -151,11 +155,19 @@ public class BankingAccountDetailV1 implements BankingAccountDetail {
     private List<BankingProductLendingRateV1> lendingRates;
 
     @ManyToOne
+    @JoinTable(
+            name = "b_account_loans",
+            joinColumns = @JoinColumn(name = "account_id"),
+            inverseJoinColumns = @JoinColumn(name = "loan_id"))
     private BankingLoanAccount loan;
 
     private SpecificAccountUType specificAccountUType;
 
     @OneToMany
+    @JoinTable(
+            name = "b_account_term_deposits",
+            joinColumns = @JoinColumn(name = "account_id"),
+            inverseJoinColumns = @JoinColumn(name = "term_deposit_id"))
     private List<BankingTermDepositAccount> termDeposit;
 
     @Override
@@ -420,13 +432,11 @@ public BankingAccountDetail addItem(BankingProductDepositRateV1 depositRatesItem
         return this;
     }
 
-    @Override
     @ApiModelProperty(value = "Fully described deposit rates for this account based on the equivalent structure in Product Reference")
     public List<BankingProductDepositRateV1> getDepositRates() {
         return depositRates;
     }
 
-    @Override
     public void setDepositRates(List<BankingProductDepositRateV1> depositRates) {
         this.depositRates = depositRates;
     }
@@ -508,13 +518,11 @@ public BankingAccountDetail addItem(BankingProductLendingRateV1 lendingRatesItem
         return this;
     }
 
-    @Override
     @ApiModelProperty(value = "Fully described lending rates for this account based on the equivalent structure in Product Reference")
     public List<BankingProductLendingRateV1> getLendingRates() {
         return lendingRates;
     }
 
-    @Override
     public void setLendingRates(List<BankingProductLendingRateV1> lendingRates) {
         this.lendingRates = lendingRates;
     }

data-holder/src/main/java/au/org/consumerdatastandards/holder/model/banking/BankingAccountDetailV3.java

@@ -110,12 +110,16 @@ public class BankingAccountDetailV3 implements BankingAccountDetail {
         name = "banking_account_deposit_rates",
         joinColumns = @JoinColumn(name = "banking_account_id"),
         inverseJoinColumns = @JoinColumn(name = "deposit_rate_id"))
-    private List<BankingProductDepositRateV1> depositRates;
+    private List<BankingProductDepositRateV2> depositRates;
 
     /**
      * Array of features of the account based on the equivalent structure in Product Reference with the following additional field
      */
-    @OneToMany
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinTable(
+        name = "banking_account_features",
+        joinColumns = @JoinColumn(name = "banking_account_id"),
+        inverseJoinColumns = @JoinColumn(name = "feature_id"))
     private List<BankingAccountProductFeature> features;
 
     /**
@@ -141,14 +145,22 @@ public class BankingAccountDetailV3 implements BankingAccountDetail {
         name = "banking_account_lending_rates",
         joinColumns = @JoinColumn(name = "banking_account_id"),
         inverseJoinColumns = @JoinColumn(name = "lending_rate_id"))
-    private List<BankingProductLendingRateV1> lendingRates;
+    private List<BankingProductLendingRateV2> lendingRates;
 
     @ManyToOne
+    @JoinTable(
+            name = "b_account_loans",
+            joinColumns = @JoinColumn(name = "account_id"),
+            inverseJoinColumns = @JoinColumn(name = "loan_id"))
     private BankingLoanAccount loan;
 
     private SpecificAccountUType specificAccountUType;
 
     @OneToMany
+    @JoinTable(
+            name = "b_account_term_deposits",
+            joinColumns = @JoinColumn(name = "account_id"),
+            inverseJoinColumns = @JoinColumn(name = "term_deposit_id"))
     private List<BankingTermDepositAccount> termDeposit;
 
     @Override
@@ -408,27 +420,25 @@ public void setDepositRate(String depositRate) {
         this.depositRate = depositRate;
     }
 
-    public BankingAccountDetail depositRates(List<BankingProductDepositRateV1> depositRates) {
+    public BankingAccountDetail depositRates(List<BankingProductDepositRateV2> depositRates) {
         this.depositRates = depositRates;
         return this;
     }
 
-    public BankingAccountDetail addItem(BankingProductDepositRateV1 depositRatesItem) {
+    public BankingAccountDetail addItem(BankingProductDepositRateV2 depositRatesItem) {
         if (this.depositRates == null) {
             this.depositRates = new ArrayList<>();
         }
         this.depositRates.add(depositRatesItem);
         return this;
     }
 
-    @Override
     @ApiModelProperty(value = "Fully described deposit rates for this account based on the equivalent structure in Product Reference")
-    public List<BankingProductDepositRateV1> getDepositRates() {
+    public List<BankingProductDepositRateV2> getDepositRates() {
         return depositRates;
     }
 
-    @Override
-    public void setDepositRates(List<BankingProductDepositRateV1> depositRates) {
+    public void setDepositRates(List<BankingProductDepositRateV2> depositRates) {
         this.depositRates = depositRates;
     }
 
@@ -496,27 +506,25 @@ public void setLendingRate(String lendingRate) {
         this.lendingRate = lendingRate;
     }
 
-    public BankingAccountDetail lendingRates(List<BankingProductLendingRateV1> lendingRates) {
+    public BankingAccountDetail lendingRates(List<BankingProductLendingRateV2> lendingRates) {
         this.lendingRates = lendingRates;
         return this;
     }
 
-    public BankingAccountDetail addItem(BankingProductLendingRateV1 lendingRatesItem) {
+    public BankingAccountDetail addItem(BankingProductLendingRateV2 lendingRatesItem) {
         if (this.lendingRates == null) {
             this.lendingRates = new ArrayList<>();
         }
         this.lendingRates.add(lendingRatesItem);
         return this;
     }
 
-    @Override
     @ApiModelProperty(value = "Fully described lending rates for this account based on the equivalent structure in Product Reference")
-    public List<BankingProductLendingRateV1> getLendingRates() {
+    public List<BankingProductLendingRateV2> getLendingRates() {
         return lendingRates;
     }
 
-    @Override
-    public void setLendingRates(List<BankingProductLendingRateV1> lendingRates) {
+    public void setLendingRates(List<BankingProductLendingRateV2> lendingRates) {
         this.lendingRates = lendingRates;
     }