@resolveio/server-lib 3.1.4 → 3.2.0-newrole

package/collections/user.collection.js

@@ -21,13 +21,6 @@ var schema = {
         type: Date,
         optional: true
     },
-    readonly: {
-        type: Boolean,
-        optional: true
-    },
-    active: {
-        type: Boolean
-    },
     attempts: {
         type: Number,
         optional: true
@@ -64,60 +57,78 @@ var schema = {
         type: String
     },
     roles: {
+        type: Object
+    },
+    'roles.super_admin': {
+        type: Boolean
+    },
+    'roles.approvals': {
         type: Array
     },
-    'roles.$': {
+    'roles.approvals.$': {
+        type: Object
+    },
+    'roles.approvals.$.name': {
         type: String
     },
-    phonenumber: {
-        type: String,
-        optional: true
+    'roles.approvals.$.type': {
+        type: String
     },
-    other: {
-        type: Object,
-        blackbox: true,
-        optional: true
+    'roles.approvals.$.accounting_code': {
+        type: String
     },
-    assets: {
-        type: Array,
-        optional: true
+    'roles.groups': {
+        type: Array
     },
-    'assets.$': {
+    'roles.groups.$': {
         type: Object
     },
-    'assets.$.type': {
+    'roles.groups.$.name': {
         type: String
     },
-    'assets.$.id_asset': {
-        type: String
+    'roles.groups.$.views': {
+        type: Array
     },
-    'assets.$.asset_number': {
+    'roles.groups.$.views.$': {
         type: String
     },
-    'assets.$.ownership': {
-        type: String
+    'roles.groups.$.yard': {
+        type: String,
+        optional: true
     },
-    'assets.$.ownership_driver': {
+    'roles.notifications': {
+        type: Array
+    },
+    'roles.notifications.$': {
         type: String
     },
-    'assets.$.date_start': {
-        type: Date
+    'roles.miscs': {
+        type: Array
     },
-    'assets.$.date_end': {
-        type: Date,
-        optional: true
+    'roles.miscs.$': {
+        type: String
     },
-    id_function: {
+    active: Boolean,
+    id_customer: {
         type: String,
         optional: true
     },
     customer: {
         type: String,
-        optional: true,
+        optional: true
     },
-    id_customer: {
+    customer_type: {
+        type: String,
+        optional: true
+    },
+    phonenumber: {
         type: String,
+        optional: true
+    },
+    other: {
+        type: Object,
         optional: true,
+        blackbox: true
     }
 };
 var DefaultSchema = new mongoose_1.Schema(schema, {

package/fixtures/init.js

@@ -37,8 +37,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var app_version_collection_1 = require("../collections/app-version.collection");
 var logged_in_users_collection_1 = require("../collections/logged-in-users.collection");
-var active_subscription_collection_1 = require("../collections/active-subscription.collection");
 var mongoose_1 = require("mongoose");
+var active_subscription_collection_1 = require("../collections/active-subscription.collection");
 function loadServerInit() {
     return __awaiter(this, void 0, void 0, function () {
         var appVersion;

package/models/user.model.d.ts

@@ -1,14 +1,31 @@
 import { CollectionDocument } from './collection-document.model';
 export interface UserModel extends CollectionDocument {
-    attempts: number;
-    last: Date;
-    services?: any;
     fullname: string;
+    roles: UserRoleModel;
     username?: string;
     email?: string;
-    roles?: string[];
     active?: boolean;
-    readonly?: boolean;
+    services?: any;
+    id_customer?: string;
+    customer?: string;
+    customer_type?: string;
     phonenumber?: string;
     other?: object;
 }
+export interface UserRoleModel {
+    super_admin: boolean;
+    approvals: UserRoleApprovalModel[];
+    groups: UserRoleGroupModel[];
+    notifications: string[];
+    miscs: string[];
+}
+export interface UserRoleApprovalModel {
+    accounting_code: string;
+    type: string;
+    name: string;
+}
+export interface UserRoleGroupModel {
+    name: string;
+    views: string[];
+    yard?: string;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resolveio/server-lib",
-  "version": "3.1.4",
+  "version": "3.2.0-newrole",
   "description": "",
   "main": "index.ts",
   "scripts": {

package/util/common.js

@@ -153,11 +153,13 @@ function applyMongoUpdate(uDoc, delta) {
                         delete o1[n1[0]];
                     }
                     else {
-                        throw new Error(o2 + '/' + n2 + ' - couldn\'t resolve first for ' + uDoc + ' ' + v);
+                        // throw new Error(o2 + '/' + n2 + ' - couldn\'t resolve first for ' + uDoc + ' ' + v);
+                        console.log('Error', o2 + '/' + n2 + ' - couldn\'t resolve first for ' + uDoc + ' ' + v);
                     }
                 }
                 else {
-                    throw new Error(o1 + '/' + n1 + ' - couldn\'t resolve second for ' + uDoc + ' ' + k);
+                    // throw new Error(o1 + '/' + n1 + ' - couldn\'t resolve second for ' + uDoc + ' ' + k);
+                    console.log('Error', o1 + '/' + n1 + ' - couldn\'t resolve second for ' + uDoc + ' ' + k);
                 }
             }
         }
@@ -173,7 +175,8 @@ function applyMongoUpdate(uDoc, delta) {
                     o[n[0]] = v;
                 }
                 else {
-                    throw new Error(o + '/' + n + ' - couldn\'t set for ' + uDoc + ' ' + k);
+                    // throw new Error(o + '/' + n + ' - couldn\'t set for ' + uDoc + ' ' + k);
+                    console.log('Error', o + '/' + n + ' - couldn\'t set for ' + uDoc + ' ' + k);
                 }
             }
         }
@@ -192,7 +195,8 @@ function applyMongoUpdate(uDoc, delta) {
                     o[n[0]] += v;
                 }
                 else {
-                    throw new Error(o + '/' + n + ' - couldn\'t set for ' + uDoc + ' ' + k);
+                    // throw new Error(o + '/' + n + ' - couldn\'t set for ' + uDoc + ' ' + k);
+                    console.log('Error', o + '/' + n + ' - couldn\'t set for ' + uDoc + ' ' + k);
                 }
             }
         }
@@ -206,7 +210,8 @@ function applyMongoUpdate(uDoc, delta) {
                     delete o[n[0]];
                 }
                 else {
-                    throw new Error(o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + k);
+                    // throw new Error(o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + k);
+                    console.log('Error', o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + k);
                 }
             }
         }
@@ -223,7 +228,8 @@ function applyMongoUpdate(uDoc, delta) {
                         o[n[0]].splice(o2[n2[0]].findIndex(function (z) { return JSON.stringify(z) === JSON.stringify(vk); }), 1);
                     }
                     else {
-                        throw new Error(o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + pathk);
+                        // throw new Error(o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + pathk);
+                        console.log('Error', o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + pathk);
                     }
                 }
             }
@@ -241,7 +247,8 @@ function applyMongoUpdate(uDoc, delta) {
                         o[n[0]].push(vk);
                     }
                     else {
-                        throw new Error(o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + pathk);
+                        // throw new Error(o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + pathk);
+                        console.log('Error', o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + pathk);
                     }
                 }
             }