@resolveio/server-lib 3.2.2 → 3.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/cron.manager.js

@@ -138,18 +138,20 @@ var CronManager = /** @class */ (function () {
     CronManager.prototype.runCronJob = function (cron) {
         var _this = this;
         var now = new Date();
-        var cronRunTime = null;
-        if (cron.next_run) {
-            cronRunTime = cron.next_run;
-            cronRunTime.setSeconds(0, 0);
-        }
-        if (!cron.next_run || now.getTime() >= cronRunTime.getTime()) {
+        if (!cron.next_run || now.getTime() >= cron.next_run.getTime()) {
             cron_job_collection_1.CronJobs.findOneAndUpdate({
                 $and: [
                     { _id: cron._id },
-                    { running: false }
+                    { running: false },
+                    {
+                        $or: [
+                            { next_run: { $exists: false } },
+                            { next_run: { $lte: now } }
+                        ]
+                    }
                 ]
             }, { $set: { running: true } }).exec(function (err, res) { return __awaiter(_this, void 0, void 0, function () {
+                var nextDate;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -176,12 +178,13 @@ var CronManager = /** @class */ (function () {
                             _a.label = 8;
                         case 8:
                             if (cron.repeat) {
+                                nextDate = (this._cronManager.getJob(cron.name).nextDates().toDate()).setSeconds(0, 0);
                                 cron_job_collection_1.CronJobs.updateOne({
                                     $and: [
                                         { _id: cron._id },
                                         { running: true }
                                     ]
-                                }, { $set: { running: false, next_run: this._cronManager.getJob(cron.name).nextDates().toDate() } }).exec();
+                                }, { $set: { running: false, next_run: nextDate } }).exec();
                             }
                             else {
                                 cron_job_collection_1.CronJobs.deleteOne({ _id: cron._id }).exec();

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