@obisey/nest 0.1.22 → 0.1.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@obisey/nest",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "description": "NestJS utilities and base classes by Obisey",
   "main": "index.js",
   "types": "index.d.ts",
@@ -35,12 +35,15 @@
     "@types/sequelize": "^4.28.20",
     "cache-manager": "^7.0.0",
     "cache-manager-redis-store": "^3.0.1",
+    "express": "^5.0.0",
     "graphql": "^16.0.0",
     "ioredis": "^5.6.1",
     "reflect-metadata": "^0.2.2",
     "sequelize": "^6.37.7",
     "sequelize-typescript": "^2.1.6",
-    "typescript": "^5.8.3",
-    "express": "^5.0.0"
+    "typescript": "^5.8.3"
+  },
+  "dependencies": {
+    "dayjs": "^1.11.19"
   }
 }

package/prototipos/baseResolver.js

@@ -41,7 +41,6 @@ var tiempo = 86400000;
 var isDev = false;
 const cachear_1 = require("./utils/cachear");
 const paginar_1 = require("./utils/paginar");
-const getModelId_1 = require("./utils/getModelId");
 const _ = __importStar(require("lodash"));
 function BaseResolver(modelo) {
     return class BaseResolver {
@@ -469,14 +468,14 @@ function BaseResolver(modelo) {
                 // ) {
                 // 	IdEmpresa = await this.receptor.buscarEmpresa();
                 // }
-                let nkey = `${universo ? universo : 'pro'}:${IdEmpresa}:${modelo}:${(0, getModelId_1.getModelId)(item)}`;
+                let nkey = `${universo ? universo : 'pro'}:${IdEmpresa}:${modelo}:${item.id}`;
                 let pkey = (id) => `${universo ? universo : 'pro'}:${IdEmpresa}:${planeta}:${id}`;
                 const { resultado, cache } = await (0, cachear_1.cachear)(cacheable, this.cacheManager, (0, keyInterface_1.transformarKey)({
                     universo,
                     IdEmpresa,
                     tipo,
                     fragmentos: [
-                        { nombre: modelo, id: (0, getModelId_1.getModelId)(item) },
+                        { nombre: modelo, id: item.id },
                         { nombre: planeta },
                     ],
                 }), (cache) => Promise.resolve(cache.map((n) => new Clase(JSON.parse(n)))), //Revisar
@@ -507,7 +506,7 @@ function BaseResolver(modelo) {
                     }
                 }), //observar
                 (__, resultado) => {
-                    return Promise.all(resultado.map((n) => this.redis.hSet(pkey((0, getModelId_1.getModelId)(n)), 'item', JSON.stringify(n)))).then(() => this.redis.hSet(nkey, planeta, JSON.stringify(resultado.map((n) => (0, getModelId_1.getModelId)(n)))));
+                    return Promise.all(resultado.map((n) => this.redis.hSet(pkey(n.id), 'item', JSON.stringify(n)))).then(() => this.redis.hSet(nkey, planeta, JSON.stringify(resultado.map((n) => n.id))));
                 });
                 await (0, paginar_1.paginar)(this.cacheManager, IdEmpresa, pagina, planeta, resultado.map((n) => n.get({ plain: true })));
                 // if (isDev)

package/prototipos/baseService.js

@@ -128,31 +128,59 @@ function BaseService(modelo) {
                         ...key,
                         include,
                         where,
-                    }), (cache) => Promise.resolve(cache.map((n) => new repository.sequelize.models[(0, lodash_1.capitalize)(modelo)](JSON.parse(n)))), //Revisar
+                    }), (cache) => Promise.resolve(cache.map((n) => {
+                        const parsed = JSON.parse(n);
+                        console.log(`[OBISEY-NEST CACHE HIT] ${modelo}:`, {
+                            cached: parsed,
+                            modelName: (0, lodash_1.capitalize)(modelo),
+                        });
+                        const instance = new repository.sequelize.models[(0, lodash_1.capitalize)(modelo)](parsed);
+                        console.log(`[OBISEY-NEST DESERIALIZED] ${modelo}:`, {
+                            id: instance.id,
+                            hasId: 'id' in instance,
+                        });
+                        return instance;
+                    })), //Revisar
                     (resultado) => Promise.resolve(resultado.map((n) => n.get({ plain: true }))), //transformar
                     () => new Promise((resolve) => {
                         resolve(repository.findAll(value)); //Pedir
                     }), () => new Promise(async (resolve) => {
+                        console.log(`[OBSERVAR-START] ${modelo}: checking Redis for nkey=${nkey.substring(0, 50)}`);
                         let e = await this.redis.hExists(nkey, peticion);
+                        console.log(`[OBSERVAR-EXISTS] ${modelo}: exists=${e}`);
                         if (e) {
                             let ids = await this.redis.hGet(nkey, peticion);
+                            console.log(`[OBSERVAR-IDS] ${modelo}: ids from Redis = ${ids ? ids.substring(0, 60) : 'undefined'}`);
                             if (ids) {
                                 Promise.all(JSON.parse(ids).map(async (id) => await this.redis.hExists(pkey(id), 'item'))).then((exists) => {
                                     if (!exists.includes(0)) {
-                                        Promise.all(JSON.parse(ids).map(async (id) => await this.redis.hGet(pkey(id), 'item'))).then(resolve);
+                                        console.log(`[OBSERVAR-ALL-EXIST] ${modelo}: all items exist, fetching from Redis`);
+                                        Promise.all(JSON.parse(ids).map(async (id) => await this.redis.hGet(pkey(id), 'item'))).then(items => {
+                                            console.log(`[OBSERVAR-RESOLVE-ITEMS] ${modelo}: resolving ${items.length} items from Redis`);
+                                            resolve(items);
+                                        });
                                     }
-                                    else
+                                    else {
+                                        console.log(`[OBSERVAR-INCOMPLETE] ${modelo}: some items missing in Redis, fallback to DB`);
                                         resolve(undefined);
+                                    }
                                 });
                             }
-                            else
+                            else {
+                                console.log(`[OBSERVAR-NO-IDS] ${modelo}: no IDs in Redis, fallback to DB`);
                                 resolve(undefined);
+                            }
                         }
-                        else
+                        else {
+                            console.log(`[OBSERVAR-NOT-EXISTS] ${modelo}: nkey not in Redis, fallback to DB`);
                             resolve(undefined);
+                        }
                     }), //observar
                     (__, resultado) => {
-                        return this.redis.hSet(nkey, peticion, JSON.stringify(resultado.map((n) => (0, getModelId_1.getModelId)(n))));
+                        console.log(`[ACTUALIZAR-START] ${modelo}: saving ${resultado.length} items to Redis`);
+                        const idsToSave = resultado.map((n) => (0, getModelId_1.getModelId)(n));
+                        console.log(`[ACTUALIZAR-IDS] ${modelo}: IDs=[${idsToSave}]`);
+                        return this.redis.hSet(nkey, peticion, JSON.stringify(idsToSave));
                     });
                     await (0, paginar_1.paginar)(this.cacheManager, key.IdEmpresa, pagina, modelo, resultado.map((n) => n.get({ plain: true })));
                     // if (isDev)
@@ -161,6 +189,7 @@ function BaseService(modelo) {
                     // 		'paginacion',
                     // 		cache,
                     // 	);
+                    console.log(`[BUSCAR-TODOS-RESULT] modelo=${modelo} items=${resultado.length} cache=${cache}`);
                     resolve(resultado ? resultado : []);
                 }
                 catch (err) {

package/prototipos/utils/activarRedis.d.ts

@@ -1 +1 @@
-export declare function onRedis(datos: any, si?: boolean): any;
+export declare function onRedis(datos: any, si?: boolean): boolean;

package/prototipos/utils/formarInclude.d.ts

@@ -1,4 +1,4 @@
-export declare const formarInclude: (include: any, mapa: any, tipo: any, conexion: any, required?: boolean) => Promise<any>;
+export declare const formarInclude: (include: any, mapa: any, tipo: any, conexion: any, required?: boolean) => any;
 declare class FilterBasic {
     is: string;
 }

package/prototipos/utils/formarwhere.d.ts

@@ -1 +1 @@
-export declare const formarWhere: (where: any) => any;
+export declare const formarWhere: (where: any) => {};