@resolveio/server-lib 4.0.15-newrole → 4.0.16

package/collections/log-subscription.collection.d.ts

@@ -0,0 +1,7 @@
+import { Model, Document } from 'mongoose';
+import { LogSubscriptionModel } from '../models/log-subscription.model';
+interface ResolveIOModel extends LogSubscriptionModel, Document {
+}
+export declare const LogSubscriptions: Model<ResolveIOModel>;
+export declare const LogSubscriptionVersions: Model<ResolveIOModel>;
+export {};

package/collections/log-subscription.collection.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var mongoose_1 = require("mongoose");
+var index_1 = require("../index");
+var schema = {
+    _id: {
+        type: String,
+        optional: true
+    },
+    __v: {
+        type: Number,
+        optional: true
+    },
+    updatedAt: {
+        type: Date,
+        optional: true
+    },
+    createdAt: {
+        type: Date,
+        optional: true
+    },
+    date: {
+        type: Date
+    },
+    type: {
+        type: String
+    },
+    subscription: {
+        type: String
+    },
+    collection: {
+        type: String
+    }
+};
+var DefaultSchema = new mongoose_1.Schema(schema, {
+    skipVersioning: true,
+    versionKey: false,
+    timestamps: true
+});
+DefaultSchema.index({ date: 1 }, { expireAfterSeconds: 60 * 60 * 24 * 30 });
+DefaultSchema.index({ type: 1 });
+DefaultSchema.index({ subscription: 1 });
+DefaultSchema.index({ collection_name: 1 });
+DefaultSchema.index({ date: 1, type: 1 });
+exports.LogSubscriptions = index_1.ResolveIOServer.getMainDB().model('log-subscriptions', DefaultSchema);
+schema._id = {
+    type: mongoose_1.Schema.Types.Mixed
+};
+var VersionSchema = new mongoose_1.Schema(schema, {
+    skipVersioning: true,
+    versionKey: false,
+    timestamps: true
+});
+exports.LogSubscriptions['versionCollection'] = 'log-subscriptions.versions';
+exports.LogSubscriptionVersions = index_1.ResolveIOServer.getMainDB().model(exports.LogSubscriptions['versionCollection'], VersionSchema);

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,67 +64,53 @@ 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
+    'assets.$.asset_number': {
+        type: String
     },
-    'roles.notifications': {
-        type: Array
+    'assets.$.ownership': {
+        type: String
     },
-    'roles.notifications.$': {
+    'assets.$.ownership_driver': {
         type: String
     },
-    'roles.miscs': {
-        type: Array
+    'assets.$.date_start': {
+        type: Date
     },
-    'roles.miscs.$': {
-        type: String
+    'assets.$.date_end': {
+        type: Date,
+        optional: true
     },
-    active: Boolean,
-    phonenumber: {
+    id_function: {
         type: String,
         optional: true
     },
-    other: {
-        type: Object,
-        optional: true,
-        blackbox: true
-    },
     customers: {
         type: Array,
         optional: true,

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.js

@@ -51,7 +51,6 @@ 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 billing_logged_in_users_collection_1 = require("../collections/billing-logged-in-users.collection");
 var moment = require("moment");
 var billing_logged_in_users_1 = require("../publications/billing-logged-in-users");
@@ -201,7 +200,7 @@ var SubscriptionManager = /** @class */ (function () {
                             sub = that._subscriptions.filter(function (a) { return a.publication === publication && JSON.stringify(a.subscriptionData) === JSON.stringify(subscriptionData); })[0];
                         }
                         // Send pub data to client who just subscribed only, don't want to send to existing clients since nothing has changed
-                        that.sendPubDataOnce(ws, messageId, sub);
+                        that.sendPubDataOnce(ws, messageId, sub, 'newSub', that.getPublicationCollections(publication)[0]);
                         if (!(that._publications[sub.publication].preFunction && !sub.preSubscriptionData)) return [3 /*break*/, 3];
                         _a = sub;
                         return [4 /*yield*/, (_b = that._publications[sub.publication]).preFunction.apply(_b, sub.subscriptionData)];
@@ -503,29 +502,31 @@ var SubscriptionManager = /** @class */ (function () {
     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);
-                        }
-                    }
-                }
-            });
+            var oplog = _this._oplogQueue.pop();
+            _this.checkPubsForChanges(oplog.collection, oplog.doc, oplog.type);
+            // let oplogQueue = deepCopy(this._oplogQueue);
+            // let uniqueCollectionOplogQueue = oplogQueue.map(a => a.collection).filter((elem, index, self) => {
+            // 	return index === self.indexOf(elem);
+            // });
+            // uniqueCollectionOplogQueue.forEach(collection => {
+            // 	let oplogQueueFiltered = oplogQueue.filter(a => a.collection === collection);
+            // 	if (oplogQueueFiltered.length === 1) {
+            // 		this.checkPubsForChanges(oplogQueueFiltered[0].collection, oplogQueueFiltered[0].doc);
+            // 		this._oplogQueue.splice(this._oplogQueue.map(a => a.collection).indexOf(collection), 1);
+            // 	}
+            // 	else {
+            // 		oplogQueueFiltered.forEach(item => {
+            // 			this.checkPubsForChanges(item.collection, item.doc, true);
+            // 		});
+            // 		this.checkPubsForChanges(oplogQueueFiltered[oplogQueueFiltered.length - 1].collection, oplogQueueFiltered[oplogQueueFiltered.length - 1].doc, false, true);
+            // 		for (let i = this._oplogQueue.length - 1; i >= 0; i--) {
+            // 			let item = this._oplogQueue[i];
+            // 			if (item.collection === collection) {
+            // 				this._oplogQueue.splice(i, 1);
+            // 			}
+            // 		}
+            // 	}
+            // });
         }, 25);
     };
     SubscriptionManager.prototype.resendPubsForDelete = function (collection) {
@@ -535,20 +536,20 @@ var SubscriptionManager = /** @class */ (function () {
                 sub.clients.forEach(function (client) {
                     that._wss.clients.forEach(function (ws) {
                         if (ws['id_socket'] === client.id_socket) {
-                            that.sendPubDataOnce(ws, client.messageId, sub);
+                            that.sendPubDataOnce(ws, client.messageId, sub, 'delete', collection);
                         }
                     });
                 });
             }
             else {
-                that.sendPubData(sub);
+                that.sendPubData(sub, 'delete', collection);
             }
         });
     };
     // 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, noFetchFunction) {
