@ecopex/ecopex-framework 1.0.8 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopex/ecopex-framework",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Javascript Framework for API and Admin Panel",
   "main": "index.js",
   "scripts": {

package/routes/auto/handler.js

@@ -30,7 +30,7 @@ async function getAll(request, reply, routeOptions = {}) {
     const orderBy = `${tableName}.${(splitOrder[0] || primaryKey)}`;
     const orderDirection = splitOrder[1] || 'desc';
 
-    let query = db(tableName + ' as ' + tableName).select(`${tableName}.*`);
+    let query = db.instance(tableName + ' as ' + tableName).select(`${tableName}.*`);
 
     // Apply search filter if provided
     if (search && routeConfig.searchable_fields) {
@@ -155,7 +155,7 @@ async function getById(request, reply, routeOptions = {}) {
     const tableName = routeOptions.tableName || 'users';
     const routeConfig = routeOptions.routeConfig || {};
 
-    const item_query = db(tableName)
+    const item_query = db.instance(tableName)
       .select(`${tableName}.*`)
       .where(primaryKey, id);
 
@@ -261,14 +261,14 @@ async function create(request, reply, routeOptions = {}) {
     }
 
     try {
-      const [id] = await db(tableName)
+      const [id] = await db.instance(tableName)
         .insert({
           ...data,
           created_at: new Date(),
           updated_at: new Date()
         });
 
-      const item = await db(tableName)
+      const item = await db.instance(tableName)
         .where(primaryKey, id)
         .first();
 
@@ -345,7 +345,7 @@ async function update(request, reply, routeOptions = {}) {
 
 
     // Check if record exists
-    const existingItem = await db(tableName)
+    const existingItem = await db.instance(tableName)
       .where(request.params)
       .first();
 
@@ -363,14 +363,14 @@ async function update(request, reply, routeOptions = {}) {
       }
     }
 
-    await db(tableName)
+    await db.instance(tableName)
       .where(request.params)
       .update({
         ...data,
         updated_at: new Date()
       })
 
-    const updatedItem = await db(tableName)
+    const updatedItem = await db.instance(tableName)
       .where(request.params)
       .first();
 
@@ -406,7 +406,7 @@ async function upload(request, reply, routeOptions = {}) {
     const { [primaryKey]: id } = request.params;
     const routeConfig = routeOptions.routeConfig || {};
 
-    const existingItem = await db(tableName)
+    const existingItem = await db.instance(tableName)
       .where(primaryKey, id)
       .first();
 
@@ -425,7 +425,7 @@ async function upload(request, reply, routeOptions = {}) {
       });
     }
 
-    await db(tableName)
+    await db.instance(tableName)
       .where(primaryKey, id)
       .update({
         [routeConfig.upload_field]: uploadResult.file.fileUrl
@@ -464,7 +464,7 @@ async function deleteRecord(request, reply, routeOptions = {}) {
     const tableName = routeOptions.tableName || 'users';
 
     // Check if record exists
-    const existingItem = await db(tableName)
+    const existingItem = await db.instance(tableName)
       .where('id', id)
       .first();
 
@@ -475,7 +475,7 @@ async function deleteRecord(request, reply, routeOptions = {}) {
       });
     }
 
-    await db(tableName)
+    await db.instance(tableName)
       .where('id', id)
       .del();
 
@@ -524,7 +524,7 @@ const generateRandomString = async (from_string = null, field_name = null, table
  * @returns {Promise<boolean>} - The unique status
  */
 const checkUnique = async (value = null, field_name = null, tableName = null) => {
-  const existing_item = await db(tableName).select(field_name).where(field_name, value).first();
+  const existing_item = await db.instance(tableName).select(field_name).where(field_name, value).first();
   return existing_item ? true : false;
 }
 
@@ -594,7 +594,7 @@ const processJoinTables = async (items, joinTables) => {
       
       const personal_ids = items.map(item => item[joinTable.primary_key]);
       
-      const personal_items = db(joinTable.table).whereIn(joinTable.table + '.' + joinTable.foreign_key, personal_ids);
+      const personal_items = db.instance(joinTable.table).whereIn(joinTable.table + '.' + joinTable.foreign_key, personal_ids);
 
       if(joinTable.extra_where) {
         personal_items.where(db.raw(joinTable.table + '.' + joinTable.extra_where));

package/utils/middleware.js

@@ -18,7 +18,7 @@ class Middleware {
       request.locale = locale;
       request.t = (key, params = {}) => i18n.t(key, locale, params);
 
-      const language = await db('languages').where('code', locale).first();
+      const language = await db.instance('languages').where('code', locale).first();
       
       request.language = language ? language.language_id : 1;