@hastehaul/common 3.1.0 → 3.3.0

package/build/middlewares/current-user.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -31,9 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.currentUser = void 0;
-const jsonwebtoken_1 = __importStar(require("jsonwebtoken"));
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 /**
  * Middleware function to extract the current user from the request's Authorization header.
  *
@@ -51,23 +31,16 @@ const currentUser = (req, res, next) => __awaiter(void 0, void 0, void 0, functi
         return next();
     }
     try {
+        const jwtKey = (_a = process.env.JWT_KEY) !== null && _a !== void 0 ? _a : "";
+        console.log("=== jwtKey ===", jwtKey);
         const token = bearerToken.split(' ')[1];
         if (token) {
-            // ! over here we should get the JWT_KEY from the db or use the => kubectl create secret generic jwt-secret --from-literal=jwt=secret
-            const jwtKey = (_a = process.env.JWT_KEY) !== null && _a !== void 0 ? _a : "";
             const result = jsonwebtoken_1.default.verify(token, jwtKey.split('-').join(''));
             req.currentUser = result;
         }
     }
     catch (err) {
-        if (err instanceof jsonwebtoken_1.TokenExpiredError) {
-            // If the token is expired, you may consider refreshing the token or taking appropriate actions.
-            // Uncomment the following line if you want to handle token expiration using the AuthController.
-            // await AuthController.refreshToken(req, res);
-        }
-        else {
-            console.error('Error verifying token:', err);
-        }
+        console.error('Error verifying token:', err);
     }
     next();
 });

package/build/utils/utils.d.ts

@@ -1,3 +1,4 @@
+import { Model, Document } from 'mongoose';
 type Setting = {
     key: string;
     value: any;
@@ -16,4 +17,5 @@ export declare function isPointInGeoJSON(latLng: number[], fileName: string): Pr
     properties: null;
 }>;
 export declare function clearGeoJsonCache(): void;
+export declare function generateCode<T extends Document>(model: Model<T>, filterProperty: keyof T): Promise<string>;
 export {};

package/build/utils/utils.js

@@ -20,6 +20,7 @@ exports.getValueFromSettings = getValueFromSettings;
 exports.loadAsset = loadAsset;
 exports.isPointInGeoJSON = isPointInGeoJSON;
 exports.clearGeoJsonCache = clearGeoJsonCache;
+exports.generateCode = generateCode;
 const boolean_point_in_polygon_1 = __importDefault(require("@turf/boolean-point-in-polygon"));
 const helpers_1 = require("@turf/helpers");
 const moment_1 = __importDefault(require("moment"));
@@ -108,3 +109,24 @@ function isPointInGeoJSON(latLng, fileName) {
 function clearGeoJsonCache() {
     cachedGeoJsonData = null;
 }
+function generateCode(model, filterProperty) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const batchSize = 10;
+        const prefixes = ['R'];
+        let totalDocuments = yield model.countDocuments();
+        let batch = Array.from({ length: batchSize }, (_, i) => {
+            const prefix = prefixes[Math.floor(Math.random() * prefixes.length)];
+            const code = (totalDocuments + i + 1).toString().padStart(4, '0'); // Adjust to 5 digits to fit prefix
+            return prefix + code;
+        });
+        let query = { [filterProperty]: { $in: batch } };
+        let foundCode = yield model.find({ query });
+        let foundSet = new Set(foundCode.map((document) => document[filterProperty]));
+        for (let code of batch) {
+            if (!foundSet.has(code)) {
+                return code;
+            }
+        }
+        return generateCode(model, filterProperty);
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hastehaul/common",
-  "version": "3.1.0",
+  "version": "3.3.0",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -36,6 +36,7 @@
     "ioredis": "^5.3.2",
     "jsonwebtoken": "^9.0.1",
     "moment": "^2.29.4",
+    "mongoose": "^8.5.2",
     "nats": "^2.17.0",
     "socket.io": "^4.7.1"
   }