From 0289ae6fea3ad4fe30eb4c72c83f4eea2cda6151 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 26 Dec 2019 14:44:34 -0300 Subject: [PATCH 1/2] doLog local --- common/Alias/Model.php | 5 ++++- composer.json | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/common/Alias/Model.php b/common/Alias/Model.php index 2a5b650..d604285 100644 --- a/common/Alias/Model.php +++ b/common/Alias/Model.php @@ -34,7 +34,10 @@ class Model extends \Model $changes[$column] = ['column' => $column, 'old' => $old->$column, 'new' => $value]; } $action = '[' . get_called_class() . ']'; - doLog($user, $action, $changes); + $this->doLog($user, $action, $changes); + } + protected function doLog($user, $action, $variables) { + App\Service\Register::log($user, $action, $variables); } public function getId() { diff --git a/composer.json b/composer.json index 48fc4a7..9677c11 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,9 @@ "require": { "j4mie/paris": "^1.5", "nesbot/carbon": "^2.28", - "danielstjules/stringy": "^3" + "danielstjules/stringy": "^3", + "aldarien/models": "dev-master", + "incoviba/auth": "dev-master" }, "require-dev": { "phpunit/phpunit": "^8.5", @@ -23,5 +25,15 @@ "Incoviba\\Common\\": "common", "Incoviba\\": "src" } - } + }, + "repositories": [ + { + "type": "vcs", + "url": "//192.168.1.100/git/models.git" + }, + { + "type": "vcs", + "url": "//192.168.1.100/git/auth.git" + } + ] } From 4b5cdb4020334d4828fbf63466614d3cc8c63f4f Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 26 Dec 2019 14:51:01 -0300 Subject: [PATCH 2/2] Se agrega servicio Registros --- common/Service/Register.php | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 common/Service/Register.php diff --git a/common/Service/Register.php b/common/Service/Register.php new file mode 100644 index 0000000..03f96e0 --- /dev/null +++ b/common/Service/Register.php @@ -0,0 +1,34 @@ + $user, + 'action' => $action, + 'time' => Carbon::now(config('app.timezone'))->toDateTimeString()//->format('Y-m-d HH:mm:ss') + ]; + $registry = model(RModel::class) + ->where('user', $user) + ->where('action', $action) + ->where('time', $data['time']) + ->findOne(); + if (!$registry) { + $registry = model(RModel::class)->create($data); + $registry->save(); + } + foreach ($variables as $data) { + $data['registry'] = $registry->id; + $log = (new Factory(RegistryData::class))->where($data)->find(); + if (!$log) { + $log = model(RegistryData::class)->create($data); + $log->save(); + } + } + } +}