@resolveio/server-lib 2.2.2 → 2.2.3-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

@@ -276,7 +276,7 @@ var SubscriptionManager = /** @class */ (function () {
             subscriptionData[_i - 3] = arguments[_i];
         }
         return __awaiter(this, void 0, void 0, function () {
-            var that, sub, index, activeSub;
+            var that, sub, i, activeSub;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -286,13 +286,15 @@ var SubscriptionManager = /** @class */ (function () {
                         return [2 /*return*/];
                     case 1:
                         sub = that._subscriptions.filter(function (a) { return a.publication === publication && JSON.stringify(a.subscriptionData) === JSON.stringify(subscriptionData); })[0];
-                        if (!sub) return [3 /*break*/, 6];
-                        index = sub.clients.findIndex(function (a) { return a.id_user === ws['id_user'] && a.messageId === messageId && a.id_socket === ws['id_socket']; });
-                        if (!(index >= 0)) return [3 /*break*/, 5];
-                        sub.clients.splice(index, 1);
+                        if (!sub) return [3 /*break*/, 5];
+                        for (i = sub.clients.length - 1; i >= 0; i--) {
+                            if (sub.clients[i].id_user === ws['id_user'] && sub.clients[i].messageId === messageId && sub.clients[i].id_socket === ws['id_socket']) {
+                                sub.clients.splice(i, 1);
+                            }
+                        }
                         if (!!sub.clients.length) return [3 /*break*/, 2];
                         that._subscriptions.splice(that._subscriptions.findIndex(function (a) { return a.publication === publication && JSON.stringify(a.subscriptionData) === JSON.stringify(subscriptionData); }), 1);
-                        active_subscription_collection_1.ActiveSubscriptions.findOneAndRemove({
+                        active_subscription_collection_1.ActiveSubscriptions.deleteOne({
                             $and: [
                                 { publication: publication },
                                 { subData: JSON.stringify(subscriptionData) }
@@ -311,8 +313,10 @@ var SubscriptionManager = /** @class */ (function () {
                             active_subscription_collection_1.ActiveSubscriptions.updateOne({ _id: activeSub._id }, { $set: { clients: sub.clients } }).exec();
                         }
                         _a.label = 4;
-                    case 4: return [3 /*break*/, 5];
-                    case 5: return [3 /*break*/, 6];
+                    case 4: return [3 /*break*/, 6];
+                    case 5:
+                        console.log('Did not sub on unsubscribe');
+                        _a.label = 6;
                     case 6: return [2 /*return*/];
                 }
             });
@@ -351,7 +355,12 @@ var SubscriptionManager = /** @class */ (function () {
                     case 2:
                         activeSubs = _a.sent();
                         activeSubs.forEach(function (sub) {
-                            if (sub.clients.length === 1) {
+                            for (var j = sub.clients.length - 1; j >= 0; j--) {
+                                if (sub.clients[j].id_socket === ws['id_socket']) {
+                                    sub.clients.splice(j, 1);
+                                }
+                            }
+                            if (!sub.clients.length) {
                                 active_subscription_collection_1.ActiveSubscriptions.deleteOne({ _id: sub._id }).exec();
                             }
                             else {

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