@resolveio/server-lib 3.1.0 → 3.1.2-newrole

package/collections/method-call.collection.js

@@ -29,9 +29,6 @@ var schema = {
     method: {
         type: String
     },
-    data: {
-        type: String
-    },
     date: {
         type: Date
     }

package/collections/queue-response.collection.js

@@ -34,13 +34,6 @@ var schema = {
     method: {
         type: String
     },
-    method_data: {
-        type: Array
-    },
-    'method_data.$': {
-        type: Object,
-        blackbox: true
-    },
     id_ws: {
         type: String
     },
@@ -56,6 +49,9 @@ var schema = {
     response: {
         type: Object,
         blackbox: true
+    },
+    date: {
+        type: Date
     }
 };
 var DefaultSchema = new mongoose_1.Schema(schema, {

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/queue-method.manager.js

@@ -83,7 +83,7 @@ var QueueMethodManager = /** @class */ (function () {
                                             message_id: sendItem.messageId,
                                             response: sendItem.response,
                                             method: sendItem.method,
-                                            messageDate: sendItem.messageDate
+                                            date: sendItem.date
                                         });
                                     }
                                     else {
@@ -135,7 +135,7 @@ var QueueMethodManager = /** @class */ (function () {
             method_data: data,
             id_user: id_user,
             user: user,
-            messageDate: messageDate
+            date: messageDate
         });
     };
     QueueMethodManager.prototype.runMethodQueue = function (count) {
@@ -208,10 +208,9 @@ var QueueMethodManager = /** @class */ (function () {
             id_user: update.id_user,
             user: update.user,
             messageId: update.messageId,
-            method_data: update.method_data,
             response: response,
             method: update.method,
-            messageDate: update.messageDate
+            date: update.date
         });
     };
     QueueMethodManager.prototype.runMethodResponse = function () {

package/models/method-call.model.d.ts

@@ -3,6 +3,5 @@ export interface MethodCallModel extends CollectionDocument {
     id_user: string;
     message_id: string;
     method: string;
-    data: string;
     date: Date;
 }

package/models/method-response.model.d.ts

@@ -4,4 +4,5 @@ export interface MethodResponseModel extends CollectionDocument {
     message_id: string;
     method: string;
     response: any;
+    date: Date;
 }

package/models/queue-method.model.d.ts

@@ -6,5 +6,5 @@ export interface QueueMethodModel extends CollectionDocument {
     messageId: number;
     id_user: string;
     user: string;
-    messageDate: Date;
+    date: Date;
 }

package/models/queue-response.model.d.ts

@@ -1,10 +1,10 @@
 import { CollectionDocument } from './collection-document.model';
 export interface QueueResponseModel extends CollectionDocument {
     method: string;
-    method_data: any[];
     id_ws: string;
     messageId: number;
     id_user: string;
     user: string;
     response: any;
+    date: Date;
 }

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