@resolveio/server-lib 2.0.4-newrole → 2.0.5

package/collections/user.collection.js

@@ -21,6 +21,13 @@ var schema = {
         type: Date,
         optional: true
     },
+    readonly: {
+        type: Boolean,
+        optional: true
+    },
+    active: {
+        type: Boolean
+    },
     attempts: {
         type: Number,
         optional: true
@@ -57,78 +64,60 @@ var schema = {
         type: String
     },
     roles: {
-        type: Object
-    },
-    'roles.super_admin': {
-        type: Boolean
-    },
-    'roles.approvals': {
         type: Array
     },
-    'roles.approvals.$': {
-        type: Object
-    },
-    'roles.approvals.$.name': {
+    'roles.$': {
         type: String
     },
-    'roles.approvals.$.type': {
-        type: String
+    phonenumber: {
+        type: String,
+        optional: true
     },
-    'roles.approvals.$.accounting_code': {
-        type: String
+    other: {
+        type: Object,
+        blackbox: true,
+        optional: true
     },
-    'roles.groups': {
-        type: Array
+    assets: {
+        type: Array,
+        optional: true
     },
-    'roles.groups.$': {
+    'assets.$': {
         type: Object
     },
-    'roles.groups.$.name': {
+    'assets.$.type': {
         type: String
     },
-    'roles.groups.$.views': {
-        type: Array
-    },
-    'roles.groups.$.views.$': {
+    'assets.$.id_asset': {
         type: String
     },
-    'roles.groups.$.yard': {
-        type: String,
-        optional: true
-    },
-    'roles.notifications': {
-        type: Array
-    },
-    'roles.notifications.$': {
+    'assets.$.asset_number': {
         type: String
     },
-    'roles.miscs': {
-        type: Array
+    'assets.$.ownership': {
+        type: String
     },
-    'roles.miscs.$': {
+    'assets.$.ownership_driver': {
         type: String
     },
-    active: Boolean,
-    id_customer: {
-        type: String,
-        optional: true
+    'assets.$.date_start': {
+        type: Date
     },
-    customer: {
-        type: String,
+    'assets.$.date_end': {
+        type: Date,
         optional: true
     },
-    customer_type: {
+    id_function: {
         type: String,
         optional: true
     },
-    phonenumber: {
+    customer: {
         type: String,
-        optional: true
+        optional: true,
     },
-    other: {
-        type: Object,
+    id_customer: {
+        type: String,
         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 mongoose_1 = require("mongoose");
 var active_subscription_collection_1 = require("../collections/active-subscription.collection");
+var mongoose_1 = require("mongoose");
 function loadServerInit() {
     return __awaiter(this, void 0, void 0, function () {
         var appVersion;

package/managers/subscription.manager.d.ts

@@ -5,6 +5,7 @@ export declare class SubscriptionManager {
     private _publications;
     private _subscriptions;
     private _wss;
+    private _oplogQueue;
     private _sendQueue;
     private _runningQueue;
     private serverConfig;
@@ -16,6 +17,7 @@ export declare class SubscriptionManager {
     unsubscribeAll(ws: WebSocket): Promise<void>;
     private getPublicationCollections;
     private tailOpLog;
+    private runOpLogQueue;
     private tailOpLogSupport;
     private resendPubsForDelete;
     private checkPubsForChanges;

package/managers/subscription.manager.js

@@ -51,11 +51,13 @@ var method_responses_1 = require("../publications/method-responses");
 var support_tickets_1 = require("../publications/support-tickets");
 var index_1 = require("../index");
 var notifications_1 = require("../publications/notifications");
+var common_1 = require("../util/common");
 var SubscriptionManager = /** @class */ (function () {
     function SubscriptionManager(mainServer, wss, serverConfig) {
         var _this = this;
         this._publications = {};
         this._subscriptions = [];
+        this._oplogQueue = [];
         this._sendQueue = [];
         this._runningQueue = false;
         this._mainServer = mainServer;
@@ -74,6 +76,7 @@ var SubscriptionManager = /** @class */ (function () {
         support_tickets_1.loadSupportTicketPublications(this);
         notifications_1.loadNotificationPublications(this);
         this.tailOpLog();
+        this.runOpLogQueue();
         if (index_1.ResolveIOServer.getSupportDB()) {
             this.tailOpLogSupport();
         }
@@ -350,7 +353,11 @@ var SubscriptionManager = /** @class */ (function () {
             if (nsArray[2]) {
                 collection += '.' + nsArray[2];
             }
-            that.checkPubsForChanges(collection, doc.o);
+            _this._oplogQueue.push({
+                type: 'insert',
+                collection: collection,
+                doc: doc.o
+            });
             if (collection === 'cron-jobs') {
                 _this._mainServer.getCronManager().checkCronJobsForUpdates();
             }
@@ -371,7 +378,11 @@ var SubscriptionManager = /** @class */ (function () {
                 collection += '.' + nsArray[2];
             }
             doc.o['_id'] = doc.o2['_id'];
-            that.checkPubsForChanges(collection, doc.o);
+            _this._oplogQueue.push({
+                type: 'update',
+                collection: collection,
+                doc: doc.o
+            });
             if (collection === 'cron-jobs') {
                 _this._mainServer.getCronManager().checkCronJobsForUpdates();
             }
@@ -398,6 +409,34 @@ 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(oplogQueue.map(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']);
@@ -466,8 +505,9 @@ 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) {
+    SubscriptionManager.prototype.checkPubsForChanges = function (collection, document, fetchFunctionOnly) {
         var _this = this;
+        if (fetchFunctionOnly === void 0) { fetchFunctionOnly = 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;
@@ -509,7 +549,7 @@ var SubscriptionManager = /** @class */ (function () {
                                         });
                                     }
                                 }
-                                else {
+                                else if (!fetchFunctionOnly) {
                                     that._wss.clients.forEach(function (ws) {
                                         if (ws['id_socket'] === client.id_socket) {
                                             that.sendPubDataOnce(ws, client.messageId, sub);
@@ -524,7 +564,7 @@ var SubscriptionManager = /** @class */ (function () {
                                     that.sendPubData(sub);
                                 }
                             }
-                            else {
+                            else if (!fetchFunctionOnly) {
                                 that.sendPubData(sub);
                             }
                         }

package/models/user.model.d.ts

@@ -1,31 +1,14 @@
 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;
-    services?: any;
-    id_customer?: string;
-    customer?: string;
-    customer_type?: string;
+    readonly?: boolean;
     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.0.4-newrole",
+  "version": "2.0.5",
   "description": "",
   "main": "index.ts",
   "scripts": {