@resolveio/server-lib 4.2.7-debug → 4.2.8-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,53 +57,67 @@ 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
+    },
+    'roles.notifications': {
+        type: Array
     },
-    'assets.$.ownership_driver': {
+    '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,
+    phonenumber: {
         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 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.js

@@ -516,14 +516,14 @@ var SubscriptionManager = /** @class */ (function () {
                         uniquePubs_1 = [];
                         uniqueOplog_1 = [];
                         needIds_1 = {};
-                        console.log('----------------OPLOG QUEUE START BEFORE DATA--------------------', new Date(), oplogQueue_1.length);
+                        // console.log('----------------OPLOG QUEUE START BEFORE DATA--------------------', new Date(), oplogQueue.length);
                         oplogQueue_1.forEach(function (oplog) {
                             for (var i = 0; i < that._subscriptions.length; i++) {
                                 var sub = that._subscriptions[i];
                                 if (sub.collections.includes(oplog.collection)) {
                                     var schemaErrors = null;
                                     try {
-                                        index_1.ResolveIOServer.getMainDB().model(oplog.collection)['simplschema'].validate(sub.preSubscriptionData);
+                                        index_1.ResolveIOServer.getMainDB().model(oplog.collection)['simplschema'].validate(oplog.doc);
                                     }
                                     catch (errors) {
                                         schemaErrors = errors;
@@ -569,11 +569,10 @@ var SubscriptionManager = /** @class */ (function () {
                         i++;
                         return [3 /*break*/, 1];
                     case 4:
-                        console.log('----------------OPLOG QUEUE START AFTER DATA--------------------', new Date(), oplogQueue_1.length);
+                        // console.log('----------------OPLOG QUEUE START AFTER DATA--------------------', new Date(), oplogQueue.length);
                         oplogQueue_1.forEach(function (oplog) { return __awaiter(_this, void 0, void 0, function () {
                             var _loop_4, i;
                             return __generator(this, function (_a) {
-                                console.log('OPLOG QUEUE START - Oplog', oplog);
                                 _loop_4 = function (i) {
                                     var _a;
                                     var sub = that._subscriptions[i];
@@ -614,15 +613,16 @@ var SubscriptionManager = /** @class */ (function () {
                                         }
                                     }
                                 };
+                                // console.log('OPLOG QUEUE START - Oplog', oplog);
                                 for (i = 0; i < that._subscriptions.length; i++) {
                                     _loop_4(i);
                                 }
                                 return [2 /*return*/];
                             });
                         }); });
-                        console.log('----------------OPLOG QUEUE END--------------------', new Date(), uniqueOplog_1.length);
+                        // console.log('----------------OPLOG QUEUE END--------------------', new Date(), uniqueOplog.length);
                         uniqueOplog_1.forEach(function (oplog) {
-                            console.log('OPLOG QUEUE END - Oplog', oplog);
+                            // console.log('OPLOG QUEUE END - Oplog', oplog);
                             _this.checkPubsForChanges(oplog.collection, oplog.doc, oplog.type);
                         });
                         _a.label = 5;

package/package.json

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