@resolveio/server-lib 1.1.0-newrole → 1.1.1

package/collections/user.collection.js

@@ -21,6 +21,13 @@ var schema = {
         type: Date,
         optional: true
     },
+    readonly: {
+        type: Boolean,
+        optional: true
+    },
+    active: {
+        type: Boolean
+    },
     attempts: {
         type: Number,
         optional: true
@@ -57,73 +64,60 @@ var schema = {
         type: String
     },
     roles: {
-        type: Object
-    },
-    'roles.super_admin': {
-        type: Boolean
-    },
-    'roles.approvals': {
         type: Array
     },
-    'roles.approvals.$': {
-        type: Object
-    },
-    'roles.approvals.$.name': {
+    'roles.$': {
         type: String
     },
-    'roles.approvals.$.type': {
-        type: String
+    phonenumber: {
+        type: String,
+        optional: true
     },
-    'roles.approvals.$.accounting_code': {
-        type: String
+    other: {
+        type: Object,
+        blackbox: true,
+        optional: true
     },
-    'roles.groups': {
-        type: Array
+    assets: {
+        type: Array,
+        optional: true
     },
-    'roles.groups.$': {
+    'assets.$': {
         type: Object
     },
-    'roles.groups.$.name': {
+    'assets.$.type': {
         type: String
     },
-    'roles.groups.$.views': {
-        type: Array
-    },
-    'roles.groups.$.views.$': {
+    'assets.$.id_asset': {
         type: String
     },
-    'roles.groups.$.yard': {
-        type: String,
-        optional: true
-    },
-    'roles.notifications': {
-        type: Array
-    },
-    'roles.notifications.$': {
+    'assets.$.asset_number': {
         type: String
     },
-    'roles.miscs': {
-        type: Array
+    'assets.$.ownership': {
+        type: String
     },
-    'roles.miscs.$': {
+    'assets.$.ownership_driver': {
         type: String
     },
-    active: Boolean,
-    id_customer: {
-        type: String,
+    'assets.$.date_start': {
+        type: Date
+    },
+    'assets.$.date_end': {
+        type: Date,
         optional: true
     },
-    customer: {
+    id_function: {
         type: String,
         optional: true
     },
-    customer_type: {
+    customer: {
         type: String,
-        optional: true
+        optional: true,
     },
-    phonenumber: {
+    id_customer: {
         type: String,
-        optional: true
+        optional: true,
     }
 };
 var DefaultSchema = new mongoose_1.Schema(schema, {

package/managers/method.manager.js

@@ -19,7 +19,6 @@ var method_response_collection_1 = require("../collections/method-response.colle
 var mongoose_1 = require("mongoose");
 var common_1 = require("../util/common");
 var log_collection_1 = require("../collections/log.collection");
-var cron_jobs_3 = require("../support-methods/cron-jobs");
 var support_manager_1 = require("./support.manager");
 var MethodManager = /** @class */ (function () {
     function MethodManager(mainServer, serverConfig, clientDir) {
@@ -43,7 +42,6 @@ var MethodManager = /** @class */ (function () {
         pdf_1.loadPDFMethods(this);
         cron_jobs_2.loadCronJobMethods(this);
         flags_1.loadFlagMethods(this);
-        cron_jobs_3.loadSupportCronJobMethods(this);
         this._mailer = nodemailer.createTransport({
             SES: new aws.SES({
                 apiVersion: '2010-12-01',

package/methods/cron-jobs.js

@@ -36,6 +36,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var queue_method_collection_1 = require("../collections/queue-method.collection");
+var user_collection_1 = require("../collections/user.collection");
+var simpl_schema_1 = require("simpl-schema");
+var mongoose_1 = require("mongoose");
 function loadCronJobMethods(methodManager) {
     methodManager.methods({
         methodQueue: {
@@ -57,6 +60,58 @@ function loadCronJobMethods(methodManager) {
                     });
                 }); });
             }
+        },
+        updateClientUsers: {
+            function: function () {
+                var _this = this;
+                return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
+                    var users, count, interval;
+                    var _this = this;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                if (!user_collection_1.ClientUsers) {
+                                    resolve();
+                                    return [2 /*return*/];
+                                }
+                                return [4 /*yield*/, user_collection_1.Users.find({})];
+                            case 1:
+                                users = _a.sent();
+                                count = 0;
+                                interval = setInterval(function () {
+                                    var updateChunk = users.slice(count * 10, Math.min(users.length, (count + 1) * 10));
+                                    _this.callSupportMethodInternal.call(_this, 'updateClientUserChunk', updateChunk);
+                                    count++;
+                                    if (count * 10 > users.length) {
+                                        clearInterval(interval);
+                                        resolve(true);
+                                    }
+                                }, 1000);
+                                resolve();
+                                return [2 /*return*/];
+                        }
+                    });
+                }); });
+            }
+        },
+        updateClientUserChunk: {
+            check: new simpl_schema_1.default({
+                users: {
+                    type: Array
+                },
+                'users.$': {
+                    type: Object,
+                    blackbox: true
+                }
+            }),
+            function: function (users) {
+                return new Promise(function (resolve, reject) {
+                    users.forEach(function (user) {
+                        user_collection_1.ClientUsers.updateOne({ _id: user._id }, { $setOnInsert: { _id: mongoose_1.Types.ObjectId().toHexString(), __v: 0 }, $set: user }, { upsert: true }).exec();
+                    });
+                    resolve();
+                });
+            }
         }
     });
 }

package/models/user.model.d.ts

@@ -1,30 +1,14 @@
 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;
-    services?: any;
-    id_customer?: string;
-    customer?: string;
-    customer_type?: string;
+    readonly?: boolean;
     phonenumber?: string;
-}
-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;
+    other?: object;
 }

package/package.json

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

package/support-methods/cron-jobs.d.ts

@@ -1,2 +0,0 @@
-import { MethodManager } from '../managers/method.manager';
-export declare function loadSupportCronJobMethods(methodManager: MethodManager): void;

package/support-methods/cron-jobs.js

@@ -1,97 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var user_collection_1 = require("../collections/user.collection");
-var simpl_schema_1 = require("simpl-schema");
-var mongoose_1 = require("mongoose");
-function loadSupportCronJobMethods(methodManager) {
-    methodManager.methods({
-        updateClientUsers: {
-            function: function () {
-                var _this = this;
-                return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                    var users, count, interval;
-                    var _this = this;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0:
-                                if (!user_collection_1.ClientUsers) {
-                                    resolve();
-                                    return [2 /*return*/];
-                                }
-                                return [4 /*yield*/, user_collection_1.Users.find({})];
-                            case 1:
-                                users = _a.sent();
-                                count = 0;
-                                interval = setInterval(function () {
-                                    var updateChunk = users.slice(count * 10, Math.min(users.length, (count + 1) * 10));
-                                    _this.callSupportMethodInternal.call(_this, 'updateClientUserChunk', updateChunk);
-                                    count++;
-                                    if (count * 10 > users.length) {
-                                        clearInterval(interval);
-                                        resolve(true);
-                                    }
-                                }, 1000);
-                                resolve();
-                                return [2 /*return*/];
-                        }
-                    });
-                }); });
-            }
-        },
-        updateClientUserChunk: {
-            check: new simpl_schema_1.default({
-                users: {
-                    type: Array
-                },
-                'users.$': {
-                    type: Object,
-                    blackbox: true
-                }
-            }),
-            function: function (users) {
-                return new Promise(function (resolve, reject) {
-                    users.forEach(function (user) {
-                        user_collection_1.ClientUsers.updateOne({ _id: user._id }, { $setOnInsert: { _id: mongoose_1.Types.ObjectId().toHexString(), __v: 0 }, $set: user }, { upsert: true }).exec();
-                    });
-                    resolve();
-                });
-            }
-        }
-    });
-}
-exports.loadSupportCronJobMethods = loadSupportCronJobMethods;