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

fix bugs with begin of decay implementation

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2021-03-18 12:55:04 +00:00
parent 18d479ced6
commit 1949260452
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
community_server/src/Model/Entity/StateBalance.php
View File

@ -35,6 +35,15 @@ class StateBalance extends Entity
protected $_virtual = ['decay']; protected $_virtual = ['decay'];
private function convertToTimestamp($dateOrTime)
{
if(method_exists($dateOrTime, 'getTimestamp')) {
return $dateOrTime->getTimestamp();
} else {
return $dateOrTime->i18nFormat(Time::UNIX_TIMESTAMP_FORMAT);
}
}
protected function _getDecay() protected function _getDecay()
{ {
// decay factor in seconds per year // decay factor in seconds per year
@ -44,7 +53,7 @@ class StateBalance extends Entity
// SELECT TIMESTAMPDIFF(SECOND, modified, CURDATE()) AS age_in_seconds from state_balances // SELECT TIMESTAMPDIFF(SECOND, modified, CURDATE()) AS age_in_seconds from state_balances
// decay_for_duration = decay_factor^seconds // decay_for_duration = decay_factor^seconds
// decay = gradido_cent * decay_for_duration // decay = gradido_cent * decay_for_duration
$decay_duration = intval(Time::now()->getTimestamp() - $this->record_date->getTimestamp()); $decay_duration = $this->decayDuration(Time::now());
if($decay_duration === 0) { if($decay_duration === 0) {
return $this->amount; return $this->amount;
} }
@ -53,7 +62,8 @@ class StateBalance extends Entity
} }
public function partDecay($target_date) public function partDecay($target_date)
{ {
$decay_duration = intval($target_date->getTimestamp() - $this->record_date->getTimestamp()); if($target_date == null) return 0;
$decay_duration = $this->decayDuration($target_date);
if($decay_duration <= 0) { if($decay_duration <= 0) {
return $this->amount; return $this->amount;
} }
@ -61,7 +71,8 @@ class StateBalance extends Entity
} }
public function decayDuration($target_date) public function decayDuration($target_date)
{ {
return intval($target_date->getTimestamp() - $this->record_date->getTimestamp()); if($this->record_date == null) return 0;
return intval($this->convertToTimestamp($target_date) - $this->record_date->getTimestamp());
} }
} }

2
community_server/src/Model/Transactions/TransactionBody.php
View File

@ -3,6 +3,7 @@
namespace Model\Transactions; namespace Model\Transactions;
use Cake\ORM\TableRegistry; use Cake\ORM\TableRegistry;
use Cake\I18n\Date;
class TransactionBody extends TransactionBase { class TransactionBody extends TransactionBase {
private $mProtoTransactionBody = null; private $mProtoTransactionBody = null;
@ -75,6 +76,7 @@ class TransactionBody extends TransactionBase {
$transactionEntity->transaction_type_id = $this->transactionTypeId; $transactionEntity->transaction_type_id = $this->transactionTypeId;
$transactionEntity->memo = $this->getMemo(); $transactionEntity->memo = $this->getMemo();
$transactionEntity->received = new Date();
if ($transactionsTable->save($transactionEntity)) { if ($transactionsTable->save($transactionEntity)) {
// success // success