Merge pull request 'feat(user): added userConfig.darkMode relation towards account.user' (#943) from 3904-user_dark_mode into dev

Reviewed-on: #943
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

back/methods/account/acl.js

@@ -23,7 +23,13 @@ module.exports = Self => {
         let models = Self.app.models;
 
         let user = await models.Account.findById(userId, {
-            fields: ['id', 'name', 'nickname', 'email']
+            fields: ['id', 'name', 'nickname', 'email', 'lang'],
+            include: {
+                relation: 'userConfig',
+                scope: {
+                    fields: ['darkMode']
+                }
+            }
         });
 
         let roles = await models.RoleMapping.find({

back/models/account.json

@@ -71,6 +71,11 @@
 			"type": "hasOne",
 			"model": "Worker",
 			"foreignKey": "userFk"
+		},
+		"userConfig": {
+			"type": "hasOne",
+			"model": "UserConfig",
+			"foreignKey": "userFk"
 		}
 	},
 	"acls": [

back/models/user-config.json

@@ -9,20 +9,23 @@
     "properties": {
         "userFk": {
             "id": true,
-            "type": "Number",
+            "type": "number",
             "required": true
         },
         "warehouseFk": {
-            "type": "Number"
+            "type": "number"
         },
         "companyFk": {
-            "type": "Number"
+            "type": "number"
         },
         "created": {
-            "type": "Date"
+            "type": "date"
         },
         "updated": {
-            "type": "Date"
+            "type": "date"
+        },
+        "darkMode": {
+            "type": "boolean"
         }
     },
     "relations": {

db/changes/10451-april/00-account_user.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`userConfig` ADD darkMode tinyint(1) DEFAULT 1 NOT NULL COMMENT 'Salix interface dark mode';