@ccci/micro-server 1.0.127 → 1.0.129

package/dist/index.js

@@ -179478,7 +179478,7 @@ var require_util6 = __commonJS((exports) => {
   var getModuleFormat = function() {
     return isEsm ? "ESM" : "CJS";
   };
-  var __dirname = "/Users/ariel/work/micro-server/node_modules/@google-cloud/storage/build/cjs/src";
+  var __dirname = "/Users/john/Documents/ccci/packages/micro-server/node_modules/@google-cloud/storage/build/cjs/src";
   var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
     if (k2 === undefined)
       k2 = k;
@@ -220722,7 +220722,7 @@ var require_channelz = __commonJS((exports) => {
   var setup = function() {
     (0, admin_1.registerAdminService)(getChannelzServiceDefinition, getChannelzHandlers);
   };
-  var __dirname = "/Users/ariel/work/micro-server/node_modules/google-gax/node_modules/@grpc/grpc-js/build/src";
+  var __dirname = "/Users/john/Documents/ccci/packages/micro-server/node_modules/google-gax/node_modules/@grpc/grpc-js/build/src";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.setup = exports.getChannelzServiceDefinition = exports.getChannelzHandlers = exports.unregisterChannelzRef = exports.registerChannelzSocket = exports.registerChannelzServer = exports.registerChannelzSubchannel = exports.registerChannelzChannel = exports.ChannelzCallTrackerStub = exports.ChannelzCallTracker = exports.ChannelzChildrenTrackerStub = exports.ChannelzChildrenTracker = exports.ChannelzTrace = exports.ChannelzTraceStub = undefined;
   var net_1 = __require("net");
@@ -228896,7 +228896,7 @@ var require_grpc = __commonJS((exports) => {
       });
     });
   }
-  var __dirname = "/Users/ariel/work/micro-server/node_modules/google-gax/build/src";
+  var __dirname = "/Users/john/Documents/ccci/packages/micro-server/node_modules/google-gax/build/src";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.GoogleProtoFilesRoot = exports.GrpcClient = exports.ClientStub = undefined;
   var grpcProtoLoader = require_src21();
@@ -243695,7 +243695,7 @@ var require_farmhash_modern = __commonJS((exports, module) => {
     }
     return cachedInt32Memory0;
   };
-  var __dirname = "/Users/ariel/work/micro-server/node_modules/farmhash-modern/bin/nodejs";
+  var __dirname = "/Users/john/Documents/ccci/packages/micro-server/node_modules/farmhash-modern/bin/nodejs";
   var imports = {};
   imports["__wbindgen_placeholder__"] = exports;
   var wasm;
@@ -245371,14 +245371,14 @@ class DatabaseConnector {
       for (let i = 0;i < files.length; i++) {
         let file = files[i];
         await import(`${DatabaseConnector.rootDir}/models/${file}`).then((model) => {
-          console.log("Initializing Model :>> ", model.default);
+          Logger.info("Initializing Model :>> ", model.default);
           if (model && model.default && model.default.associate) {
             model.default.associate();
           }
         });
       }
     } catch (error) {
-      console.log(error);
+      Logger.error(error);
     }
   }
   getConnections() {
@@ -245400,19 +245400,18 @@ class DatabaseConnector {
     return DatabaseConnector.connection.models[modelName];
   }
   static async sync(modelName, force = false) {
-    console.log("syncing model :>> ", modelName);
     try {
       await DatabaseConnector.connection.models[modelName].sync({ force });
+      Logger.info("Syncing Database table: ", modelName);
     } catch (error) {
-      console.log("ERROR in syncing :>> ", error);
+      Logger.error(error);
     }
   }
   static async syncAll(force = false) {
-    console.log("syncing ALL models :>> ");
     try {
       await DatabaseConnector.connection.sync({ force });
     } catch (error) {
-      console.log("ERROR in syncing :>> ", error);
+      Logger.error(error);
     }
   }
   static disconnect() {
@@ -250758,11 +250757,9 @@ class Uploader {
           objectName: filename,
           mimeType: file.mimetype
         });
-        console.log("response :>> ", response4);
       }
       return response4;
     } catch (error) {
-      console.log("UPLOAD error :>> ", error);
       throw error;
     }
   }
@@ -250871,7 +250868,6 @@ class Mailer {
 
 // src/utils/PushNotifier.ts
 var import_firebase_admin = __toESM(require_lib18(), 1);
-
 class PushNotifier {
   static FirebaseAdmin = import_firebase_admin.default;
   static instance = 0;
@@ -250901,7 +250897,7 @@ class PushNotifier {
       let result = await PushNotifier.FirebaseAdmin.messaging().sendEach(params);
       return result;
     } catch (error) {
-      console.log("error :>> ", error);
+      Logger.error(error);
     }
   }
   static async sendNotification(token, message, metadata = {}, options) {
@@ -250914,7 +250910,7 @@ class PushNotifier {
       let result = await PushNotifier.FirebaseAdmin.messaging().send(params);
       return result;
     } catch (error) {
-      console.log("error :>> ", error);
+      Logger.error(error);
     }
   }
 }
@@ -251210,6 +251206,24 @@ function ConstructQuery(query) {
           if (_field)
             where2[Op.or].push(_field);
         });
+      } else if (field.indexOf("&") > -1) {
+        if (!where2.hasOwnProperty(Op.and))
+          where2[Op.and] = [];
+        let andFields = field.split("&");
+        andFields.forEach((andField) => {
+          let _field = getQueryField(andField);
+          if (_field)
+            where2[Op.and].push(_field);
+        });
+      } else if (field.indexOf("!") > -1) {
+        let notField = field.replace("!", "");
+        let _field = getQueryField(notField);
+        if (_field) {
+          where2[Op.not] = { ...where2[Op.not], ..._field };
+        }
+      } else if (field.indexOf("?") > -1) {
+        let notNullField = field.replace("?", "");
+        where2[notNullField] = { [Op.ne]: null };
       } else {
         let _field = getQueryField(field);
         where2 = { ...where2, ..._field };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccci/micro-server",
-  "version": "1.0.127",
+  "version": "1.0.129",
   "module": "index.ts",
   "type": "module",
   "main": "dist/index.js",