+    SubscriptionManager.prototype.checkPubsForChanges = function (collection, document, type, fetchFunctionOnly, noFetchFunction) {
         var _this = this;
         if (fetchFunctionOnly === void 0) { fetchFunctionOnly = false; }
         if (noFetchFunction === void 0) { noFetchFunction = false; }
@@ -574,7 +575,7 @@ var SubscriptionManager = /** @class */ (function () {
                     case 2:
                         if (!sub.preSubscriptionData) return [3 /*break*/, 4];
                         if (!that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) return [3 /*break*/, 4];
-                        that.sendPubData(sub);
+                        that.sendPubData(sub, type, collection);
                         _a = sub;
                         return [4 /*yield*/, (_c = that._publications[sub.publication]).preFunction.apply(_c, sub.subscriptionData)];
                     case 3:
@@ -588,7 +589,7 @@ var SubscriptionManager = /** @class */ (function () {
                     case 5:
                         _b.preSubscriptionData = _e.sent();
                         if (that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) {
-                            that.sendPubData(sub);
+                            that.sendPubData(sub, type, collection);
                         }
                         _e.label = 6;
                     case 6: return [3 /*break*/, 8];
@@ -601,7 +602,7 @@ var SubscriptionManager = /** @class */ (function () {
                                         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) {
-                                                    that.sendPubDataOnce(ws, client.messageId, sub);
+                                                    that.sendPubDataOnce(ws, client.messageId, sub, type, collection);
                                                 }
                                             });
                                         }
@@ -610,7 +611,7 @@ var SubscriptionManager = /** @class */ (function () {
                                 else if (!fetchFunctionOnly) {
                                     that._wss.clients.forEach(function (ws) {
                                         if (ws['id_socket'] === client.id_socket) {
-                                            that.sendPubDataOnce(ws, client.messageId, sub);
+                                            that.sendPubDataOnce(ws, client.messageId, sub, type, collection);
                                         }
                                     });
                                 }
@@ -620,12 +621,12 @@ var SubscriptionManager = /** @class */ (function () {
                             if (that._publications[sub.publication].fetchFunction) {
                                 if (!noFetchFunction) {
                                     if ((_d = that._publications[sub.publication]).fetchFunction.apply(_d, [document].concat(sub.subscriptionData))) {
-                                        that.sendPubData(sub);
+                                        that.sendPubData(sub, type, collection);
                                     }
                                 }
                             }
                             else if (!fetchFunctionOnly) {
-                                that.sendPubData(sub);
+                                that.sendPubData(sub, type, collection);
                             }
                         }
                         _e.label = 8;
@@ -658,7 +659,7 @@ var SubscriptionManager = /** @class */ (function () {
                     case 2:
                         if (!sub.preSubscriptionData) return [3 /*break*/, 4];
                         if (!that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) return [3 /*break*/, 4];
-                        that.sendPubData(sub);
+                        that.sendPubData(sub, 'support', collection);
                         _a = sub;
                         return [4 /*yield*/, (_c = that._publications[sub.publication]).preFunction.apply(_c, sub.subscriptionData)];
                     case 3:
@@ -671,7 +672,7 @@ var SubscriptionManager = /** @class */ (function () {
                     case 5:
                         _b.preSubscriptionData = _f.sent();
                         if (that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) {
-                            that.sendPubData(sub);
+                            that.sendPubData(sub, 'support', collection);
                         }
                         return [3 /*break*/, 7];
                     case 6:
@@ -682,7 +683,7 @@ var SubscriptionManager = /** @class */ (function () {
                                     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) {
-                                                that.sendPubDataOnce(ws, client.messageId, sub);
+                                                that.sendPubDataOnce(ws, client.messageId, sub, 'support', collection);
                                             }
                                         });
                                     }
@@ -690,7 +691,7 @@ var SubscriptionManager = /** @class */ (function () {
                                 else {
                                     that._wss.clients.forEach(function (ws) {
                                         if (ws['id_socket'] === client.id_socket) {
-                                            that.sendPubDataOnce(ws, client.messageId, sub);
+                                            that.sendPubDataOnce(ws, client.messageId, sub, 'support', collection);
                                         }
                                     });
                                 }
@@ -699,11 +700,11 @@ var SubscriptionManager = /** @class */ (function () {
                         else {
                             if (that._publications[sub.publication].fetchFunction) {
                                 if ((_e = that._publications[sub.publication]).fetchFunction.apply(_e, [document].concat(sub.subscriptionData))) {
-                                    that.sendPubData(sub);
+                                    that.sendPubData(sub, 'support', collection);
                                 }
                             }
                             else {
-                                that.sendPubData(sub);
+                                that.sendPubData(sub, 'support', collection);
                             }
                         }
                         _f.label = 7;
@@ -713,7 +714,7 @@ var SubscriptionManager = /** @class */ (function () {
         }); });
     };
     // Fetch pub once, send to all clients linked to this pub
-    SubscriptionManager.prototype.sendPubDataOnce = function (ws, messageId, subscription) {
+    SubscriptionManager.prototype.sendPubDataOnce = function (ws, messageId, subscription, type, collection) {
         return __awaiter(this, void 0, void 0, function () {
             var that;
             var _a, _b;
@@ -759,13 +760,14 @@ var SubscriptionManager = /** @class */ (function () {
         });
     };
     // Fetch pub once, send to all clients linked to this pub
-    SubscriptionManager.prototype.sendPubData = function (subscription) {
+    SubscriptionManager.prototype.sendPubData = function (subscription, type, collection) {
         return __awaiter(this, void 0, void 0, function () {
             var that;
             var _a;
             var _this = this;
             return __generator(this, function (_b) {
                 that = this;
+                that._mainServer.getMethodManager().callMethodInternal('insertLogSubscription', type, subscription.publication, collection);
                 (_a = that._publications[subscription.publication].function).call.apply(_a, [Object.assign({}, that, SubscriptionManager.prototype)].concat(subscription.subscriptionData)).then(function (res) {
                     subscription.clients.forEach(function (client) {
                         that._wss.clients.forEach(function (ws) {

package/methods/logs.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var mongoose_1 = require("mongoose");
 var log_collection_1 = require("../collections/log.collection");
+var log_subscription_collection_1 = require("../collections/log-subscription.collection");
 var index_1 = require("../index");
 function loadLogMethods(methodManager) {
     methodManager.methods({
@@ -23,6 +24,19 @@ function loadLogMethods(methodManager) {
                 });
             },
             skipValidation: true
+        },
+        insertSubscriptionLog: {
+            skipQueue: true,
+            function: function (type, subscription, collection_name) {
+                return log_subscription_collection_1.LogSubscriptions.create({
+                    _id: mongoose_1.Types.ObjectId().toHexString(),
+                    __v: 0,
+                    date: new Date(),
+                    type: type,
+                    subscription: subscription,
+                    collection_name: collection_name
+                });
+            }
         }
     });
 }

package/models/log-subscription.model.d.ts

@@ -0,0 +1,8 @@
+import { CollectionDocument } from './collection-document.model';
+export interface LogSubscriptionModel extends CollectionDocument {
+    date: Date;
+    type: LogSubscriptionType;
+    subscription: string;
+    collection_name: string;
+}
+export declare type LogSubscriptionType = 'insert' | 'update' | 'delete';

package/models/log-subscription.model.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

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