@resolveio/server-lib 2.1.4 → 2.2.0-newrole

package/collections/billing-logged-in-users.collection.d.ts

@@ -0,0 +1,7 @@
+import { Model, Document } from 'mongoose';
+import { BillingLoggedInUserModel } from '../models/billing-logged-in-users.model';
+interface ResolveIOModel extends BillingLoggedInUserModel, Document {
+}
+export declare let BillingLoggedInUsers: Model<ResolveIOModel>;
+export declare const BillingLoggedInUserVersions: Model<ResolveIOModel>;
+export {};

package/collections/billing-logged-in-users.collection.js

@@ -0,0 +1,68 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var mongoose_1 = require("mongoose");
+var index_1 = require("../index");
+var simpl_schema_1 = require("simpl-schema");
+var schema = {
+    _id: {
+        type: String,
+        optional: true
+    },
+    __v: {
+        type: Number,
+        optional: true
+    },
+    updatedAt: {
+        type: Date,
+        optional: true
+    },
+    createdAt: {
+        type: Date,
+        optional: true
+    },
+    date: {
+        type: Date
+    },
+    id_user: {
+        type: String
+    },
+    user: {
+        type: String
+    },
+    client: {
+        type: String
+    }
+};
+var DefaultSchema = new mongoose_1.Schema(schema, {
+    skipVersioning: true,
+    versionKey: false,
+    timestamps: true
+});
+DefaultSchema.index({ client: 1, id_user: 1, date: 1 });
+exports.BillingLoggedInUsers = null;
+if (index_1.ResolveIOServer.getSupportDB()) {
+    exports.BillingLoggedInUsers = index_1.ResolveIOServer.getSupportDB().model('billing-logged-in-users', DefaultSchema);
+    exports.BillingLoggedInUsers['simplschema'] = new simpl_schema_1.default(schema);
+}
+var vSchema = __assign({}, schema);
+vSchema._id = {
+    type: mongoose_1.Schema.Types.Mixed
+};
+var VersionSchema = new mongoose_1.Schema(vSchema, {
+    skipVersioning: true,
+    versionKey: false,
+    timestamps: true
+});
+exports.BillingLoggedInUsers['versionCollection'] = 'billing-logged-in-users.versions';
+exports.BillingLoggedInUserVersions = index_1.ResolveIOServer.getMainDB().model(exports.BillingLoggedInUsers['versionCollection'], VersionSchema);

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

@@ -52,6 +52,9 @@ var support_tickets_1 = require("../publications/support-tickets");
 var index_1 = require("../index");
 var notifications_1 = require("../publications/notifications");
 var common_1 = require("../util/common");
