test-entity-library-asm 3.9.37 → 3.9.38

package/dist/entities/Local.d.ts

@@ -1,4 +1,4 @@
-import { DiscountCodeUser, Gallery, LocalDecorationReserve, LocalPaymentMethod, LocalPlan, LocalReserveStatus, LocalTable, LocalTableZone, PosSystem, ReceiptConfig, RequestInvoice, RequestLocal } from "..";
+import { DiscountCodeUser, Gallery, LocalDecorationReserve, LocalPaymentMethod, LocalPlan, LocalReserveStatus, LocalTable, LocalTableZone, Master, PosSystem, ReceiptConfig, RequestInvoice, RequestLocal } from "..";
 import { BusinessTypeProduct } from "./BusinessTypeProduct";
 import { Category } from "./Category";
 import { City } from "./City";
@@ -10,6 +10,7 @@ import { Square } from "./Square";
 import { User } from "./User";
 export declare class Local {
     id: number;
+    code: string;
     company: Company;
     name: string;
     city: City;
@@ -19,8 +20,8 @@ export declare class Local {
     details: any | null;
     changes: any | null;
     created: Date;
-    updated: Date;
-    updated_by: Partner;
+    updated: Date | null;
+    updated_by: Partner | null;
     square: Square;
     pos_system: PosSystem;
     pos_system_settings: any | null;
@@ -29,6 +30,9 @@ export declare class Local {
     contact_details: any | null;
     review_status: number;
     operation_type: number;
+    reviewed_by: Master | null;
+    review_date: Date | null;
+    review_comments: string | null;
     locals_partners: Partner[];
     requests_local: RequestLocal[];
     categories: Category[];

package/dist/entities/Local.js

@@ -32,6 +32,15 @@ __decorate([
     }),
     __metadata("design:type", Number)
 ], Local.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        length: 10,
+        type: "varchar",
+        unique: true,
+        comment: "Código único de 10 caracteres por cada registro.",
+    }),
+    __metadata("design:type", String)
+], Local.prototype, "code", void 0);
 __decorate([
     (0, typeorm_1.ManyToOne)(() => Company_1.Company, (company) => company.locals, {
         onDelete: "CASCADE",
@@ -91,18 +100,20 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)({
         type: "datetime",
-        default: () => "CURRENT_TIMESTAMP",
         onUpdate: "CURRENT_TIMESTAMP",
+        nullable: true,
+        default: null,
     }),
-    __metadata("design:type", Date)
+    __metadata("design:type", Object)
 ], Local.prototype, "updated", void 0);
 __decorate([
     (0, typeorm_1.ManyToOne)(() => Partner_1.Partner, (partner) => partner.locals, {
         onDelete: "NO ACTION",
         onUpdate: "NO ACTION",
+        nullable: true,
     }),
     (0, typeorm_1.JoinColumn)({ name: "updated_by" }),
-    __metadata("design:type", Partner_1.Partner)
+    __metadata("design:type", Object)
 ], Local.prototype, "updated_by", void 0);
 __decorate([
     (0, typeorm_1.ManyToOne)(() => Square_1.Square, (square) => square.locals, {
@@ -177,6 +188,28 @@ __decorate([
     }),
     __metadata("design:type", Number)
 ], Local.prototype, "operation_type", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => __1.Master, (master) => master.locals_reviewed, {
+        onDelete: "NO ACTION",
+        onUpdate: "NO ACTION",
+        nullable: true,
+    }),
+    (0, typeorm_1.JoinColumn)({ name: "reviewed_by" }),
+    __metadata("design:type", Object)
+], Local.prototype, "reviewed_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "datetime",
+        nullable: true,
+        default: null,
+        comment: "Fecha de revisión de los cambios realizados por el usuario.",
+    }),
+    __metadata("design:type", Object)
+], Local.prototype, "review_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 300, nullable: true, default: null }),
+    __metadata("design:type", Object)
+], Local.prototype, "review_comments", void 0);
 __decorate([
     (0, typeorm_1.ManyToMany)(() => Partner_1.Partner, (partner) => partner.locals_partner),
     (0, typeorm_1.JoinTable)({

package/dist/entities/Master.d.ts

@@ -1,4 +1,4 @@
-import { MasterNotification, MasterSession, PartnerNotification, VerifyLocal } from "..";
+import { Local, MasterNotification, MasterSession, PartnerNotification, VerifyLocal } from "..";
 import { City } from "./City";
 import { DiscountCodeCompany } from "./DiscountCodeCompany";
 import { MasterRole } from "./MasterRole";
@@ -26,4 +26,5 @@ export declare class Master {
     masters_to_notification: MasterNotification[];
     masters_notification: PartnerNotification[];
     masters_session: MasterSession[];
+    locals_reviewed: Local[];
 }

package/dist/entities/Master.js

@@ -207,6 +207,10 @@ __decorate([
     (0, typeorm_1.OneToMany)(() => __1.MasterSession, (MasterSession) => MasterSession.master),
     __metadata("design:type", Array)
 ], Master.prototype, "masters_session", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(() => __1.Local, (local) => local.reviewed_by),
+    __metadata("design:type", Array)
+], Master.prototype, "locals_reviewed", void 0);
 exports.Master = Master = __decorate([
     (0, typeorm_1.Entity)({
         comment: "Tabla agregada para los usuarios qué son administradores de la plataforma.",

package/dist/filters/LocalsCompanyInformationForTheTable.d.ts

@@ -1,6 +1,6 @@
 import { Repository } from "typeorm";
 import { IBasicCompany } from "../interfaces";
-export declare function getLocalsCompanyInformation(repository: Repository<any>, { company, status, visible, lazyEvent }: IBasicCompany): Promise<{
+export declare function getLocalsCompanyInformation(repository: Repository<any>, { company, status, visible, lazyEvent, filter_visualization, }: IBasicCompany): Promise<{
     data: any[];
     totalRecords: number;
 }>;

package/dist/filters/LocalsCompanyInformationForTheTable.js

@@ -1,11 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocalsCompanyInformation = void 0;
-// import { getTimeZone, getTimezoneOffset } from "..";
-async function getLocalsCompanyInformation(repository, { company, status, visible, lazyEvent }) {
+async function getLocalsCompanyInformation(repository, { company, status, visible, lazyEvent, filter_visualization = "no-in-review-rejected", }) {
     try {
-        // const timezone = getTimezoneOffset(getTimeZone());
-        console.log(lazyEvent, "LazyEvent en el filtro");
         const queryBuilder = repository
             .createQueryBuilder("locals_company_information_for_the_table")
             .skip(lazyEvent.first)
@@ -33,6 +30,15 @@ async function getLocalsCompanyInformation(repository, { company, status, visibl
                 visible,
             });
         }
+        // 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 === "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 === "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) => {

package/dist/interfaces.d.ts

@@ -28,6 +28,7 @@ export interface IBasicCompany extends IBasicLazyEvent {
     company: number | null;
     visible?: number | null;
     owner?: number | null;
+    filter_visualization: TLocalsCompanyTypeVisualization;
 }
 export interface IPropsQueryVerifyLocalInformation extends IPropsQueryVerifyLocal {
     partner: number | null;
@@ -64,4 +65,5 @@ export interface IPropsLocalReserve {
     status: number | null;
     local: number | null;
 }
+export type TLocalsCompanyTypeVisualization = "in-review-rejected" | "no-in-review-rejected";
 export type IType = "mysql" | "mariadb";

package/dist/views/LocalsCompanyInformationForTheTable.d.ts

@@ -1,5 +1,6 @@
 export declare class LocalsCompanyInformationForTheTable {
     id: number;
+    code: string;
     company: number;
     name: string;
     city: number;
@@ -9,8 +10,8 @@ export declare class LocalsCompanyInformationForTheTable {
     details: any | null;
     changes: any | null;
     created: Date;
-    updated: Date;
-    updated_by: number;
+    updated: Date | null;
+    updated_by: number | null;
     square: number | null;
     pos_system: number;
     pos_system_settings: any | null;
@@ -19,6 +20,9 @@ export declare class LocalsCompanyInformationForTheTable {
     contact_details: any | null;
     review_status: number;
     operation_type: number;
+    reviewed_by: number | null;
+    review_date: Date | null;
+    review_comments: string;
     type_local: string;
     address_local: string;
     company_id: number;
@@ -65,6 +69,21 @@ export declare class LocalsCompanyInformationForTheTable {
     partner_visible: number;
     partner_created: Date;
     partner_updated: Date;
+    master_reviewed_id: number;
+    master_reviewed_code: string;
+    master_reviewed_document: string | null;
+    master_reviewed_name: string;
+    master_reviewed_surname: string;
+    master_reviewed_full_name: string;
+    master_reviewed_email: string;
+    master_reviewed_phone: string | null;
+    master_reviewed_city: number;
+    master_reviewed_address: string | null;
+    master_reviewed_profile: any | null;
+    master_reviewed_created: Date;
+    master_reviewed_updated: Date | null;
+    master_reviewed_status: number;
+    master_reviewed_visible: number;
     square_id: number;
     square_details: any | null;
     square_email: string | null;

package/dist/views/LocalsCompanyInformationForTheTable.js

@@ -30,6 +30,10 @@ __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Number)
 ], LocalsCompanyInformationForTheTable.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], LocalsCompanyInformationForTheTable.prototype, "code", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Number)
@@ -68,11 +72,11 @@ __decorate([
 ], LocalsCompanyInformationForTheTable.prototype, "created", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", Date)
+    __metadata("design:type", Object)
 ], LocalsCompanyInformationForTheTable.prototype, "updated", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", Number)
+    __metadata("design:type", Object)
 ], LocalsCompanyInformationForTheTable.prototype, "updated_by", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
@@ -106,6 +110,18 @@ __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Number)
 ], LocalsCompanyInformationForTheTable.prototype, "operation_type", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Object)
+], LocalsCompanyInformationForTheTable.prototype, "reviewed_by", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Object)
+], LocalsCompanyInformationForTheTable.prototype, "review_date", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], LocalsCompanyInformationForTheTable.prototype, "review_comments", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", String)
@@ -290,6 +306,66 @@ __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Date)
 ], LocalsCompanyInformationForTheTable.prototype, "partner_updated", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Number)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_id", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_code", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Object)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_document", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_name", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_surname", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_full_name", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_email", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Object)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_phone", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Number)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_city", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Object)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_address", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)({ transformer: jsonTransformer }),
