Logging for rule triggers #322

This commit is contained in:
James Cole
2016-09-21 20:58:12 +02:00
parent a31b4ccf01
commit 27c832ed58
17 changed files with 88 additions and 11 deletions

View File

@@ -60,8 +60,11 @@ final class AmountExactly extends AbstractTrigger implements TriggerInterface
$compare = $this->triggerValue;
$result = bccomp($amount, $compare, 4);
if ($result === 0) {
Log::debug(sprintf('RuleTrigger AmountExactly for journal #%d: %d matches %d exactly, so return true', $journal->id, $amount, $compare));
return true;
}
Log::debug(sprintf('RuleTrigger AmountExactly for journal #%d: %d matches %d NOT exactly, so return false', $journal->id, $amount, $compare));
return false;

View File

@@ -60,9 +60,13 @@ final class AmountLess extends AbstractTrigger implements TriggerInterface
$compare = $this->triggerValue;
$result = bccomp($amount, $compare, 4);
if ($result === -1) {
Log::debug(sprintf('RuleTrigger AmountLess for journal #%d: %d is less than %d, so return true', $journal->id, $amount, $compare));
return true;
}
Log::debug(sprintf('RuleTrigger AmountLess for journal #%d: %d is NOT less than %d, so return false', $journal->id, $amount, $compare));
return false;
}

View File

@@ -66,9 +66,13 @@ final class AmountMore extends AbstractTrigger implements TriggerInterface
$compare = $this->triggerValue;
$result = bccomp($amount, $compare, 4);
if ($result === 1) {
Log::debug(sprintf('RuleTrigger AmountMore for journal #%d: %d is more than %d, so return true', $journal->id, $amount, $compare));
return true;
}
Log::debug(sprintf('RuleTrigger AmountMore for journal #%d: %d is NOT more than %d, so return false', $journal->id, $amount, $compare));
return false;
}

View File

@@ -67,9 +67,14 @@ final class DescriptionContains extends AbstractTrigger implements TriggerInterf
$strpos = strpos($source, $search);
if (!($strpos === false)) {
Log::debug(sprintf('RuleTrigger DescriptionContains for journal #%d: "%s" contains "%s", return true.', $journal->id, $source, $search));
return true;
}
Log::debug(sprintf('RuleTrigger DescriptionContains for journal #%d: "%s" does NOT contain "%s", return false.', $journal->id, $source, $search));
return false;
}

View File

@@ -75,10 +75,15 @@ final class DescriptionEnds extends AbstractTrigger implements TriggerInterface
$part = substr($description, $searchLength * -1);
if ($part == $search) {
if ($part === $search) {
Log::debug(sprintf('RuleTrigger DescriptionEnds for journal #%d: "%s" ends with "%s", return true.', $journal->id, $description, $search));
return true;
}
Log::debug(sprintf('RuleTrigger DescriptionEnds for journal #%d: "%s" does not end with "%s", return false.', $journal->id, $description, $search));
return false;
}
}

View File

@@ -59,10 +59,15 @@ final class DescriptionIs extends AbstractTrigger implements TriggerInterface
$description = strtolower($journal->description ?? '');
$search = strtolower($this->triggerValue);
if ($description == $search) {
if ($description === $search) {
Log::debug(sprintf('RuleTrigger DescriptionIs for journal #%d: "%s" is "%s", return true.', $journal->id, $description, $search));
return true;
}
Log::debug(sprintf('RuleTrigger DescriptionIs for journal #%d: "%s" is NOT "%s", return false.', $journal->id, $description, $search));
return false;
}
}

View File

@@ -66,10 +66,14 @@ final class DescriptionStarts extends AbstractTrigger implements TriggerInterfac
$part = substr($description, 0, strlen($search));
if ($part == $search) {
if ($part === $search) {
Log::debug(sprintf('RuleTrigger DescriptionStarts for journal #%d: "%s" starts with "%s", return true.', $journal->id, $description, $search));
return true;
}
Log::debug(sprintf('RuleTrigger DescriptionStarts for journal #%d: "%s" does not start with "%s", return false.', $journal->id, $description, $search));
return false;
}
}

View File

@@ -72,9 +72,18 @@ final class FromAccountContains extends AbstractTrigger implements TriggerInterf
$strpos = strpos($fromAccountName, $search);
if (!($strpos === false)) {
Log::debug(sprintf('RuleTrigger FromAccountContains for journal #%d: "%s" contains "%s", return true.', $journal->id, $fromAccountName, $search));
return true;
}
Log::debug(
sprintf(
'RuleTrigger FromAccountContains for journal #%d: "%s" does not contain "%s", return false.',
$journal->id, $fromAccountName, $search)
);
return false;
}

View File

