@things-factory/tax-invoice 6.2.84 → 6.2.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/tax-invoice",
-  "version": "6.2.84",
+  "version": "6.2.86",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -33,5 +33,5 @@
     "@things-factory/export-ui-excel": "^6.2.84",
     "@things-factory/shell": "^6.2.84"
   },
-  "gitHead": "3c272e989acc14bbd02f4ec79624dfd7dc4e6acd"
+  "gitHead": "f90a5c1ff2a93331bb6e375944972dc68dde8a1f"
 }

package/server/service/tax-invoice/tax-invoice-mutation.ts

@@ -3,22 +3,33 @@ import { In } from 'typeorm'
 
 import { TaxInvoice } from './tax-invoice'
 import { NewTaxInvoice, TaxInvoicePatch } from './tax-invoice-type'
+import { NewTaxInvoiceItem } from '../tax-invoice-item/tax-invoice-item-type'
+import { TaxInvoiceItem } from '../tax-invoice-item/tax-invoice-item'
 
 @Resolver(TaxInvoice)
 export class TaxInvoiceMutation {
   @Directive('@transaction')
   @Mutation(returns => TaxInvoice, { description: 'To create new TaxInvoice' })
-  async createTaxInvoice(@Arg('taxInvoice') taxInvoice: NewTaxInvoice, @Ctx() context: ResolverContext): Promise<TaxInvoice> {
+  async createTaxInvoice(
+    @Arg('taxInvoice') taxInvoice: NewTaxInvoice,
+    @Arg('taxInvoiceItems', () => [NewTaxInvoiceItem]) taxInvoiceItems: NewTaxInvoiceItem[],
+    @Ctx() context: ResolverContext
+  ): Promise<TaxInvoice> {
     const { domain, user, tx } = context.state
 
-    const result = await tx.getRepository(TaxInvoice).save({
+    const newTaxInvoice = await tx.getRepository(TaxInvoice).save({
       ...taxInvoice,
       domain,
       creator: user,
       updater: user
     })
 
-    return result
+    // 아이템 저장
+    for (const item of taxInvoiceItems) {
+      await tx.getRepository(TaxInvoiceItem).save({ ...item, taxInvoice: newTaxInvoice, domain, creator: user })
+    }
+
+    return newTaxInvoice
   }
 
   @Directive('@transaction')
@@ -105,18 +116,4 @@ export class TaxInvoiceMutation {
 
     return true
   }
-
-  @Directive('@transaction')
-  @Mutation(returns => Boolean, { description: 'To import multiple TaxInvoices' })
-  async importTaxInvoices(@Arg('taxInvoices', type => [TaxInvoicePatch]) taxInvoices: TaxInvoicePatch[], @Ctx() context: ResolverContext): Promise<boolean> {
-    const { domain, tx } = context.state
-
-    await Promise.all(
-      taxInvoices.map(async (taxInvoice: TaxInvoicePatch) => {
-        const createdTaxInvoice: TaxInvoice = await tx.getRepository(TaxInvoice).save({ domain, ...taxInvoice })
-      })
-    )
-
-    return true
-  }
 }

package/server/service/tax-invoice/tax-invoice-query.ts

@@ -34,7 +34,7 @@ export class TaxInvoiceQuery {
 
   @FieldResolver(type => [TaxInvoiceItem])
   async taxInvoiceItems(@Root() taxInvoice: TaxInvoice): Promise<TaxInvoiceItem[]> {
-    return taxInvoice.id && (await getRepository(TaxInvoiceItem).findBy({ taxInvoiceId: taxInvoice.id }))
+    return taxInvoice.id && (await getRepository(TaxInvoiceItem).findBy({ taxInvoice: { id: taxInvoice.id } }))
   }
 
   @FieldResolver(type => Domain)

package/server/service/tax-invoice/tax-invoice.ts

@@ -94,10 +94,6 @@ export class TaxInvoice {
   @Field(type => ID)
   readonly id!: string
 
-  @VersionColumn()
-  @Field({ nullable: true })
-  version?: number = 1
-
   @ManyToOne(type => Domain)
   @Field({ nullable: true })
   domain?: Domain

package/server/service/tax-invoice-api/tax-invoice-api.ts

@@ -26,10 +26,6 @@ export class TaxInvoiceApi {
   @Field(type => ID)
   readonly id!: string
 
-  @VersionColumn()
-  @Field({ nullable: true })
-  version?: number = 1
-
   @ManyToOne(type => Domain)
   @Field({ nullable: true })
   domain?: Domain

package/server/service/tax-invoice-company/tax-invoice-company.ts

@@ -39,10 +39,6 @@ export class TaxInvoiceCompany {
   @Field(type => ID)
   readonly id!: string
 
-  @VersionColumn()
-  @Field({ nullable: true })
-  version?: number = 1
-
   @ManyToOne(type => Domain)
   @Field({ nullable: true })
   domain?: Domain

package/server/service/tax-invoice-item/tax-invoice-item-type.ts

@@ -6,9 +6,6 @@ import { TaxInvoiceItem } from './tax-invoice-item'
 
 @InputType()
 export class NewTaxInvoiceItem {
-  @Field({ nullable: false, description: '세금계산서 번호' })
-  taxInvoiceId: string
-
   @Field(type => Int, { nullable: false, description: '아이템 일련번호' })
   sequence: number
 
@@ -42,9 +39,6 @@ export class TaxInvoiceItemPatch {
   @Field(type => ID, { nullable: false })
   id?: string
 
-  @Field({ nullable: false, description: '세금계산서 번호' })
-  taxInvoiceId: string
-
   @Field(type => Int, { nullable: false, description: '아이템 일련번호' })
   sequence: number
 

package/server/service/tax-invoice-item/tax-invoice-item.ts

@@ -1,4 +1,4 @@
-import { CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Entity, Index, Column, RelationId, ManyToOne, PrimaryGeneratedColumn, VersionColumn } from 'typeorm'
+import { CreateDateColumn, DeleteDateColumn, Entity, Index, Column, JoinColumn, RelationId, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
 import { ObjectType, Field, ID } from 'type-graphql'
 
 import { Domain } from '@things-factory/shell'
@@ -7,17 +7,13 @@ import { TaxInvoice } from '../tax-invoice/tax-invoice'
 
 @Entity()
 @Index('ix_tax_invoice_item_0', (taxInvoiceItem: TaxInvoiceItem) => [taxInvoiceItem.domain, taxInvoiceItem.id, taxInvoiceItem.deletedAt], { unique: true })
-// @Index('ix_tax_invoice_item_1', (taxInvoiceItem: TaxInvoiceItem) => [taxInvoiceItem.taxInvoiceId])
+@Index('ix_tax_invoice_item_1', (taxInvoiceItem: TaxInvoiceItem) => [taxInvoiceItem.taxInvoice])
 @ObjectType({ description: 'Entity for TaxInvoiceItem' })
 export class TaxInvoiceItem {
   @PrimaryGeneratedColumn('uuid')
   @Field(type => ID)
   readonly id!: string
 
-  @VersionColumn()
-  @Field({ nullable: true })
-  version?: number = 1
-
   @ManyToOne(type => Domain)
   @Field({ nullable: true })
   domain?: Domain
@@ -25,7 +21,7 @@ export class TaxInvoiceItem {
   @RelationId((taxInvoiceItem: TaxInvoiceItem) => taxInvoiceItem.domain)
   domainId?: string
 
-  @ManyToOne(type => TaxInvoice)
+  @ManyToOne(type => TaxInvoice, taxInvoice => taxInvoice.taxInvoiceItems)
   @Field({ nullable: false })
   taxInvoice!: TaxInvoice