+    __metadata("design:type", Object)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_profile", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Date)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_created", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Object)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_updated", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Number)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_status", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Number)
+], LocalsCompanyInformationForTheTable.prototype, "master_reviewed_visible", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Number)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "test-entity-library-asm",
-  "version": "3.9.37",
+  "version": "3.9.38",
   "description": "Entidades de ejemplo para una base de datos",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/entities/Local.ts

@@ -17,6 +17,7 @@ import {
   LocalReserveStatus,
   LocalTable,
   LocalTableZone,
+  Master,
   PosSystem,
   ReceiptConfig,
   RequestInvoice,
@@ -41,6 +42,14 @@ export class Local {
   })
   id: number;
 
+  @Column({
+    length: 10,
+    type: "varchar",
+    unique: true,
+    comment: "Código único de 10 caracteres por cada registro.",
+  })
+  code: string;
+
   @ManyToOne(() => Company, (company) => company.locals, {
     onDelete: "CASCADE",
     onUpdate: "NO ACTION",
@@ -92,17 +101,19 @@ export class Local {
 
   @Column({
     type: "datetime",
-    default: () => "CURRENT_TIMESTAMP",
     onUpdate: "CURRENT_TIMESTAMP",
+    nullable: true,
+    default: null,
   })
-  updated: Date;
+  updated: Date | null;
 
   @ManyToOne(() => Partner, (partner) => partner.locals, {
     onDelete: "NO ACTION",
     onUpdate: "NO ACTION",
+    nullable: true,
   })
   @JoinColumn({ name: "updated_by" })
-  updated_by: Partner;
+  updated_by: Partner | null;
 
   @ManyToOne(() => Square, (square) => square.locals, {
     onDelete: "RESTRICT",
@@ -174,6 +185,25 @@ export class Local {
   })
   operation_type: number;
 
+  @ManyToOne(() => Master, (master) => master.locals_reviewed, {
+    onDelete: "NO ACTION",
+    onUpdate: "NO ACTION",
+    nullable: true,
+  })
+  @JoinColumn({ name: "reviewed_by" })
+  reviewed_by: Master | null;
+
+  @Column({
+    type: "datetime",
+    nullable: true,
+    default: null,
+    comment: "Fecha de revisión de los cambios realizados por el usuario.",
+  })
+  review_date: Date | null;
+
+  @Column({ type: "varchar", length: 300, nullable: true, default: null })
+  review_comments: string | null;
+
   @ManyToMany(() => Partner, (partner) => partner.locals_partner)
   @JoinTable({
     name: "local_partner",

package/src/entities/Master.ts

@@ -9,6 +9,7 @@ import {
   PrimaryGeneratedColumn,
 } from "typeorm";
 import {
+  Local,
   MasterNotification,
   MasterSession,
   PartnerNotification,
@@ -203,4 +204,7 @@ export class Master {
 
   @OneToMany(() => MasterSession, (MasterSession) => MasterSession.master)
   masters_session: MasterSession[];
+
+  @OneToMany(() => Local, (local) => local.reviewed_by)
+  locals_reviewed: Local[];
 }

package/src/filters/LocalsCompanyInformationForTheTable.ts

@@ -1,15 +1,17 @@
 import { Repository } from "typeorm";
 import { IBasicCompany } from "../interfaces";
-// import { getTimeZone, getTimezoneOffset } from "..";
 
 export async function getLocalsCompanyInformation(
   repository: Repository<any>,
-  { company, status, visible, lazyEvent }: IBasicCompany,
+  {
+    company,
+    status,
+    visible,
+    lazyEvent,
+    filter_visualization = "no-in-review-rejected",
+  }: IBasicCompany,
 ) {
   try {
-    // const timezone = getTimezoneOffset(getTimeZone());
-    console.log(lazyEvent, "LazyEvent en el filtro");
-
     const queryBuilder = repository
       .createQueryBuilder("locals_company_information_for_the_table")
       .skip(lazyEvent.first)
@@ -56,6 +58,19 @@ export async function getLocalsCompanyInformation(
       );
     }
 
+    // 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 === "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 === "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) => {

package/src/interfaces.ts

@@ -32,10 +32,10 @@ export interface IBasicCompany extends IBasicLazyEvent {
   company: number | null;
   visible?: number | null;
   owner?: number | null;
+  filter_visualization: TLocalsCompanyTypeVisualization;
 }
 
-export interface IPropsQueryVerifyLocalInformation
-  extends IPropsQueryVerifyLocal {
+export interface IPropsQueryVerifyLocalInformation extends IPropsQueryVerifyLocal {
   partner: number | null;
   assigned_master: number | null;
 }
@@ -76,4 +76,8 @@ export interface IPropsLocalReserve {
   local: number | null;
 }
 
+export type TLocalsCompanyTypeVisualization =
+  | "in-review-rejected"
+  | "no-in-review-rejected";
+
 export type IType = "mysql" | "mariadb";

package/src/views/LocalsCompanyInformationForTheTable.ts

@@ -19,6 +19,9 @@ export class LocalsCompanyInformationForTheTable {
   @ViewColumn()
   id: number;
 
+  @ViewColumn()
+  code: string;
+
   @ViewColumn()
   company: number;
 
@@ -47,10 +50,10 @@ export class LocalsCompanyInformationForTheTable {
   created: Date;
 
   @ViewColumn()
-  updated: Date;
+  updated: Date | null;
 
   @ViewColumn()
-  updated_by: number;
+  updated_by: number | null;
 
   @ViewColumn()
   square: number | null;
@@ -76,6 +79,15 @@ export class LocalsCompanyInformationForTheTable {
   @ViewColumn()
   operation_type: number;
 
+  @ViewColumn()
+  reviewed_by: number | null;
+
+  @ViewColumn()
+  review_date: Date | null;
+
+  @ViewColumn()
+  review_comments: string;
+
   @ViewColumn()
   type_local: string;
 
@@ -214,6 +226,51 @@ export class LocalsCompanyInformationForTheTable {
   @ViewColumn()
   partner_updated: Date;
 
+  @ViewColumn()
+  master_reviewed_id: number;
+
+  @ViewColumn()
+  master_reviewed_code: string;
+
+  @ViewColumn()
+  master_reviewed_document: string | null;
+
+  @ViewColumn()
+  master_reviewed_name: string;
+
+  @ViewColumn()
+  master_reviewed_surname: string;
+
+  @ViewColumn()
+  master_reviewed_full_name: string;
+
+  @ViewColumn()
+  master_reviewed_email: string;
+
+  @ViewColumn()
+  master_reviewed_phone: string | null;
+
+  @ViewColumn()
+  master_reviewed_city: number;
+
+  @ViewColumn()
+  master_reviewed_address: string | null;
+
+  @ViewColumn({ transformer: jsonTransformer })
+  master_reviewed_profile: any | null;
+
+  @ViewColumn()
+  master_reviewed_created: Date;
+
+  @ViewColumn()
+  master_reviewed_updated: Date | null;
+
+  @ViewColumn()
+  master_reviewed_status: number;
+
+  @ViewColumn()
+  master_reviewed_visible: number;
+
   @ViewColumn()
   square_id: number;