+var billing_logged_in_users_collection_1 = require("../collections/billing-logged-in-users.collection");
+var moment = require("moment");
+var billing_logged_in_users_1 = require("../publications/billing-logged-in-users");
 var SubscriptionManager = /** @class */ (function () {
     function SubscriptionManager(mainServer, wss, serverConfig) {
         var _this = this;
@@ -74,6 +77,7 @@ var SubscriptionManager = /** @class */ (function () {
         method_calls_1.loadMethodCallsPublications(this);
         method_responses_1.loadMethodResponsePublications(this);
         support_tickets_1.loadSupportTicketPublications(this);
+        billing_logged_in_users_1.loadBillingLoggedInUsersPublications(this);
         notifications_1.loadNotificationPublications(this);
         this.tailOpLog();
         this.runOpLogQueue();
@@ -115,20 +119,14 @@ var SubscriptionManager = /** @class */ (function () {
     };
     SubscriptionManager.prototype.loggedInLatency = function (ws) {
         return __awaiter(this, void 0, void 0, function () {
-            var loggedInUser;
+            var _this = this;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, logged_in_users_collection_1.LoggedInUsers.findOne({ id_ws: ws['id_socket'] })];
-                    case 1:
-                        loggedInUser = _a.sent();
-                        if (loggedInUser) {
-                            logged_in_users_collection_1.LoggedInUsers.updateOne({ _id: loggedInUser._id }, { $set: { latency: ws['latency'] } }).exec();
-                        }
-                        else {
-                            this.unsubscribeAll(ws);
-                        }
-                        return [2 /*return*/];
-                }
+                logged_in_users_collection_1.LoggedInUsers.findOneAndUpdate({ id_ws: ws['id_socket'] }, { $set: { latency: ws['latency'] } }).exec(function (err, res) {
+                    if (err) {
+                        _this.unsubscribeAll(ws);
+                    }
+                });
+                return [2 /*return*/];
             });
         });
     };
@@ -139,7 +137,7 @@ var SubscriptionManager = /** @class */ (function () {
             subscriptionData[_i - 3] = arguments[_i];
         }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, that, pub, valObj, valKeys, rootKeys, i, sub, _b, newActiveSub;
+            var _a, that, pub, valObj, valKeys, rootKeys, i, sub, _b, newActiveSub, begDate, endDate, billUser;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -225,17 +223,48 @@ var SubscriptionManager = /** @class */ (function () {
                         }, { $setOnInsert: { _id: mongoose_1.Types.ObjectId().toHexString(), __v: 0 }, $set: newActiveSub }, { upsert: true }).exec();
                         _c.label = 4;
                     case 4:
-                        if (publication === 'appversion') {
-                            logged_in_users_collection_1.LoggedInUsers.create({
+                        if (!(publication === 'appversion')) return [3 /*break*/, 6];
+                        logged_in_users_collection_1.LoggedInUsers.create({
+                            _id: mongoose_1.Types.ObjectId().toHexString(),
+                            __v: 0,
+                            date: new Date(),
+                            id_user: ws['id_user'],
+                            user: ws['user'],
+                            id_ws: ws['id_socket']
+                        });
+                        if (!(ws['user'] !== 'Admin')) return [3 /*break*/, 6];
+                        begDate = moment().startOf('month');
+                        endDate = moment().endOf('month');
+                        return [4 /*yield*/, billing_logged_in_users_collection_1.BillingLoggedInUsers.findOne({
+                                $and: [
+                                    {
+                                        client: index_1.ResolveIOServer.getClientName()
+                                    },
+                                    {
+                                        id_user: ws['id_user']
+                                    },
+                                    {
+                                        date: { $gte: begDate }
+                                    },
+                                    {
+                                        date: { $lte: endDate }
+                                    }
+                                ]
+                            })];
+                    case 5:
+                        billUser = _c.sent();
+                        if (!billUser) {
+                            billing_logged_in_users_collection_1.BillingLoggedInUsers.create({
                                 _id: mongoose_1.Types.ObjectId().toHexString(),
                                 __v: 0,
-                                date: new Date(),
                                 id_user: ws['id_user'],
                                 user: ws['user'],
-                                id_ws: ws['id_socket']
+                                date: new Date(),
+                                client: index_1.ResolveIOServer.getClientName()
                             });
                         }
-                        return [2 /*return*/];
+                        _c.label = 6;
+                    case 6: return [2 /*return*/];
                 }
             });
         });

package/models/billing-logged-in-users.model.d.ts

@@ -0,0 +1,7 @@
+import { CollectionDocument } from './collection-document.model';
+export interface BillingLoggedInUserModel extends CollectionDocument {
+    date: Date;
+    id_user: string;
+    user: string;
+    client: string;
+}

package/models/billing-logged-in-users.model.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

package/publications/billing-logged-in-users.d.ts

@@ -0,0 +1 @@
+export declare function loadBillingLoggedInUsersPublications(subscriptionManager: any): void;

package/publications/billing-logged-in-users.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var simpl_schema_1 = require("simpl-schema");
+var billing_logged_in_users_collection_1 = require("../collections/billing-logged-in-users.collection");
+function loadBillingLoggedInUsersPublications(subscriptionManager) {
+    subscriptionManager.publications({
+        billingloggedinusers: {
+            function: function () {
+                return billing_logged_in_users_collection_1.BillingLoggedInUsers.find().sort({ date: -1 }).exec();
+            },
+            collections: ['billing-logged-in-users']
+        },
+        billingloggedinusersWithClientAndUserId: {
+            function: function (client, id_user) {
+                return billing_logged_in_users_collection_1.BillingLoggedInUsers.find({
+                    $and: [
+                        { client: client },
+                        { id_user: id_user }
+                    ]
+                }).exec();
+            },
+            check: new simpl_schema_1.default({
+                client: {
+                    type: String
+                },
+                id_user: {
+                    type: String
+                }
+            }),
+            collections: ['billing-logged-in-users'],
+            fetchFunction: function (document, client, id_user) {
+                return document['id_user'] === id_user && document['client'] === client;
+            }
+        },
+        billingloggedinusersWithClientAndDates: {
+            function: function (client, date_start, date_end) {
+                return billing_logged_in_users_collection_1.BillingLoggedInUsers.find({
+                    $and: [
+                        { client: client },
+                        { date: { $gte: date_start } },
+                        { date: { $lte: date_end } }
+                    ]
+                }).exec();
+            },
+            check: new simpl_schema_1.default({
+                client: {
+                    type: String
+                },
+                date_start: {
+                    type: Date
+                },
+                date_end: {
+                    type: Date
+                }
+            }),
+            collections: ['billing-logged-in-users'],
+            fetchFunction: function (document, date_start, date_end) {
+                return document['date'].getTime() >= date_start && document['date'].getTime() <= date_end;
+            }
+        }
+    });
+}
+exports.loadBillingLoggedInUsersPublications = loadBillingLoggedInUsersPublications;