From ba46e6b45812d0901ae95a3e11814ac1d05150b9 Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Thu, 4 Feb 2021 16:51:02 +0000
Subject: [PATCH] adapt for cross group transactions

---
 src/Model/Transactions/Record.php | 32 ++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/Model/Transactions/Record.php b/src/Model/Transactions/Record.php
index 686994137..a0da48836 100644
--- a/src/Model/Transactions/Record.php
+++ b/src/Model/Transactions/Record.php
@@ -276,11 +276,11 @@ class GradidoTransfer extends GradidoModifieUserBalance
       },
    * */
   private $amount;
-  private $sender_new_balance;
+  private $sender_new_balance = null;
   private $sender_pubkey;
   
   private $receiver_pubkey;
-  private $receiver_new_balance;
+  private $receiver_new_balance = null;
   
   
   public function __construct($data)
@@ -289,11 +289,15 @@ class GradidoTransfer extends GradidoModifieUserBalance
     
     $sender = $data['sender'];
     $this->sender_pubkey = $sender['user'];
-    $this->sender_new_balance = $sender['new_balance']['amount'];
+    if(isset($sender['new_balance'])) {
+        $this->sender_new_balance = $sender['new_balance']['amount'];
+    }
     
     $receiver = $data['receiver'];
     $this->receiver_pubkey = $receiver['user'];
-    $this->receiver_new_balance = $receiver['new_balance']['amount'];
+    if(isset($receiver['new_balance'])) {
+        $this->receiver_new_balance = $receiver['new_balance']['amount'];
+    }
     
   }
   
@@ -323,16 +327,18 @@ class GradidoTransfer extends GradidoModifieUserBalance
     $transferEntity->sender_public_key = hex2bin($this->sender_pubkey);
     $transferEntity->receiver_public_key = hex2bin($this->receiver_pubkey);
     $transferEntity->amount = $this->amount;
-    $transferEntity->sender_final_balance = $this->sender_new_balance;
+    if($this->sender_new_balance != null) {
+        $transferEntity->sender_final_balance = $this->sender_new_balance;
     
-    if(is_int($sender_id) && $sender_id > 0) {
-      $transferEntity->state_user_id = $sender_id;
-      $balance_result = $this->updateBalance($this->sender_new_balance, $received, $sender_id);
-      if(is_array($balance_result)) {
-        return $balance_result;
-      }
+        if(is_int($sender_id) && $sender_id > 0) {
+          $transferEntity->state_user_id = $sender_id;
+          $balance_result = $this->updateBalance($this->sender_new_balance, $received, $sender_id);
+          if(is_array($balance_result)) {
+            return $balance_result;
+          }
+        }
     }
-    if(is_int($receiver_id) && $receiver_id > 0) {
+    if($this->receiver_new_balance != null && is_int($receiver_id) && $receiver_id > 0) {
       $transferEntity->receiver_user_id = $receiver_id;
       $balance_result = $this->updateBalance($this->receiver_new_balance, $received, $receiver_id);
       if(is_array($balance_result)) {
@@ -413,7 +419,7 @@ class Record
         if($this->sequenceNumber <= 0) {
           return ['state' => 'error', 'msg' => 'sequence number invalid', 'details' => $this->sequenceNumber];
         }
-        $transactionExistResult = $transactionsTable->find('all')->where(['id' => $this->sequenceNumber]);
+        $transactionExistResult = $transactionsTable->find('all')->where(['id' => intval($this->sequenceNumber)]);
         if(!$transactionExistResult->isEmpty()) {
           return ['state' => 'warning', 'msg' => 'transaction already exist in db', 'details' => $this->sequenceNumber];
         }