[Eventlog] Show extra data in log table.

This commit is contained in:
Jan Böhmer 2020-01-25 22:52:34 +01:00
parent f7d0524f57
commit 8b1eccc48d
12 changed files with 351 additions and 2 deletions

View file

@ -56,7 +56,8 @@ use Psr\Log\LogLevel;
* 6 = "ElementCreatedLogEntry",
* 7 = "ElementEditedLogEntry",
* 8 = "ConfigChangedLogEntry",
* 9 = "DatabaseUpdatedLogEntry"
* 9 = "InstockChangedLogEntry",
* 10 = "DatabaseUpdatedLogEntry"
* })
*/
abstract class AbstractLogEntry extends DBElement
@ -144,6 +145,11 @@ abstract class AbstractLogEntry extends DBElement
*/
protected $typeString = "unknown";
/** @var array The extra data in raw (short form) saved in the DB
* @ORM\Column(name="extra", type="json")
*/
protected $extra = [];
/**
* Get the user that caused the event associated with this log entry.
* @return User
@ -305,6 +311,11 @@ abstract class AbstractLogEntry extends DBElement
return $this;
}
public function getExtraData(): array
{
return $this->extra;
}
/**
* This function converts the internal numeric log level into an PSR3 compatible level string.
* @param int $level The numerical log level

View file

@ -36,4 +36,31 @@ class DatabaseUpdatedLogEntry extends AbstractLogEntry
throw new LogEntryObsoleteException();
}
/**
* Checks if the database update was successful.
* @return bool
*/
public function isSuccessful(): bool
{
return $this->extra['s'];
}
/**
* Gets the database version before update.
* @return int
*/
public function getOldVersion(): int
{
return $this->extra['o'];
}
/**
* Gets the (target) database version after update.
* @return int
*/
public function getNewVersion(): int
{
return $this->extra['n'];
}
}

View file

@ -31,4 +31,22 @@ use Doctrine\ORM\Mapping as ORM;
class ElementCreatedLogEntry extends AbstractLogEntry
{
protected $typeString = "element_created";
/**
* Gets the instock when the part was created
* @return int|null
*/
public function getCreationInstockValue(): ?int
{
return $this->extra['i'] ?? null;
}
/**
* Checks if a creation instock value was saved with this entry.
* @return bool
*/
public function hasCreationInstockValue(): bool
{
return $this->getCreationInstockValue() !== null;
}
}

View file

@ -30,4 +30,9 @@ use Doctrine\ORM\Mapping as ORM;
class ElementDeletedLogEntry extends AbstractLogEntry
{
protected $typeString = "element_deleted";
public function getOldName(): string
{
return $this->extra['n'];
}
}

View file

@ -30,4 +30,13 @@ use Doctrine\ORM\Mapping as ORM;
class ElementEditedLogEntry extends AbstractLogEntry
{
protected $typeString = "element_edited";
/**
* Returns the message associated with this edit change
* @return string
*/
public function getMessage() : string
{
return $this->extra['m'] ?? '';
}
}

View file

@ -37,4 +37,41 @@ class ExceptionLogEntry extends AbstractLogEntry
{
throw new LogEntryObsoleteException();
}
/**
* The class name of the exception that caused this log entry.
* @return string
*/
public function getExceptionClass(): string
{
return $this->extra['t'] ?? "Unknown Class";
}
/**
* Returns the file where the exception happened.
* @return string
*/
public function getFile(): string
{
return $this->extra['f'];
}
/**
* Returns the line where the exception happened
* @return int
*/
public function getLine(): int
{
return $this->extra['l'];
}
/**
* Return the message of the exception.
* @return string
*/
public function getMessage(): string
{
return $this->extra['m'];
}
}

View file

@ -22,6 +22,7 @@
namespace App\Entity\LogSystem;
use App\Entity\Parts\Part;
use Doctrine\ORM\Mapping as ORM;
/**
@ -31,4 +32,74 @@ use Doctrine\ORM\Mapping as ORM;
class InstockChangedLogEntry extends AbstractLogEntry
{
protected $typeString = "instock_changed";
/**
* Get the old instock
* @return int
*/
public function getOldInstock(): int
{
return $this->extra['o'];
}
/**
* Get the new instock
* @return int
*/
public function getNewInstock(): int
{
return $this->extra['n'];
}
/**
* Gets the comment associated with the instock change
* @return string
*/
public function getComment(): string
{
return $this->extra['c'];
}
/**
* Returns the price that has to be payed for the change (in the base currency).
* @param $absolute bool Set this to true, if you want only get the absolute value of the price (without minus)
* @return float
*/
public function getPrice(bool $absolute = false): float
{
if ($absolute) {
return abs($this->extra['p']);
}
return $this->extra['p'];
}
/**
* Returns the difference value of the change ($new_instock - $old_instock).
* @param $absolute bool Set this to true if you want only the absolute value of the difference.
* @return int Difference is positive if instock has increased, negative if decreased.
*/
public function getDifference(bool $absolute = false): int
{
// Check if one of the instock values is unknown
if ($this->getNewInstock() == -2 || $this->getOldInstock() == -2) {
return 0;
}
$difference = $this->getNewInstock() - $this->getOldInstock();
if ($absolute) {
return abs($difference);
}
return $difference;
}
/**
* Checks if the Change was an withdrawal of parts.
* @return bool True if the change was an withdrawal, false if not.
*/
public function isWithdrawal(): bool
{
return $this->getNewInstock() < $this->getOldInstock();
}
}

View file

@ -31,4 +31,24 @@ use Doctrine\ORM\Mapping as ORM;
class UserLoginLogEntry extends AbstractLogEntry
{
protected $typeString = "user_login";
/**
* Return the (anonymized) IP address used to login the user.
* @return string
*/
public function getIPAddress(): string
{
return $this->extra['i'];
}
/**
* Sets the IP address used to login the user
* @param string $ip The IP address used to login the user.
* @return $this
*/
public function setIPAddress(string $ip): self
{
$this->extra['i'] = $ip;
return $this;
}
}

View file

@ -31,4 +31,24 @@ use Doctrine\ORM\Mapping as ORM;
class UserLogoutLogEntry extends AbstractLogEntry
{
protected $typeString = "user_logout";
/**
* Return the (anonymized) IP address used to login the user.
* @return string
*/
public function getIPAddress(): string
{
return $this->extra['i'];
}
/**
* Sets the IP address used to login the user
* @param string $ip The IP address used to login the user.
* @return $this
*/
public function setIPAddress(string $ip): self
{
$this->extra['i'] = $ip;
return $this;
}
}

View file

@ -31,11 +31,16 @@ use Doctrine\ORM\Mapping as ORM;
*/
class UserNotAllowedLogEntry extends AbstractLogEntry
{
protected $type = 'user_not_allowed';
protected $typeString = 'user_not_allowed';
public function __construct()
{
//Obsolete, use server log now.
throw new LogEntryObsoleteException();
}
public function getMessage(): string
{
return $this->extra['p'] ?? '';
}
}