@resolveio/server-lib 2.1.0 → 2.1.1-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/managers/subscription.manager.d.ts

@@ -17,8 +17,8 @@ export declare class SubscriptionManager {
     unsubscribeAll(ws: WebSocket): Promise<void>;
     private getPublicationCollections;
     private tailOpLog;
-    private runOpLogQueue;
     private tailOpLogSupport;
+    private runOpLogQueue;
     private resendPubsForDelete;
     private checkPubsForChanges;
     private checkSupportPubsForChanges;

package/managers/subscription.manager.js

@@ -413,34 +413,6 @@ var SubscriptionManager = /** @class */ (function () {
             console.log('oplog stopped');
         });
     };
-    SubscriptionManager.prototype.runOpLogQueue = function () {
-        var _this = this;
-        setInterval(function () {
-            var oplogQueue = common_1.deepCopy(_this._oplogQueue);
-            var uniqueCollectionOplogQueue = oplogQueue.map(function (a) { return a.collection; }).filter(function (elem, index, self) {
-                return index === self.indexOf(elem);
-            });
-            uniqueCollectionOplogQueue.forEach(function (collection) {
-                var oplogQueueFiltered = oplogQueue.filter(function (a) { return a.collection === collection; });
-                if (oplogQueueFiltered.length === 1) {
-                    _this.checkPubsForChanges(oplogQueueFiltered[0].collection, oplogQueueFiltered[0].doc);
-                    _this._oplogQueue.splice(_this._oplogQueue.map(function (a) { return a.collection; }).indexOf(collection), 1);
-                }
-                else {
-                    oplogQueueFiltered.forEach(function (item) {
-                        _this.checkPubsForChanges(item.collection, item.doc, true);
-                    });
-                    _this.checkPubsForChanges(oplogQueueFiltered[oplogQueueFiltered.length - 1].collection, oplogQueueFiltered[oplogQueueFiltered.length - 1].doc);
-                    for (var i = _this._oplogQueue.length - 1; i >= 0; i--) {
-                        var item = _this._oplogQueue[i];
-                        if (item.collection === collection) {
-                            _this._oplogQueue.splice(i, 1);
-                        }
-                    }
-                }
-            });
-        }, 1000);
-    };
     SubscriptionManager.prototype.tailOpLogSupport = function () {
         var that = this;
         var oplog = MongoOplog(that.serverConfig['RESOLVEIO_SUPPORT_OPLOG_URL']);
@@ -489,6 +461,34 @@ var SubscriptionManager = /** @class */ (function () {
             console.log('oplog stopped support');
         });
     };
+    SubscriptionManager.prototype.runOpLogQueue = function () {
+        var _this = this;
+        setInterval(function () {
+            var oplogQueue = common_1.deepCopy(_this._oplogQueue);
+            var uniqueCollectionOplogQueue = oplogQueue.map(function (a) { return a.collection; }).filter(function (elem, index, self) {
+                return index === self.indexOf(elem);
+            });
+            uniqueCollectionOplogQueue.forEach(function (collection) {
+                var oplogQueueFiltered = oplogQueue.filter(function (a) { return a.collection === collection; });
+                if (oplogQueueFiltered.length === 1) {
+                    _this.checkPubsForChanges(oplogQueueFiltered[0].collection, oplogQueueFiltered[0].doc);
+                    _this._oplogQueue.splice(_this._oplogQueue.map(function (a) { return a.collection; }).indexOf(collection), 1);
+                }
+                else {
+                    oplogQueueFiltered.forEach(function (item) {
+                        _this.checkPubsForChanges(item.collection, item.doc, true);
+                    });
+                    _this.checkPubsForChanges(oplogQueueFiltered[oplogQueueFiltered.length - 1].collection, oplogQueueFiltered[oplogQueueFiltered.length - 1].doc, false, true);
+                    for (var i = _this._oplogQueue.length - 1; i >= 0; i--) {
+                        var item = _this._oplogQueue[i];
+                        if (item.collection === collection) {
+                            _this._oplogQueue.splice(i, 1);
+                        }
+                    }
+                }
+            });
+        }, 1000);
+    };
     SubscriptionManager.prototype.resendPubsForDelete = function (collection) {
         var that = this;
         that._subscriptions.filter(function (a) { return a.collections.includes(collection); }).forEach(function (sub) {
@@ -509,9 +509,10 @@ var SubscriptionManager = /** @class */ (function () {
     // Document: Inserted/Modified/Deleted Document
     // Collection: Collection Document Lives In
     // Check to see if any pubs need to refetch due to Mongo operation
-    SubscriptionManager.prototype.checkPubsForChanges = function (collection, document, fetchFunctionOnly) {
+    SubscriptionManager.prototype.checkPubsForChanges = function (collection, document, fetchFunctionOnly, noFetchFunction) {
         var _this = this;
         if (fetchFunctionOnly === void 0) { fetchFunctionOnly = false; }
+        if (noFetchFunction === void 0) { noFetchFunction = false; }
         var that = this;
         that._subscriptions.filter(function (a) { return a.collections.includes(collection); }).forEach(function (sub) { return __awaiter(_this, void 0, void 0, function () {
             var _a, schemaErrors, _b;
@@ -531,7 +532,7 @@ var SubscriptionManager = /** @class */ (function () {
                         document = _c.sent();
                         _c.label = 2;
                     case 2:
-                        if (!that._publications[sub.publication].preFunction) return [3 /*break*/, 4];
+                        if (!(that._publications[sub.publication].preFunction && !noFetchFunction)) return [3 /*break*/, 4];
                         _b = sub;
                         return [4 /*yield*/, that._publications[sub.publication].preFunction(sub.subscriptionData)];
                     case 3:
@@ -544,7 +545,7 @@ var SubscriptionManager = /** @class */ (function () {
                         if (that._publications[sub.publication].ws_specific) {
                             sub.clients.forEach(function (client) {
                                 var _a;
-                                if (that._publications[sub.publication].fetchFunction) {
+                                if (that._publications[sub.publication].fetchFunction && !noFetchFunction) {
                                     if ((_a = that._publications[sub.publication]).fetchFunction.apply(_a, [document, client.id_user].concat(sub.subscriptionData))) {
                                         that._wss.clients.forEach(function (ws) {
                                             if (ws['id_socket'] === client.id_socket) {
@@ -563,7 +564,7 @@ var SubscriptionManager = /** @class */ (function () {
                             });
                         }
                         else {
-                            if (that._publications[sub.publication].fetchFunction) {
+                            if (that._publications[sub.publication].fetchFunction && !noFetchFunction) {
                                 if ((_a = that._publications[sub.publication]).fetchFunction.apply(_a, [document].concat(sub.subscriptionData))) {
                                     that.sendPubData(sub);
                                 }

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