diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..b23d240 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "css.customData": [], + "css.lint.unknownAtRules": "ignore", + "scss.lint.unknownAtRules": "ignore" +} diff --git a/backend/src/billing/entities/pricing-rule.entity.ts b/backend/src/billing/entities/pricing-rule.entity.ts index bc22d73..f8ec7a3 100644 --- a/backend/src/billing/entities/pricing-rule.entity.ts +++ b/backend/src/billing/entities/pricing-rule.entity.ts @@ -6,8 +6,8 @@ import { JoinColumn, CreateDateColumn, } from 'typeorm'; -import { PricingResourceType } from '../../common/enums'; import { ServicePlan } from './service-plan.entity'; +import { PricingResourceType } from '../../common/enums'; @Entity('pricing_rules') export class PricingRule { diff --git a/backend/src/billing/entities/service-plan.entity.ts b/backend/src/billing/entities/service-plan.entity.ts index b1a65cc..5bcac82 100644 --- a/backend/src/billing/entities/service-plan.entity.ts +++ b/backend/src/billing/entities/service-plan.entity.ts @@ -7,7 +7,6 @@ import { OneToMany, } from 'typeorm'; import { BillingCycle, AppRuntime } from '../../common/enums'; -import { PricingRule } from './pricing-rule.entity'; @Entity('service_plans') export class ServicePlan { @@ -29,8 +28,8 @@ export class ServicePlan { @Column({ default: true }) isActive: boolean; - @OneToMany(() => PricingRule, (rule) => rule.plan, { cascade: true, eager: true }) - pricingRules: PricingRule[]; + @OneToMany('PricingRule', 'plan', { cascade: true, eager: true }) + pricingRules: any[]; @CreateDateColumn() createdAt: Date; diff --git a/backend/src/billing/entities/wallet-transaction.entity.ts b/backend/src/billing/entities/wallet-transaction.entity.ts index b8f132f..541f69a 100644 --- a/backend/src/billing/entities/wallet-transaction.entity.ts +++ b/backend/src/billing/entities/wallet-transaction.entity.ts @@ -6,8 +6,8 @@ import { JoinColumn, CreateDateColumn, } from 'typeorm'; -import { TransactionType } from '../../common/enums'; import { Wallet } from './wallet.entity'; +import { TransactionType } from '../../common/enums'; @Entity('wallet_transactions') export class WalletTransaction { diff --git a/backend/src/billing/entities/wallet.entity.ts b/backend/src/billing/entities/wallet.entity.ts index 78a11e8..837f927 100644 --- a/backend/src/billing/entities/wallet.entity.ts +++ b/backend/src/billing/entities/wallet.entity.ts @@ -9,7 +9,6 @@ import { OneToMany, } from 'typeorm'; import { User } from '../../users/entities/user.entity'; -import { WalletTransaction } from './wallet-transaction.entity'; @Entity('wallets') export class Wallet { @@ -26,8 +25,8 @@ export class Wallet { @Column({ unique: true }) userId: string; - @OneToMany(() => WalletTransaction, (tx: WalletTransaction) => tx.wallet) - transactions: WalletTransaction[]; + @OneToMany('WalletTransaction', 'wallet') + transactions: any[]; @CreateDateColumn() createdAt: Date; diff --git a/backend/src/tickets/entities/ticket-message.entity.ts b/backend/src/tickets/entities/ticket-message.entity.ts index 2f0c069..eeda3ad 100644 --- a/backend/src/tickets/entities/ticket-message.entity.ts +++ b/backend/src/tickets/entities/ticket-message.entity.ts @@ -6,9 +6,9 @@ import { ManyToOne, JoinColumn, } from 'typeorm'; -import { Ticket } from './ticket.entity'; import { User } from '../../users/entities/user.entity'; import { UserRole } from '../../common/enums'; +import { Ticket } from './ticket.entity'; @Entity('ticket_messages') export class TicketMessage { diff --git a/backend/src/tickets/entities/ticket.entity.ts b/backend/src/tickets/entities/ticket.entity.ts index 3fc1589..cf113b4 100644 --- a/backend/src/tickets/entities/ticket.entity.ts +++ b/backend/src/tickets/entities/ticket.entity.ts @@ -10,7 +10,6 @@ import { } from 'typeorm'; import { TicketDepartment, TicketStatus, TicketPriority } from '../../common/enums'; import { User } from '../../users/entities/user.entity'; -import { TicketMessage } from './ticket-message.entity'; @Entity('tickets') export class Ticket { @@ -36,8 +35,8 @@ export class Ticket { @JoinColumn({ name: 'userId' }) user: User; - @OneToMany(() => TicketMessage, (msg) => msg.ticket, { cascade: true }) - messages: TicketMessage[]; + @OneToMany('TicketMessage', 'ticket', { cascade: true }) + messages: any[]; @CreateDateColumn() createdAt: Date;