Merge pull request #21 from ftsrg/fix-20-payment

Author: bzp99

smart-contract/hyperledger-fabric/v2/java/build.gradle.kts

@@ -80,7 +80,9 @@ tasks.withType<JavaCompile>().configureEach {
           else -> "rac"
         }
     options.isFork = true
-    options.compilerArgs.addAll(listOf("-jml", "-$mode", "-timeout", "30", "--nullable-by-default", "--specs-path", "specs/"))
+    options.compilerArgs.addAll(
+        listOf(
+            "-jml", "-$mode", "-timeout", "30", "--nullable-by-default", "--specs-path", "specs/"))
     options.forkOptions.javaHome = openJMLJavaHomeDir.asFile
   }
 }

smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/TPCC.java

@@ -785,6 +785,7 @@ private PaymentOutput payment(final TPCCContext ctx, final PaymentInput input)
             .fromWarehouse(warehouse)
             .fromCustomer(customer)
             .fromDistrict(district)
+            .fromHistory(history)
             .build();
     if (customer.getC_credit().equals("BC"))
       output.setC_data(customer.getC_data().substring(0, 200));

smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/PaymentOutput.java

@@ -5,6 +5,7 @@
 import hu.bme.mit.ftsrg.chaincode.tpcc.TPCC;
 import hu.bme.mit.ftsrg.chaincode.tpcc.data.entity.Customer;
 import hu.bme.mit.ftsrg.chaincode.tpcc.data.entity.District;
+import hu.bme.mit.ftsrg.chaincode.tpcc.data.entity.History;
 import hu.bme.mit.ftsrg.chaincode.tpcc.data.entity.Warehouse;
 import hu.bme.mit.ftsrg.chaincode.tpcc.middleware.TPCCContext;
 import lombok.EqualsAndHashCode;
@@ -667,6 +668,12 @@ public DoPaymentOutputBuilder fromCustomer(final Customer customer) {
       return this;
     }
 
+    public DoPaymentOutputBuilder fromHistory(final History history) {
+      this.h_amount = history.getH_amount();
+      this.h_date = history.getH_date();
+      return this;
+    }
+
     public PaymentOutput build() {
       return new PaymentOutput(
           this.w_id,