@resolveio/server-lib 2.0.5 → 2.1.0-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.js

@@ -353,11 +353,6 @@ var SubscriptionManager = /** @class */ (function () {
             if (nsArray[2]) {
                 collection += '.' + nsArray[2];
             }
-            _this._oplogQueue.push({
-                type: 'insert',
-                collection: collection,
-                doc: doc.o
-            });
             if (collection === 'cron-jobs') {
                 _this._mainServer.getCronManager().checkCronJobsForUpdates();
             }
@@ -370,6 +365,13 @@ var SubscriptionManager = /** @class */ (function () {
             else if (collection === 'support-tickets') {
                 _this._mainServer.getMethodManager().callMethodInternal('sendSupportTicketEmail', doc.o._id);
             }
+            else {
+                _this._oplogQueue.push({
+                    type: 'insert',
+                    collection: collection,
+                    doc: doc.o
+                });
+            }
         });
         oplog.on('update', function (doc) {
             var nsArray = doc.ns.split('.');
@@ -378,14 +380,16 @@ var SubscriptionManager = /** @class */ (function () {
                 collection += '.' + nsArray[2];
             }
             doc.o['_id'] = doc.o2['_id'];
-            _this._oplogQueue.push({
-                type: 'update',
-                collection: collection,
-                doc: doc.o
-            });
             if (collection === 'cron-jobs') {
                 _this._mainServer.getCronManager().checkCronJobsForUpdates();
             }
+            else {
+                _this._oplogQueue.push({
+                    type: 'update',
+                    collection: collection,
+                    doc: doc.o
+                });
+            }
         });
         oplog.on('delete', function (doc) {
             var nsArray = doc.ns.split('.');
@@ -420,7 +424,7 @@ var SubscriptionManager = /** @class */ (function () {
                 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);
+                    _this._oplogQueue.splice(_this._oplogQueue.map(function (a) { return a.collection; }).indexOf(collection), 1);
                 }
                 else {
                     oplogQueueFiltered.forEach(function (item) {

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