@resolveio/server-lib 3.2.4 → 3.2.5-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

@@ -553,9 +553,9 @@ var SubscriptionManager = /** @class */ (function () {
         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;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var _a, _b, schemaErrors, _c, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         schemaErrors = null;
                         try {
@@ -567,21 +567,30 @@ var SubscriptionManager = /** @class */ (function () {
                         if (!schemaErrors) return [3 /*break*/, 2];
                         return [4 /*yield*/, index_1.ResolveIOServer.getMainDB().model(collection).findById(document['_id'])];
                     case 1:
-                        document = _c.sent();
-                        _c.label = 2;
+                        document = _e.sent();
+                        _e.label = 2;
                     case 2:
-                        if (!that._publications[sub.publication].preFunction) return [3 /*break*/, 5];
-                        if (!!noFetchFunction) return [3 /*break*/, 4];
-                        _b = sub;
-                        return [4 /*yield*/, that._publications[sub.publication].preFunction(sub.subscriptionData)];
+                        if (!sub.preSubscriptionData) return [3 /*break*/, 4];
+                        if (!that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) return [3 /*break*/, 4];
+                        that.sendPubData(sub);
+                        _c = sub;
+                        return [4 /*yield*/, (_a = that._publications[sub.publication]).preFunction.apply(_a, sub.subscriptionData)];
                     case 3:
-                        _b.preSubscriptionData = _c.sent();
+                        _c.preSubscriptionData = _e.sent();
+                        return [2 /*return*/];
+                    case 4:
+                        if (!that._publications[sub.publication].preFunction) return [3 /*break*/, 7];
+                        if (!!noFetchFunction) return [3 /*break*/, 6];
+                        _d = sub;
+                        return [4 /*yield*/, that._publications[sub.publication].preFunction(sub.subscriptionData)];
+                    case 5:
+                        _d.preSubscriptionData = _e.sent();
                         if (that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) {
                             that.sendPubData(sub);
                         }
-                        _c.label = 4;
-                    case 4: return [3 /*break*/, 6];
-                    case 5:
+                        _e.label = 6;
+                    case 6: return [3 /*break*/, 8];
+                    case 7:
                         if (that._publications[sub.publication].ws_specific) {
                             sub.clients.forEach(function (client) {
                                 var _a;
@@ -608,7 +617,7 @@ var SubscriptionManager = /** @class */ (function () {
                         else {
                             if (that._publications[sub.publication].fetchFunction) {
                                 if (!noFetchFunction) {
-                                    if ((_a = that._publications[sub.publication]).fetchFunction.apply(_a, [document].concat(sub.subscriptionData))) {
+                                    if ((_b = that._publications[sub.publication]).fetchFunction.apply(_b, [document].concat(sub.subscriptionData))) {
                                         that.sendPubData(sub);
                                     }
                                 }
@@ -617,8 +626,8 @@ var SubscriptionManager = /** @class */ (function () {
                                 that.sendPubData(sub);
                             }
                         }
-                        _c.label = 6;
-                    case 6: return [2 /*return*/];
+                        _e.label = 8;
+                    case 8: return [2 /*return*/];
                 }
             });
         }); });

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