From 892f7e98bfc95ac6a0d03bb7956eeeef8a1c2482 Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Wed, 14 Apr 2021 09:12:08 +0000
Subject: [PATCH] fix wrong commited file

---
 community_server/src/Model/Transactions/Transaction.php    | 7 +++++++
 .../src/Model/Transactions/TransactionBody.php             | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/community_server/src/Model/Transactions/Transaction.php b/community_server/src/Model/Transactions/Transaction.php
index da21495b9..21beb1d31 100644
--- a/community_server/src/Model/Transactions/Transaction.php
+++ b/community_server/src/Model/Transactions/Transaction.php
@@ -148,6 +148,13 @@ class Transaction extends TransactionBase {
        if (!$this->mTransactionBody->save($this->getFirstPublic(), $this->mProtoTransaction->getSigMap())) {
           $this->addErrors($this->mTransactionBody->getErrors());
           $connection->rollback();
+          // correct auto-increment value to prevent gaps
+          $transactionsTable = $this->getTable('transactions');
+          $transactions = $transactionsTable->find()->select(['id'])->contain(false);
+          $count = $transactions->count();
+          $connection = ConnectionManager::get('default');
+          $connection->execute("ALTER TABLE `transactions` auto_increment = $count;");
+          
           return false;
       }
       
diff --git a/community_server/src/Model/Transactions/TransactionBody.php b/community_server/src/Model/Transactions/TransactionBody.php
index 87a029b80..e0d688dbb 100644
--- a/community_server/src/Model/Transactions/TransactionBody.php
+++ b/community_server/src/Model/Transactions/TransactionBody.php
@@ -76,10 +76,9 @@ class TransactionBody extends TransactionBase {
       
       $transactionEntity->transaction_type_id = $this->transactionTypeId;
       $transactionEntity->memo = $this->getMemo();
+      $transactionEntity->received = new Date();
       
       if ($transactionsTable->save($transactionEntity)) {
-          // reload entity to get received date filled from mysql
-        $transactionEntity = $transactionsTable->get($transactionEntity->id);
         // success
         $this->mTransactionID = $transactionEntity->id;
         if(!$this->mSpecificTransaction->save($transactionEntity->id, $firstPublic, $transactionEntity->received)) {