From 2675c02d13cef9cfbafc8a5b40650fcca8489545 Mon Sep 17 00:00:00 2001
From: alexandre <alexandre@verdnatura.es>
Date: Mon, 17 Apr 2023 11:52:52 +0200
Subject: [PATCH] refs #5518 moved models to account

---
 back/model-config.json                        |  6 ---
 db/changes/231601/00-userRoleLog.sql          | 40 -------------------
 modules/account/back/model-config.json        |  8 +++-
 .../account/back}/models/role-log.json        |  0
 .../account/back}/models/user-log.json        |  0
 5 files changed, 7 insertions(+), 47 deletions(-)
 rename {back => modules/account/back}/models/role-log.json (100%)
 rename {back => modules/account/back}/models/user-log.json (100%)

diff --git a/back/model-config.json b/back/model-config.json
index 0410d45a7..5a5c6d3ac 100644
--- a/back/model-config.json
+++ b/back/model-config.json
@@ -125,12 +125,6 @@
     "UserConfigView": {
         "dataSource": "vn"
     },
-    "UserLog": {
-        "dataSource": "vn"
-    },
-    "RoleLog": {
-        "dataSource": "vn"
-    },
     "Warehouse": {
         "dataSource": "vn"
     },
diff --git a/db/changes/231601/00-userRoleLog.sql b/db/changes/231601/00-userRoleLog.sql
index 12000993a..ae5da13cb 100644
--- a/db/changes/231601/00-userRoleLog.sql
+++ b/db/changes/231601/00-userRoleLog.sql
@@ -1,43 +1,3 @@
-DROP TABLE IF EXISTS `vn`.`userLog`;
-
-CREATE TABLE `account`.`userLog` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `originFk` int(10) unsigned DEFAULT NULL,
-  `userFk` int(10) unsigned DEFAULT NULL,
-  `action` set('insert','update','delete') COLLATE utf8mb4_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT current_timestamp(),
-  `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `changedModel` varchar(45) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `newInstance` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `changedModelId` int(11) DEFAULT NULL,
-  `changedModelValue` varchar(45) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `originFk` (`originFk`),
-  KEY `userFk` (`userFk`),
-  CONSTRAINT `userLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `userLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
-CREATE TABLE `account`.`roleLog` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `originFk` int(10) unsigned DEFAULT NULL,
-  `userFk` int(10) unsigned DEFAULT NULL,
-  `action` set('insert','update','delete') COLLATE utf8mb3_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT current_timestamp(),
-  `description` text CHARACTER SET utf8mb3 DEFAULT NULL,
-  `changedModel` varchar(45) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `newInstance` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `changedModelId` int(11) DEFAULT NULL,
-  `changedModelValue` varchar(45) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `originFk` (`originFk`),
-  KEY `userFk` (`userFk`),
-  CONSTRAINT `roleLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `roleLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `role` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-
 INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
     VALUES
         ('UserLog', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
diff --git a/modules/account/back/model-config.json b/modules/account/back/model-config.json
index c697bd3b9..057a487dd 100644
--- a/modules/account/back/model-config.json
+++ b/modules/account/back/model-config.json
@@ -23,6 +23,9 @@
     "RoleConfig": {
         "dataSource": "vn"
     },
+    "RoleLog": {
+        "dataSource": "vn"
+    },
     "RoleInherit": {
         "dataSource": "vn"
     },
@@ -41,10 +44,13 @@
     "UserAccount": {
         "dataSource": "vn"
     },
+    "UserLog": {
+        "dataSource": "vn"
+    },
     "UserPassword": {
         "dataSource": "vn"
     },
     "UserSync": {
         "dataSource": "vn"
     }
-}
\ No newline at end of file
+}
diff --git a/back/models/role-log.json b/modules/account/back/models/role-log.json
similarity index 100%
rename from back/models/role-log.json
rename to modules/account/back/models/role-log.json
diff --git a/back/models/user-log.json b/modules/account/back/models/user-log.json
similarity index 100%
rename from back/models/user-log.json
rename to modules/account/back/models/user-log.json