test-entity-library-asm 1.3.4 → 1.3.6

package/src/entities/ProductIngredient.ts

@@ -1,10 +1,9 @@
 import {
-  BaseEntity,
   Column,
   Entity,
   JoinColumn,
   ManyToOne,
-  PrimaryGeneratedColumn,
+  PrimaryGeneratedColumn
 } from 'typeorm'
 import { Product } from './Product'
 import { TypeMeasureIngredient } from './TypeMeasureIngredient'

package/src/entities/ProductTopping.ts

@@ -1,11 +1,10 @@
 import {
-  Entity,
   Column,
-  PrimaryGeneratedColumn,
-  ManyToOne,
+  Entity,
   JoinColumn,
+  ManyToOne,
   OneToMany,
-  BaseEntity,
+  PrimaryGeneratedColumn
 } from 'typeorm'
 import { Company } from './Company'
 import { ProductGroup } from './ProductGroup'

package/src/entities/Request.ts

@@ -1,5 +1,4 @@
 import {
-  BaseEntity,
   Column,
   Entity,
   JoinColumn,
@@ -7,14 +6,14 @@ import {
   ManyToMany,
   ManyToOne,
   OneToMany,
-  PrimaryGeneratedColumn,
+  PrimaryGeneratedColumn
 } from 'typeorm'
 import { Local } from './Local'
 import { PaymentMethod } from './PaymentMethod'
-import { RequestStatus } from './RequestStatus'
-import { User } from './User'
 import { RequestProduct } from './RequestProduct'
 import { RequestProductGroupComplement } from './RequestProductGroupComplement'
+import { RequestStatus } from './RequestStatus'
+import { User } from './User'
 
 @Entity({
   comment:

package/src/entities/RequestProduct.ts

@@ -1,10 +1,9 @@
 import {
-  BaseEntity,
   Column,
   Entity,
   JoinColumn,
   ManyToOne,
-  PrimaryGeneratedColumn,
+  PrimaryGeneratedColumn
 } from 'typeorm'
 import { Product } from './Product'
 import { Request } from './Request'

package/src/entities/RequestProductGroupComplement.ts

@@ -1,5 +1,4 @@
 import {
-  BaseEntity,
   Column,
   Entity,
   JoinColumn,

package/src/entities/RequestStatus.ts

@@ -1,9 +1,8 @@
 import {
-  BaseEntity,
   Column,
   Entity,
   OneToMany,
-  PrimaryGeneratedColumn,
+  PrimaryGeneratedColumn
 } from 'typeorm'
 import { Request } from './Request'
 

package/src/entities/Square.ts

@@ -1,9 +1,17 @@
-import { BaseEntity, Column, Entity, OneToMany, PrimaryColumn } from 'typeorm'
+import {
+  Column,
+  Entity,
+  JoinTable,
+  ManyToMany,
+  OneToMany,
+  PrimaryColumn,
+} from 'typeorm'
 import { Local } from './Local'
+import { User } from './User'
 
 @Entity({
   comment:
-    'Centros comerciales registrados/agregados a la plataforma. \n\nDel centro comercial es importante saber si tiene una plazoleta de comida.',
+    'Centros comerciales registrados/agregados a la plataforma.\r\n\r\nDel centro comercial es importante saber si tiene una plazoleta de comida.',
 })
 export class Square {
   @PrimaryColumn({
@@ -53,4 +61,10 @@ export class Square {
 
   @OneToMany(() => Local, (local) => local.square)
   locals: Local[]
+
+  @ManyToMany(() => User)
+  @JoinTable({
+    name: 'user_favorite_square',
+  })
+  users_favorite_square: User[]
 }

package/src/entities/Terminal.ts

@@ -11,6 +11,7 @@ import {
 import { User } from './User'
 import { TerminalSession } from './TerminalSession'
 import { Local } from './Local'
+import { Partner } from './Partner'
 
 @Entity({
   comment:
@@ -48,11 +49,11 @@ export class Terminal {
   })
   status: number
 
-  @ManyToMany(() => User)
+  @ManyToMany(() => Partner)
   @JoinTable({
-    name: 'user_terminal',
+    name: 'partner_terminal',
     joinColumn: {
-      name: 'user',
+      name: 'partner',
       referencedColumnName: 'id',
     },
     inverseJoinColumn: {
@@ -60,7 +61,7 @@ export class Terminal {
       referencedColumnName: 'id',
     },
   })
-  users: User[]
+  partners: Partner[]
 
   @OneToMany(() => TerminalSession, (terminalsUser) => terminalsUser.terminal)
   terminalsUser: TerminalSession[]

package/src/entities/TerminalSession.ts

@@ -1,5 +1,4 @@
 import {
-  BaseEntity,
   Column,
   Entity,
   JoinColumn,
@@ -8,6 +7,7 @@ import {
 } from 'typeorm'
 import { Terminal } from './Terminal'
 import { User } from './User'
+import { Partner } from './Partner'
 
 @Entity('terminal_session', {
   comment:
@@ -19,13 +19,13 @@ export class TerminalSession {
   })
   id: number
 
-  @ManyToOne(() => User, (user) => user.terminalUsers, {
+  @ManyToOne(() => Partner, (partner) => partner.sessions, {
     nullable: true,
     onDelete: 'CASCADE',
     onUpdate: 'NO ACTION',
   })
   @JoinColumn({ name: 'user' })
-  user: User
+  partner: Partner
 
   @ManyToOne(() => Terminal, (terminal) => terminal.terminalsUser, {
     nullable: true,

package/src/entities/TypeFood.ts

@@ -1,10 +1,9 @@
 import {
-  Entity,
   Column,
-  PrimaryGeneratedColumn,
-  ManyToMany,
+  Entity,
   JoinTable,
-  BaseEntity,
+  ManyToMany,
+  PrimaryGeneratedColumn
 } from 'typeorm'
 import { Company } from './Company'
 

package/src/entities/TypeMeasureIngredient.ts

@@ -1,9 +1,8 @@
 import {
-  BaseEntity,
   Column,
   Entity,
   OneToMany,
-  PrimaryGeneratedColumn,
+  PrimaryGeneratedColumn
 } from 'typeorm'
 import { ProductIngredient } from './ProductIngredient'
 

package/src/entities/User.ts

@@ -1,5 +1,4 @@
 import {
-  BaseEntity,
   Column,
   Entity,
   JoinColumn,
@@ -11,18 +10,15 @@ import {
 } from 'typeorm'
 import { City } from './City'
 import { CodeRedemptionHistoryUser } from './CodeRedemptionHistoryUser'
-import { Company } from './Company'
-import { DiscountCodeCompany } from './DiscountCodeCompany'
-import { DiscountCodeUser } from './DiscountCodeUser'
-import { Local } from './Local'
 import { LocalQualification } from './LocalQualification'
-import { Master } from './Master'
-import { Plan } from './Plan'
 import { Request } from './Request'
 import { RequestProduct } from './RequestProduct'
 import { RequestProductGroupComplement } from './RequestProductGroupComplement'
-import { Terminal } from './Terminal'
-import { TerminalSession } from './TerminalSession'
+import { UserAddress } from './UserAddress'
+import { PaymentMethod } from './PaymentMethod'
+import { Square } from './Square'
+import { Local } from './Local'
+import { Product } from './Product'
 
 @Entity({ comment: 'Usuarios registrados en la plataforma.' })
 export class User {
@@ -116,51 +112,12 @@ export class User {
   })
   status: number
 
-  @ManyToMany(() => Terminal)
-  @JoinTable({
-    name: 'user_terminal',
-  })
-  terminals: Terminal[]
-
-  @OneToMany(() => TerminalSession, (terminalSession) => terminalSession.user)
-  terminalUsers: TerminalSession[]
-
-  @OneToMany(() => Plan, (plan) => plan.created_by)
-  plans: Plan[]
-
-  @OneToMany(() => Company, (company) => company.user)
-  companies: Company[]
-
-  @OneToMany(() => Local, (local) => local.updated_by)
-  locals: Local[]
-
-  @OneToMany(
-    () => DiscountCodeCompany,
-    (discountCodeCompany) => discountCodeCompany.updated_by
-  )
-  discount_code_companies: DiscountCodeCompany[]
-
-  @OneToMany(
-    () => DiscountCodeUser,
-    (discountCodeUser) => discountCodeUser.updated_by
-  )
-  discount_code_users: DiscountCodeUser[]
-
   @OneToMany(
     () => CodeRedemptionHistoryUser,
     (codeRedemptionHistoryUser) => codeRedemptionHistoryUser.user
   )
   code_redemption_history_users: CodeRedemptionHistoryUser[]
 
-  @ManyToMany(() => Local)
-  @JoinTable({
-    name: 'local_user',
-  })
-  locals_user: Local[]
-
-  @OneToMany(() => Master, (master) => master.user)
-  masters: Master[]
-
   @OneToMany(
     () => LocalQualification,
     (localQualification) => localQualification.user
@@ -184,4 +141,63 @@ export class User {
     (requestProduct) => requestProduct.user
   )
   request_product_group_complements: RequestProductGroupComplement[]
+
+  @OneToMany(() => UserAddress, (userAddress) => userAddress.user)
+  addresses: UserAddress[]
+
+  @ManyToMany(() => PaymentMethod)
+  @JoinTable({
+    name: 'user_payment_method',
+    joinColumn: {
+      name: 'payment_method',
+      referencedColumnName: 'id',
+    },
+    inverseJoinColumn: {
+      name: 'user',
+      referencedColumnName: 'id',
+    },
+  })
+  user_payments_method: PaymentMethod[]
+
+  @ManyToMany(() => Square)
+  @JoinTable({
+    name: 'user_favorite_square',
+    joinColumn: {
+      name: 'square',
+      referencedColumnName: 'id',
+    },
+    inverseJoinColumn: {
+      name: 'user',
+      referencedColumnName: 'id',
+    },
+  })
+  user_favorite_squares: Square[]
+
+  @ManyToMany(() => Local)
+  @JoinTable({
+    name: 'user_favorite_local',
+    joinColumn: {
+      name: 'local',
+      referencedColumnName: 'id',
+    },
+    inverseJoinColumn: {
+      name: 'user',
+      referencedColumnName: 'id',
+    },
+  })
+  user_favorite_locals: Local[]
+
+  @ManyToMany(() => Product)
+  @JoinTable({
+    name: 'user_favorite_product',
+    joinColumn: {
+      name: 'product',
+      referencedColumnName: 'id',
+    },
+    inverseJoinColumn: {
+      name: 'user',
+      referencedColumnName: 'id',
+    },
+  })
+  user_favorite_products: Product[]
 }

package/src/entities/UserAddress.ts

@@ -0,0 +1,81 @@
+import {
+  Column,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+} from 'typeorm'
+import { City } from './City'
+import { User } from './User'
+
+@Entity('user_address', {
+  comment:
+    'Tabla creada para agregar las direcciones del usuario.\r\n\r\nEsta tabla es útil para cuando se tenga la opción de domicilios.',
+})
+export class UserAddress {
+  @PrimaryGeneratedColumn({
+    comment: 'Número de identificación (ID) único de cada registro.',
+  })
+  id: number
+
+  @ManyToOne(() => User, (user) => user.addresses, {
+    onDelete: 'CASCADE',
+    onUpdate: 'NO ACTION',
+  })
+  @JoinColumn({ name: 'user' })
+  user: User
+
+  @ManyToOne(() => City, (city) => city.user_addresses, {
+    onDelete: 'RESTRICT',
+    onUpdate: 'NO ACTION',
+  })
+  @JoinColumn({ name: 'city' })
+  city: City
+
+  @Column({ length: 120, comment: 'Dirección.' })
+  address: string
+
+  @Column({
+    type: 'decimal',
+    precision: 10,
+    scale: 8,
+    comment: 'Latitud de la dirección.',
+  })
+  latitude: number
+
+  @Column({
+    type: 'decimal',
+    precision: 10,
+    scale: 8,
+    comment: 'Longitud de la dirección.',
+  })
+  longitude: number
+
+  @Column({
+    length: 400,
+    nullable: true,
+    comment:
+      'Detalles de la dirección, si es una casa, un conjunto, el apartamento.',
+  })
+  details: string
+
+  @Column({
+    length: 20,
+    comment:
+      'Tipo de ubicación:\r\n1. Casa.\r\n2. Oficina.\r\n3. Pareja.\r\n4. Otro.\r\n\r\nEsto me agrega un campo de tipo texto con el tag.',
+  })
+  tag: string
+
+  @Column({
+    comment:
+      'Campo que me dice si:\r\n1. Personal: Lo recibo yo.\r\n2. Portería: Lo recibe la portería.',
+  })
+  delivery_details: number
+
+  @Column({
+    length: 400,
+    comment:
+      'Campo para agregar una descripción más detallada de cómo llegar, o donde es la ubicación.',
+  })
+  description: string
+}

package/src/index.ts

@@ -44,11 +44,17 @@ export async function showEntity(entityName: string): Promise<any> {
   return connection.getRepository(entityName)
 }
 
-export async function callStoredProcedure(storedProcedure: string) {
-  if (!connection) {
-    connection = createDataBaseSource()
-    await connection.initialize()
-  }
+export async function callStoredProcedure(storedProcedure: any) {
+  try {
+    if (!connection) {
+      connection = createDataBaseSource()
+      await connection.initialize()
+    }
 
-  return await connection.query(`CALL ${storedProcedure}`)
+    const result = await connection.query(`CALL ${storedProcedure}`)
+    return result
+  } catch (error) {
+    console.error('Error calling stored procedure:', error)
+    throw error
+  }
 }

package/src/entities/RoleVisibleTo.ts

@@ -1,34 +0,0 @@
-import {
-  Entity,
-  Column,
-  PrimaryGeneratedColumn,
-  ManyToOne,
-  JoinColumn,
-  BaseEntity,
-} from 'typeorm'
-import { Role } from './Role'
-
-@Entity('role_visible_to', {
-  comment:
-    'Con esta tabla validamos cuales son los roles que puede agregar a otros usuarios qué roles',
-})
-export class RoleVisibleTo {
-  @PrimaryGeneratedColumn({
-    comment: 'Número de identificación (ID) único de cada registro.',
-  })
-  id: number
-
-  @ManyToOne(() => Role, (role) => role.rolesVisibleTo, {
-    onDelete: 'CASCADE',
-    onUpdate: 'NO ACTION',
-  })
-  @JoinColumn({ name: 'role' })
-  role: Role
-
-  @ManyToOne(() => Role, (role) => role.visiblesTo, {
-    onDelete: 'CASCADE',
-    onUpdate: 'NO ACTION',
-  })
-  @JoinColumn({ name: 'visible_to' })
-  visible_to: Role
-}