@resolveio/server-lib 3.2.0 → 3.2.1-newrole

package/collections/log.collection.js

@@ -49,7 +49,7 @@ var DefaultSchema = new mongoose_1.Schema(schema, {
     versionKey: false,
     timestamps: true
 });
-DefaultSchema.index({ date: 1 }, { expireAfterSeconds: 60 * 60 * 24 * 10 });
+DefaultSchema.index({ date: 1 }, { expireAfterSeconds: 60 * 60 * 24 * 30 });
 DefaultSchema.index({ type: 1 });
 DefaultSchema.index({ date: 1, type: 1 });
 exports.Logs = index_1.ResolveIOServer.getMainDB().model('logs', DefaultSchema);

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/managers/database.manager.d.ts

@@ -0,0 +1,6 @@
+export declare class DatabaseManager {
+    private _queue;
+    private _server;
+    constructor(mainServer: any);
+    addDatabaseQueue(): void;
+}

package/managers/database.manager.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var DatabaseManager = /** @class */ (function () {
+    function DatabaseManager(mainServer) {
+        this._queue = [];
+        this._server = mainServer;
+    }
+    DatabaseManager.prototype.addDatabaseQueue = function () {
+    };
+    return DatabaseManager;
+}());
+exports.DatabaseManager = DatabaseManager;

package/managers/method.manager.js

@@ -213,7 +213,7 @@ var MethodManager = /** @class */ (function () {
                     _this._runningQueue = false;
                 }
             }
-        }, 50);
+        }, 25);
     }
     MethodManager.prototype.getMainServer = function () {
         return this._mainServer;

package/managers/queue-method.manager.js

@@ -109,7 +109,7 @@ var QueueMethodManager = /** @class */ (function () {
                     _this._runningQueue = false;
                 }
             }
-        }, 50);
+        }, 25);
     }
     QueueMethodManager.prototype.addMethodToQueue = function (id_ws, id_user, user, messageDate, messageId, method, data) {
         // console.log('Add Method To Queue', method);

package/managers/subscription.manager.js

@@ -111,7 +111,7 @@ var SubscriptionManager = /** @class */ (function () {
                     _this._runningQueue = false;
                 }
             }
-        }, 50);
+        }, 25);
     }
     // Add all files to publications private object
     SubscriptionManager.prototype.publications = function (method) {
@@ -525,7 +525,7 @@ var SubscriptionManager = /** @class */ (function () {
                     }
                 }
             });
-        }, 1000);
+        }, 25);
     };
     SubscriptionManager.prototype.resendPubsForDelete = function (collection) {
         var that = this;

package/managers/support.manager.js

@@ -91,7 +91,7 @@ var SupportManager = /** @class */ (function () {
                     _this._runningQueue = false;
                 }
             }
-        }, 250);
+        }, 25);
     }
     SupportManager.prototype.getMainServer = function () {
         return this._mainServer;

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.2.0",
+  "version": "3.2.1-newrole",
   "description": "",
   "main": "index.ts",
   "scripts": {

package/server-app.js

@@ -626,7 +626,7 @@ var ResolveIOMainServer = /** @class */ (function () {
                     case 5: return [2 /*return*/];
                 }
             });
-        }); }, 100);
+        }); }, 25);
     };
     ResolveIOMainServer.prototype.unsubscribeWS = function (ws) {
         this._subscriptionManager.unsubscribeAll(ws);