@@ -82,10 +82,14 @@ final class FromAccountEnds extends AbstractTrigger implements TriggerInterface
$part = substr($name, $searchLength * -1);
if ($part == $search) {
if ($part === $search) {
Log::debug(sprintf('RuleTrigger FromAccountEnds for journal #%d: "%s" ends with "%s", return true.', $journal->id, $name, $search));
return true;
}
Log::debug(sprintf('RuleTrigger FromAccountEnds for journal #%d: "%s" does not end with "%s", return false.', $journal->id, $name, $search));
return false;
}

View File

@@ -14,6 +14,7 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal;
use Log;
/**
* Class FromAccountIs
*
@@ -64,10 +65,14 @@ final class FromAccountIs extends AbstractTrigger implements TriggerInterface
$search = strtolower($this->triggerValue);
if ($name == $search) {
if ($name === $search) {
Log::debug(sprintf('RuleTrigger FromAccountIs for journal #%d: "%s" is "%s", return true.', $journal->id, $name, $search));
return true;
}
Log::debug(sprintf('RuleTrigger FromAccountIs for journal #%d: "%s" is NOT "%s", return false.', $journal->id, $name, $search));
return false;
}

View File

@@ -69,13 +69,16 @@ final class FromAccountStarts extends AbstractTrigger implements TriggerInterfac
}
$search = strtolower($this->triggerValue);
$part = substr($name, 0, strlen($search));
$part = substr($name, 0, strlen($search));
if ($part === $search) {
Log::debug(sprintf('RuleTrigger FromAccountStarts for journal #%d: "%s" starts with "%s", return true.', $journal->id, $name, $search));
if ($part == $search) {
return true;
}
Log::debug(sprintf('RuleTrigger FromAccountStarts for journal #%d: "%s" does not start with "%s", return false.', $journal->id, $name, $search));
return false;
}
}

View File

@@ -72,9 +72,18 @@ final class ToAccountContains extends AbstractTrigger implements TriggerInterfac
$strpos = strpos($toAccountName, $search);
if (!($strpos === false)) {
Log::debug(sprintf('RuleTrigger ToAccountContains for journal #%d: "%s" contains "%s", return true.', $journal->id, $toAccountName, $search));
return true;
}
Log::debug(
sprintf(
'RuleTrigger ToAccountContains for journal #%d: "%s" does not contain "%s", return false.',
$journal->id, $toAccountName, $search)
);
return false;
}
}

View File

@@ -82,10 +82,13 @@ final class ToAccountEnds extends AbstractTrigger implements TriggerInterface
$part = substr($toAccountName, $searchLength * -1);
if ($part == $search) {
if ($part === $search) {
Log::debug(sprintf('RuleTrigger ToAccountEnds for journal #%d: "%s" ends with "%s", return true.', $journal->id, $toAccountName, $search));
return true;
}
Log::debug(sprintf('RuleTrigger ToAccountEnds for journal #%d: "%s" does not end with "%s", return false.', $journal->id, $toAccountName, $search));
return false;
}
}

View File

@@ -70,10 +70,14 @@ final class ToAccountIs extends AbstractTrigger implements TriggerInterface
$search = strtolower($this->triggerValue);
if ($toAccountName == $search) {
if ($toAccountName === $search) {
Log::debug(sprintf('RuleTrigger ToAccountIs for journal #%d: "%s" is "%s", return true.', $journal->id, $toAccountName, $search));
return true;
}
Log::debug(sprintf('RuleTrigger ToAccountIs for journal #%d: "%s" is NOT "%s", return true.', $journal->id, $toAccountName, $search));
return false;
}

View File

@@ -71,9 +71,12 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface
$search = strtolower($this->triggerValue);
$part = substr($toAccountName, 0, strlen($search));
if ($part == $search) {
if ($part === $search) {
Log::debug(sprintf('RuleTrigger ToAccountStarts for journal #%d: "%s" starts with "%s", return true.', $journal->id, $toAccountName, $search));
return true;
}
Log::debug(sprintf('RuleTrigger ToAccountStarts for journal #%d: "%s" does not start with "%s", return false.', $journal->id, $toAccountName, $search));
return false;

View File

@@ -58,10 +58,14 @@ final class TransactionType extends AbstractTrigger implements TriggerInterface
$type = !is_null($journal->transaction_type_type) ? $journal->transaction_type_type : strtolower($journal->transactionType->type);
$search = strtolower($this->triggerValue);
if ($type == $search) {
if ($type === $search) {
Log::debug(sprintf('RuleTrigger TransactionType for journal #%d: "%s" is "%s". Return true', $journal->id, $type, $search));
return true;
}
Log::debug(sprintf('RuleTrigger TransactionType for journal #%d: "%s" is NOT "%s". Return false', $journal->id, $type, $search));
return false;
}
}

View File

@@ -12,6 +12,7 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal;
use Log;
/**
* Class UserAction
@@ -51,6 +52,8 @@ final class UserAction extends AbstractTrigger implements TriggerInterface
*/
public function triggered(TransactionJournal $journal): bool
{
Log::debug(sprintf('RuleTrigger UserAction for journal %d always triggers.', $journal->id));
return true;
}
}