diff --git a/src/app.module.ts b/src/app.module.ts index 8d50be8..2e4cc15 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -9,7 +9,7 @@ import { UploaderModule } from './modules/uploader/uploader.module'; import { AdminModule } from './modules/admin/admin.module'; import { ThrottlerModule } from '@nestjs/throttler'; import { ScheduleModule } from '@nestjs/schedule'; -import { productModule } from './modules/product/product.module'; +import { ProductModule } from './modules/product/product.module'; import { RolesModule } from './modules/roles/roles.module'; import { PaymentModule } from './modules/payment/payments.module'; import { OrderModule } from './modules/order/order.module'; @@ -35,7 +35,7 @@ import { FormBuilderModule } from './modules/form-builder/form-builder.module'; }, ]), ScheduleModule.forRoot(), - productModule, + ProductModule, RolesModule, PaymentModule, OrderModule, diff --git a/src/modules/form-builder/form-builder.module.ts b/src/modules/form-builder/form-builder.module.ts index 70682ab..25085c0 100644 --- a/src/modules/form-builder/form-builder.module.ts +++ b/src/modules/form-builder/form-builder.module.ts @@ -6,9 +6,10 @@ import { PrintModule } from '../print/print.module'; import { FieldRepository } from './repository/field.repository'; import { FieldOptionRepository } from './repository/field-option.repository'; import { JwtModule } from '@nestjs/jwt'; +import { ProductModule } from '../product/product.module'; @Module({ - imports: [PrintModule, JwtModule.register({})], + imports: [PrintModule, ProductModule, JwtModule.register({})], controllers: [FormBuilderController], providers: [FieldService, FieldOptionService, FieldRepository, FieldOptionRepository], exports: [FieldService, FieldOptionService, FieldRepository, FieldOptionRepository], diff --git a/src/modules/order/order.module.ts b/src/modules/order/order.module.ts index 231683f..f0fc6bb 100644 --- a/src/modules/order/order.module.ts +++ b/src/modules/order/order.module.ts @@ -14,7 +14,7 @@ import { AdminModule } from '../admin/admin.module'; import { NotificationsModule } from '../notification/notifications.module'; import { UserModule } from '../user/user.module'; import { UtilsModule } from '../util/utils.module'; -import { productModule } from '../product/product.module'; +import { ProductModule } from '../product/product.module'; import { TicketModule } from '../ticket/ticket.module'; import { OrderItemRepository } from './repositories/order-item.repository'; @@ -28,8 +28,8 @@ import { OrderItemRepository } from './repositories/order-item.repository'; NotificationsModule, UtilsModule, forwardRef(() => UserModule), - productModule, - forwardRef(()=>TicketModule) + ProductModule, + forwardRef(() => TicketModule) ], controllers: [OrderController], providers: [OrderService, OrderRepository, OrderListeners, diff --git a/src/modules/print/entities/print.entity.ts b/src/modules/print/entities/print.entity.ts index 7d64529..1c0d967 100644 --- a/src/modules/print/entities/print.entity.ts +++ b/src/modules/print/entities/print.entity.ts @@ -1,5 +1,4 @@ -import { Cascade, Collection, Entity, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'; -import { Field } from 'src/modules/form-builder/entities/field.entity'; +import { Entity, PrimaryKey, Property } from '@mikro-orm/core'; import { BaseEntity } from 'src/common/entities/base.entity'; @@ -8,8 +7,11 @@ export class Print extends BaseEntity { @PrimaryKey({ type: 'bigint', autoincrement: true }) id: bigint - @OneToMany(() => Field, (attrValue) => attrValue.entityId, { cascade: [Cascade.PERSIST, Cascade.REMOVE] }) - fields = new Collection(this) + // @OneToMany(() => Field, (attrValue) => attrValue.entityId, { cascade: [Cascade.PERSIST, Cascade.REMOVE] }) + // fields = new Collection(this) + + @Property({ type: 'json', nullable: true }) + fields?: string[] @Property() title: string; diff --git a/src/modules/product/entities/product.entity.ts b/src/modules/product/entities/product.entity.ts index 3413885..b638a21 100644 --- a/src/modules/product/entities/product.entity.ts +++ b/src/modules/product/entities/product.entity.ts @@ -9,8 +9,8 @@ export class Product extends BaseEntity { @ManyToOne(() => Category) category: Category - @OneToMany(() => Attribute, (attr) => attr.product) - attributes = new Collection(this) + @Property({ type: 'json', nullable: true }) + attributes?: string[] @PrimaryKey({ type: 'bigint', autoincrement: true }) id: bigint diff --git a/src/modules/product/product.module.ts b/src/modules/product/product.module.ts index f0f8824..158fef5 100644 --- a/src/modules/product/product.module.ts +++ b/src/modules/product/product.module.ts @@ -35,4 +35,4 @@ import { AttributeValueService } from './providers/attribute-value.service'; CategoryService, AttributeRepository, AttributeService, ProductService], }) -export class productModule { } +export class ProductModule { }