test-entity-library-asm 3.9.56 → 3.9.58

package/src/entities/MasterNotification.ts

@@ -8,7 +8,6 @@ import {
   PrimaryGeneratedColumn,
 } from "typeorm";
 import { Master, Partner } from "..";
-import { jsonTransformer } from "../transformers/jsonTransformer";
 
 @Entity("master_notification", {
   comment:
@@ -54,10 +53,9 @@ export class MasterNotification {
   description: string | null;
 
   @Column({
-    type: "text",
+    type: "json",
     nullable: true,
     default: null,
-    transformer: jsonTransformer,
     comment:
       "Configuración adicional de la notificación, como enlaces, qué hace después de darle click...",
   })

package/src/entities/Partner.ts

@@ -28,7 +28,6 @@ import {
   RequestPrint,
   VerifyLocal,
 } from "..";
-import { jsonTransformer } from "../transformers/jsonTransformer";
 import { City } from "./City";
 import { Company } from "./Company";
 import { DiscountCodeUser } from "./DiscountCodeUser";
@@ -134,10 +133,9 @@ export class Partner {
   google_id: string | null;
 
   @Column({
-    type: "longtext",
+    type: "json",
     nullable: true,
     default: null,
-    transformer: jsonTransformer,
     comment:
       "Campo de tipo JSON donde se guarda información necesaria para el registro.",
   })

package/src/entities/PartnerNotification.ts

@@ -8,7 +8,6 @@ import {
   PrimaryGeneratedColumn,
 } from "typeorm";
 import { Partner } from "./Partner";
-import { jsonTransformer } from "../transformers/jsonTransformer";
 import { Master } from "./Master";
 
 @Entity("partner_notification", {
@@ -54,10 +53,9 @@ export class PartnerNotification {
   description: string | null;
 
   @Column({
-    type: "text",
+    type: "json",
     nullable: true,
     default: null,
-    transformer: jsonTransformer,
     comment:
       "Configuración adicional de la notificación, como enlaces, qué hace después de darle click...",
   })

package/src/entities/PaymentMethod.ts

@@ -12,7 +12,6 @@ import {
   RequestLocalPayment,
 } from "..";
 import { Local } from "./Local";
-import { jsonTransformer } from "../transformers/jsonTransformer";
 
 @Entity("payment_method", {
   comment:
@@ -44,8 +43,7 @@ export class PaymentMethod {
   description: string | null;
 
   @Column({
-    type: "longtext",
-    transformer: jsonTransformer,
+    type: "json",
     nullable: true,
     default: null,
     comment:

package/src/entities/Plan.ts

@@ -7,7 +7,6 @@ import {
   PrimaryGeneratedColumn,
 } from "typeorm";
 import { LocalPlan } from "..";
-import { jsonTransformer } from "../transformers/jsonTransformer";
 import { Company } from "./Company";
 
 @Entity({
@@ -44,8 +43,7 @@ export class Plan {
   name: string;
 
   @Column({
-    type: "mediumtext",
-    transformer: jsonTransformer,
+    type: "json",
     nullable: true,
     default: null,
     comment:

package/src/entities/Square.ts

@@ -11,7 +11,6 @@ import {
 import { City } from "./City";
 import { Local } from "./Local";
 import { User } from "./User";
-import { jsonTransformer } from "../transformers/jsonTransformer";
 
 @Entity({
   comment:
@@ -66,10 +65,9 @@ export class Square {
   longitude: number;
 
   @Column({
-    type: "mediumtext",
+    type: "json",
     nullable: true,
     default: null,
-    transformer: jsonTransformer,
     comment:
       "Campo de tipo JSON por si se llega a necesitar agregar otras columnas para las plazoletas de los centros comerciales.",
   })

package/src/entities/User.ts

@@ -15,7 +15,6 @@ import {
   RequestLocalPayment,
   UserPaymentMethod,
 } from "..";
-import { jsonTransformer } from "../transformers/jsonTransformer";
 import { City } from "./City";
 import { CodeRedemptionHistoryUser } from "./CodeRedemptionHistoryUser";
 import { Local } from "./Local";
@@ -88,10 +87,9 @@ export class User {
   password: string;
 
   @Column({
-    type: "longtext",
+    type: "json",
     nullable: true,
     default: null,
-    transformer: jsonTransformer,
     comment:
       "Campo de tipo JSON donde se guarda información necesaria para el registro.",
   })

package/src/filters/LocalsCompanyInformationForTheTable.ts

@@ -3,13 +3,7 @@ import { IBasicCompany } from "../interfaces";
 
 export async function getLocalsCompanyInformationTable(
   repository: Repository<any>,
-  {
-    company,
-    status,
-    visible,
-    lazyEvent,
-    filter_visualization = 2, // "no-in-review-rejected"
-  }: IBasicCompany,
+  { company, status, visible, lazyEvent }: IBasicCompany,
 ) {
   try {
     const queryBuilder = repository
@@ -23,7 +17,7 @@ export async function getLocalsCompanyInformationTable(
         "global"
       ].value.toLowerCase()}%`;
       queryBuilder.andWhere(
-        "(LOWER(locals_company_information_for_the_table.name) LIKE :globalValue OR LOWER(locals_company_information_for_the_table.address) LIKE :globalValue OR LOWER(locals_company_information_for_the_table.partner_name) LIKE :globalValue OR LOWER(locals_company_information_for_the_table.partner_surname) LIKE :globalValue OR LOWER(locals_company_information_for_the_table.partner_full_name) LIKE :globalValue OR locals_company_information_for_the_table.partner_full_name LIKE :globalValue",
+        "(LOWER(locals_company_information_for_the_table.name) LIKE :globalValue OR LOWER(locals_company_information_for_the_table.address) LIKE :globalValue OR LOWER(locals_company_information_for_the_table.partner_name) LIKE :globalValue OR LOWER(locals_company_information_for_the_table.partner_surname) LIKE :globalValue OR LOWER(locals_company_information_for_the_table.partner_full_name) LIKE :globalValue OR locals_company_information_for_the_table.partner_full_name LIKE :globalValue)",
         { globalValue },
       );
     }
@@ -58,21 +52,6 @@ export async function getLocalsCompanyInformationTable(
       );
     }
 
-    // DOC: la columna filter_visualization se utiliza para aplicar el filtro review_status y operation_type.
-    // DOC: Si filter_visualization es "in-review-rejected", se muestran los locales que están en revisión o rechazados, es decir, review_status = 1 o 3 y operation_type = 1 o 2.
-    // DOC: Si filter_visualization es "no-in-review-rejected", se muestran los locales que no están en revisión ni rechazados, es decir, review_status es null y operation_type es null.
-    if (filter_visualization === 1) {
-      // "in-review-rejected"
-      queryBuilder.andWhere(
-        "(locals_company_information_for_the_table.review_status IN (1, 3) AND locals_company_information_for_the_table.operation_type IN (1, 2))",
-      );
-    } else if (filter_visualization === 2) {
-      // "no-in-review-rejected"
-      queryBuilder.andWhere(
-        "(locals_company_information_for_the_table.review_status IS NULL AND locals_company_information_for_the_table.operation_type IS NULL)",
-      );
-    }
-
     // DOC: Acá vienen los otros filtros, por las columnas de la tabla.
     const filters = lazyEvent.filters;
     Object.keys(filters).forEach((key) => {
@@ -97,6 +76,66 @@ export async function getLocalsCompanyInformationTable(
         switch (
           matchMode // DOC: Verificamos el modo de coincidencia del filtro.
         ) {
+          case "custom":
+            // 📌 Filtro por created / updated (rango de fechas en UTC)
+            if (key === "created" || key === "updated") {
+              if (Array.isArray(value) && value.length === 2) {
+                const [from, to] = value;
+
+                if (from !== null && to === null) {
+                  queryBuilder.andWhere(`${accessKey} >= :from`, {
+                    from: new Date(from),
+                  });
+                } else if (from === null && to !== null) {
+                  queryBuilder.andWhere(`${accessKey} <= :to`, {
+                    to: new Date(to),
+                  });
+                } else if (from !== null && to !== null) {
+                  queryBuilder.andWhere(`${accessKey} BETWEEN :from AND :to`, {
+                    from: new Date(from),
+                    to: new Date(to),
+                  });
+                }
+              }
+            }
+
+            // 📌 Filtro por created_by (array de ids)
+            if (key === "created_by") {
+              if (Array.isArray(value) && value.length > 0) {
+                queryBuilder.andWhere(`${accessKey} IN (:...${key})`, {
+                  [key]: value,
+                });
+              }
+            }
+
+            // 📌 Filtro por updated_by (array de ids)
+            if (key === "updated_by") {
+              if (Array.isArray(value) && value.length > 0) {
+                queryBuilder.andWhere(`${accessKey} IN (:...${key})`, {
+                  [key]: value,
+                });
+              }
+            }
+
+            // 📌 Filtro por total_requests / average_rating (rango numérico)
+            if (key === "total_requests" || key === "average_rating") {
+              if (Array.isArray(value) && value.length === 2) {
+                const [from, to] = value;
+
+                if (from !== null && to === null) {
+                  queryBuilder.andWhere(`${accessKey} >= :from`, { from });
+                } else if (from === null && to !== null) {
+                  queryBuilder.andWhere(`${accessKey} <= :to`, { to });
+                } else if (from !== null && to !== null) {
+                  queryBuilder.andWhere(`${accessKey} BETWEEN :from AND :to`, {
+                    from,
+                    to,
+                  });
+                }
+              }
+            }
+
+            break;
           case "contains": // DOC: Si el modo de coincidencia es "contains".
             queryBuilder.andWhere(`LOWER(${accessKey}) LIKE :${key}`, {
               [key]: `%${value}%`,
@@ -211,6 +250,10 @@ export async function getLocalsCompanyInformationTable(
     // DOC: Ejecutamos la consulta y obtenemos los resultados.
     const [data, totalRecords] = await queryBuilder.getManyAndCount();
 
+    // DOC: Si quieres ver la consulta generada, puedes descomentar las siguientes líneas:
+    // console.log("Query:", queryBuilder.getQuery());
+    // console.log("Query:", queryBuilder.getQueryAndParameters());
+
     return {
       data,
       totalRecords,

package/src/index.ts

@@ -3,6 +3,15 @@ import { config } from "dotenv";
 import { NextFunction, Request, Response } from "express";
 import { resolve } from "path";
 import { DataSource, EntityTarget, ObjectLiteral, Repository } from "typeorm";
+import * as EntitiesViewsRoutes from "./entities.index";
+import {
+  getDiscountsCodeCompanyInformation,
+  getDiscountsCodeUserInformation,
+  getLocalReservesInformation,
+  getLocalsCompanyInformation,
+  getLocalsCompanyInformationTable,
+  getVerifyLocalsInformation
+} from "./entities.views.routes";
 import {
   IBasicCompany,
   IBasicLazyEvent,
@@ -12,17 +21,7 @@ import {
   IType,
 } from "./interfaces";
 import moment = require("moment-timezone");
-import {
-  CustomRepository,
-  getDiscountsCodeCompanyInformation,
-  getDiscountsCodeUserInformation,
-  getLocalReservesInformation,
-  getLocalsCompanyInformation,
-  getLocalsCompanyInformationTable,
-  getVerifyLocalsInformation,
-} from "./entities.views.routes";
 export * from "./entities.views.routes";
-import * as EntitiesViewsRoutes from "./entities.index";
 
 const asyncLocalStorage = new AsyncLocalStorage<Map<string, string>>();
 

package/src/interfaces.ts

@@ -32,7 +32,6 @@ export interface IBasicCompany extends IBasicLazyEvent {
   company: number | null;
   visible?: number | null;
   owner?: number | null;
-  filter_visualization?: number | null;
 }
 
 export interface IPropsQueryVerifyLocalInformation extends IPropsQueryVerifyLocal {

package/src/views/DiscountsCodeUser.ts

@@ -1,19 +1,5 @@
 import { ViewColumn, ViewEntity } from "typeorm";
 
-// JSON Transformer
-const jsonTransformer = {
-  to: (value: any) => JSON.stringify(value),
-
-  from: (value: string) => {
-    try {
-      return JSON.parse(value);
-    } catch (error) {
-      console.log(error, "Transformer error");
-      return null;
-    }
-  },
-};
-
 @ViewEntity({
   name: "discounts_code_user",
 })
@@ -51,7 +37,7 @@ export class DiscountsCodeUser {
   @ViewColumn()
   expiration: string;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   repeat_days: any;
 
   @ViewColumn()
@@ -87,7 +73,7 @@ export class DiscountsCodeUser {
   @ViewColumn()
   partner_surname: string;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   partner_profile: any;
 
   @ViewColumn()

package/src/views/LocalReserves.ts

@@ -1,18 +1,5 @@
 import { ViewColumn, ViewEntity } from "typeorm";
 
-// JSON Transformer
-const jsonTransformer = {
-  to: (value: any) => JSON.stringify(value),
-  from: (value: string) => {
-    try {
-      return JSON.parse(value);
-    } catch (error) {
-      console.log(error, "Transformer error");
-      return null;
-    }
-  },
-};
-
 @ViewEntity({
   name: "local_reserves",
 })
@@ -176,7 +163,7 @@ export class LocalReserves {
   @ViewColumn()
   partner_email: string | null;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   partner_profile: any | null;
 
   @ViewColumn()
@@ -206,7 +193,7 @@ export class LocalReserves {
   @ViewColumn()
   user_table_phone: string | null;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   user_table_profile: any | null;
 
   @ViewColumn()

package/src/views/LocalsCompanyInformationForTheMap.ts

@@ -1,17 +1,5 @@
 import { ViewColumn, ViewEntity } from "typeorm";
 
-const jsonTransformer = {
-  to: (value: any) => JSON.stringify(value),
-  from: (value: string) => {
-    try {
-      return JSON.parse(value);
-    } catch (error) {
-      console.log(error, "Transformer error");
-      return null;
-    }
-  },
-};
-
 @ViewEntity({
   name: "locals_company_information_for_the_map",
 })
@@ -37,7 +25,7 @@ export class LocalsCompanyInformationForTheMap {
   @ViewColumn()
   longitude: number;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   details: any | null;
 
   @ViewColumn()
@@ -55,7 +43,7 @@ export class LocalsCompanyInformationForTheMap {
   @ViewColumn()
   pos_system: number;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   pos_system_settings: any | null;
 
   @ViewColumn()
@@ -64,7 +52,7 @@ export class LocalsCompanyInformationForTheMap {
   @ViewColumn()
   visible: number;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   contact_details: any | null;
 
   @ViewColumn()
@@ -76,13 +64,13 @@ export class LocalsCompanyInformationForTheMap {
   @ViewColumn()
   company_partner: number;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   company_profile: any | null;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   company_contact_details: any | null;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   company_settings: any | null;
 
   @ViewColumn()
@@ -121,7 +109,7 @@ export class LocalsCompanyInformationForTheMap {
   @ViewColumn()
   square_longitude: number;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   square_details: any | null;
 
   @ViewColumn()
@@ -166,13 +154,13 @@ export class LocalsCompanyInformationForTheMap {
   @ViewColumn()
   country_structure_phone: string;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   country_legal_information: any | null;
 
   @ViewColumn()
   country_legal_agent: string;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   country_details: any | null;
 
   @ViewColumn()
@@ -199,7 +187,7 @@ export class LocalsCompanyInformationForTheMap {
   @ViewColumn()
   partner_address: string;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   partner_profile: any | null;
 
   @ViewColumn()

package/src/views/LocalsCompanyInformationForTheTable.ts

@@ -1,17 +1,5 @@
 import { ViewColumn, ViewEntity } from "typeorm";
 
-const jsonTransformer = {
-  to: (value: any) => JSON.stringify(value),
-  from: (value: string) => {
-    try {
-      return JSON.parse(value);
-    } catch (error) {
-      console.log(error, "Transformer error");
-      return null;
-    }
-  },
-};
-
 @ViewEntity({
   name: "locals_company_information_for_the_table",
 })
@@ -40,7 +28,7 @@ export class LocalsCompanyInformationForTheTable {
   @ViewColumn()
   longitude: number;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   details: any | null;
 
   @ViewColumn()
@@ -61,7 +49,7 @@ export class LocalsCompanyInformationForTheTable {
   @ViewColumn()
   pos_system: number;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   pos_system_settings: any | null;
 
   @ViewColumn()
@@ -70,7 +58,7 @@ export class LocalsCompanyInformationForTheTable {
   @ViewColumn()
   visible: number;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   contact_details: any | null;
 
   @ViewColumn()
@@ -124,19 +112,19 @@ export class LocalsCompanyInformationForTheTable {
   @ViewColumn()
   company_partner: number;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   company_contact_details: any | null;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   company_profile: any | null;
 
   @ViewColumn()
-  company_legal_agent: string;
+  company_legal_agent: any | null;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   company_legal_information: any | null;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   company_settings: any | null;
 
   @ViewColumn()
@@ -175,13 +163,13 @@ export class LocalsCompanyInformationForTheTable {
   @ViewColumn()
   country_currency: string;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   country_details: any | null;
 
-  @ViewColumn({ transformer: jsonTransformer })
-  country_legal_agent: string | null;
+  @ViewColumn()
+  country_legal_agent: any | null;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   country_legal_information: any | null;
 
   @ViewColumn()
@@ -226,7 +214,7 @@ export class LocalsCompanyInformationForTheTable {
   @ViewColumn()
   created_by_address: string | null;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   created_by_profile: any | null;
 
   @ViewColumn()
@@ -274,7 +262,7 @@ export class LocalsCompanyInformationForTheTable {
   @ViewColumn()
   partner_address: string | null;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   partner_profile: any | null;
 
   @ViewColumn()
@@ -292,7 +280,7 @@ export class LocalsCompanyInformationForTheTable {
   @ViewColumn()
   square_id: number;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   square_details: any | null;
 
   @ViewColumn()
@@ -334,7 +322,7 @@ export class LocalsCompanyInformationForTheTable {
   @ViewColumn()
   local_plan_end_date: Date;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   local_plan_settings: any | null;
 
   @ViewColumn()
@@ -355,7 +343,7 @@ export class LocalsCompanyInformationForTheTable {
   @ViewColumn()
   plan_id: number;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   plan_description: any | null;
 
   @ViewColumn()

package/src/views/MasterNotifications.ts

@@ -1,11 +1,5 @@
 import { ViewEntity, ViewColumn } from "typeorm";
 
-// JSON Transformer
-const jsonTransformer = {
-  to: (value: any) => JSON.stringify(value),
-  from: (value: string) => JSON.parse(value),
-};
-
 @ViewEntity({
   name: "master_notifications",
 })
@@ -25,7 +19,7 @@ export class MasterNotifications {
   @ViewColumn()
   description: string;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   settings: any;
 
   @ViewColumn()
@@ -40,7 +34,7 @@ export class MasterNotifications {
   @ViewColumn()
   partner_surname: string;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   partner_profile: any;
 
   @ViewColumn()
@@ -67,7 +61,7 @@ export class MasterNotifications {
   @ViewColumn()
   master_phone: string;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   master_profile: any;
 
   @ViewColumn()
@@ -76,7 +70,7 @@ export class MasterNotifications {
   @ViewColumn()
   verify_local_id: number;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   verify_local_local_information: any;
 
   @ViewColumn()
@@ -91,7 +85,7 @@ export class MasterNotifications {
   @ViewColumn()
   company_name: string;
 
-  @ViewColumn({ transformer: jsonTransformer })
+  @ViewColumn()
   company_profile: any;
 
   @ViewColumn()