@ejfdelgado/ejflab-back 1.28.0 → 1.30.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ejfdelgado/ejflab-back",
-  "version": "1.28.0",
+  "version": "1.30.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-back.git"

package/srv/PostgresSrv.mjs

@@ -8,6 +8,7 @@ export class PostgresSrv {
     static pool = null;
     static {
         PostgresSrv.renderer.registerFunction("noQuotes", PostgresSrv.noQuotes);
+        PostgresSrv.renderer.registerFunction("singleWord", PostgresSrv.singleWord);
         PostgresSrv.renderer.registerFunction("sanitizeNumber", PostgresSrv.sanitizeNumber);
         PostgresSrv.renderer.registerFunction("sanitizeText", PostgresSrv.sanitizeText);
         PostgresSrv.renderer.registerFunction("sanitizeTextNull", PostgresSrv.sanitizeTextNull);
@@ -40,6 +41,9 @@ export class PostgresSrv {
     static noQuotes(val, ...args) {
         return val.replace(/'/g, "''");
     }
+    static singleWord(val, ...args) {
+        return val.split(/\s+/g)[0];
+    }
     static sanitizeText(val, ...args) {
         let text = val;
         if ([null, undefined].indexOf(text) >= 0) {
@@ -138,14 +142,21 @@ export class PostgresSrv {
         });
     }
 
-    static async getPool() {
+    static async checkSelect1() {
         if (PostgresSrv.pool == null) {
             PostgresSrv.createPool();
         }
         try {
             await PostgresSrv.pool.query('SELECT 1;');
+            return true;
         } catch (err) {
-            console.log(err);
+            return false;
+        }
+    }
+
+    static async getPool() {
+        const canSelect1 = await PostgresSrv.checkSelect1();
+        if (!canSelect1) {
             PostgresSrv.createPool();
         }
         return PostgresSrv.pool;

package/srv/common/General.mjs

@@ -1,4 +1,5 @@
 import md5 from 'md5';
+import { MalaPeticionException, ParametrosIncompletosException } from '../MyError.mjs';
 
 export class General {
     static PAGE_SIZE_DEFAULT = "20";
@@ -20,7 +21,7 @@ export class General {
             offset,
         };
     }
-    static readParam(req, name, pred = null) {
+    static readParam(req, name, pred = null, complain = false) {
         const nameLower = name.toLowerCase();
         if (req.body && name in req.body) {
             return req.body[name];
@@ -37,6 +38,9 @@ export class General {
                 return req.locals.extra[name];
             }
         }
+        if (complain) {
+            throw new ParametrosIncompletosException(`Parameter not found but required: ${name}`);
+        }
         return pred;
     }
     static getSuffixPath(keyName, suffix) {