pangea-server 1.0.33 → 1.0.34

package/dist/database/db.class.d.ts

@@ -31,10 +31,6 @@ type FindManyOptions<BM extends BaseModel> = {
     pageSize?: number | null;
     paranoid?: 'active' | 'all' | 'deleted';
 };
-type InsertManyOptions<BM extends BaseModel> = {
-    ignoreDuplicates?: boolean;
-    updateOnDuplicate?: (keyof BM)[];
-};
 type Target<BM extends BaseModel> = Filters<BM> | BM;
 export declare class Db {
     private __tx?;
@@ -46,7 +42,8 @@ export declare class Db {
         totalCount: number;
     }>;
     insertOne<BM extends BaseModel>(model: BaseModelCtor<BM>, params: InsertParams<BM>): Promise<BM>;
-    insertMany<BM extends BaseModel>(model: BaseModelCtor<BM>, data: InsertParams<BM>[], options?: InsertManyOptions<BM>): Promise<number>;
+    insertMany<BM extends BaseModel>(model: BaseModelCtor<BM>, data: InsertParams<BM>[]): Promise<number>;
+    UpsertMany<BM extends BaseModel>(model: BaseModelCtor<BM>, fieldsToUpdate: (keyof BM)[], data: InsertParams<BM>[]): Promise<number>;
     updateOne<BM extends BaseModel>(model: BaseModelCtor<BM>, target: Target<BM>, params: UpdateParams<BM>): Promise<BM>;
     updateMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>, params: UpdateParams<BM>): Promise<number>;
     deleteOne<BM extends BaseModel>(model: BaseModelCtor<BM>, target: Target<BM>): Promise<BM | null>;

package/dist/database/db.class.js

@@ -1,7 +1,4 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Db = void 0;
 const sequelize_1 = require("sequelize");
@@ -10,7 +7,6 @@ const _1 = require(".");
 // helpers
 const helpers_1 = require("../helpers");
 const pangea_helpers_1 = require("pangea-helpers");
-const util_1 = __importDefault(require("util"));
 class Db {
     constructor(tx) {
         this.__tx = tx;
@@ -19,21 +15,19 @@ class Db {
     findOneOrNull(model, filters, options = {}) {
         const { scopes = [], attributes, include = [], order, paranoid = true } = options;
         const scopedModel = scopes.length ? model.scope(...scopes) : model;
-        const baseOptions = { attributes: getFinalAttributes(attributes), paranoid, transaction: this.__tx };
+        const baseOptions = {
+            attributes: getFinalAttributes(attributes),
+            paranoid,
+            subQuery: false,
+            transaction: this.__tx,
+        };
         if (typeof filters === 'number') {
-            return scopedModel.findByPk(filters, { ...getIncludeAndWhere(model, include), ...baseOptions });
+            return scopedModel.findByPk(filters, { ...baseOptions, ...getIncludeAndWhere(model, include) });
         }
-        console.log(util_1.default.inspect(getIncludeAndWhere(model, include, filters), {
-            depth: null,
-            colors: true,
-            compact: false,
-            showHidden: false, // muestra solo propiedades normales
-        }));
         return scopedModel.findOne({
+            ...baseOptions,
             ...getIncludeAndWhere(model, include, filters),
             order: getFinalOrder(order),
-            ...baseOptions,
-            subQuery: false,
         });
     }
     async findOne(model, filters, options = {}) {
@@ -94,9 +88,19 @@ class Db {
             return this.findOne(model, newInstance.id);
         });
     }
-    insertMany(model, data, options = {}) {
+    insertMany(model, data) {
+        return handleDbError(async () => {
+            const newInstances = await model.bulkCreate(data, { validate: true, transaction: this.__tx });
+            return newInstances.length;
+        });
+    }
+    UpsertMany(model, fieldsToUpdate, data) {
         return handleDbError(async () => {
-            const newInstances = await model.bulkCreate(data, { ...options, validate: true, transaction: this.__tx });
+            const newInstances = await model.bulkCreate(data, {
+                updateOnDuplicate: fieldsToUpdate,
+                validate: true,
+                transaction: this.__tx,
+            });
             return newInstances.length;
         });
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "1.0.33",
+  "version": "1.0.34",
   "files": [
     "dist"
   ],
@@ -51,6 +51,7 @@
     "mysql2": "3.14.0",
     "nodemailer": "6.10.0",
     "pangea-helpers": "1.3.85",
+    "reflect-metadata": "0.2.2",
     "sequelize": "6.37.7",
     "sequelize-typescript": "2.1.6",
     "sharp": "0.34.1",