IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove second decay by creation transaction, update old data set

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2021-06-23 11:00:50 +00:00
parent aa459580b9
commit f9ee57a858
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
community_server/src/Controller/AppController.php
View File

@ -151,7 +151,7 @@ class AppController extends Controller
if($last_migration) { if($last_migration) {
$current_db_version = $last_migration->db_version; $current_db_version = $last_migration->db_version;
} }
$php_data_version = 2; $php_data_version = 3;
if($current_db_version < $php_data_version) { if($current_db_version < $php_data_version) {
$this->redirect(['controller' => 'Migrations', 'action' => 'migrate', 'html' => $html, 'db_version' => $current_db_version]); $this->redirect(['controller' => 'Migrations', 'action' => 'migrate', 'html' => $html, 'db_version' => $current_db_version]);
} }

8
community_server/src/Controller/MigrationsController.php
View File

@ -69,6 +69,14 @@ class MigrationsController extends AppController
[$stateBalancesTable, 'updateAllBalances'] [$stateBalancesTable, 'updateAllBalances']
]; ];
$new_db_version = 2; $new_db_version = 2;
} else if($current_db_version == 2) {
$commands = [
[$stateUserTransactionsTable, 'truncate'],
[$stateBalancesTable, 'truncate'],
[$transactionsTable, 'fillStateUserTransactions'],
[$stateBalancesTable, 'updateAllBalances']
];
$new_db_version = 3;
} }
$migration_result = $this->callFunctions($commands); $migration_result = $this->callFunctions($commands);

7
community_server/src/Model/Transactions/TransactionCreation.php
View File

@ -163,7 +163,8 @@ class TransactionCreation extends TransactionBase {
$transactionCreationEntity->target_date = $this->protoTransactionCreation->getTargetDate()->getSeconds(); $transactionCreationEntity->target_date = $this->protoTransactionCreation->getTargetDate()->getSeconds();
$target_date = new FrozenTime($transactionCreationEntity->target_date); $target_date = new FrozenTime($transactionCreationEntity->target_date);
$decayed_balance = $stateBalancesTable->calculateDecay($this->getAmount(), $target_date, $received); //$decayed_balance = $stateBalancesTable->calculateDecay($this->getAmount(), $target_date, $received);
$balance = $this->getAmount();
if(!$this->transactionCreationsTable->save($transactionCreationEntity)) { if(!$this->transactionCreationsTable->save($transactionCreationEntity)) {
$this->addError('TransactionCreation::save', 'error saving transactionCreation with errors: ' . json_encode($transactionCreationEntity->getErrors())); $this->addError('TransactionCreation::save', 'error saving transactionCreation with errors: ' . json_encode($transactionCreationEntity->getErrors()));
@ -171,13 +172,13 @@ class TransactionCreation extends TransactionBase {
} }
// update state balance // update state balance
$final_balance = $this->updateStateBalance($receiverUserId, $decayed_balance, $received); $final_balance = $this->updateStateBalance($receiverUserId, $balance, $received);
if(false === $final_balance) { if(false === $final_balance) {
return false; return false;
} }
// decay is a virtual field which is calculated from amount and now() - record_date // decay is a virtual field which is calculated from amount and now() - record_date
if(!$this->addStateUserTransaction($receiverUserId, $transaction_id, 1, $decayed_balance, $received)) { if(!$this->addStateUserTransaction($receiverUserId, $transaction_id, 1, $balance, $received)) {
return false; return false;
} }