@things-factory/tax-invoice 6.2.125 → 6.2.129

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/tax-invoice",
-  "version": "6.2.125",
+  "version": "6.2.129",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -29,9 +29,10 @@
   "dependencies": {
     "@operato/graphql": "^1.0.0",
     "@operato/shell": "^1.0.0",
-    "@things-factory/auth-base": "^6.2.122",
-    "@things-factory/export-ui-excel": "^6.2.122",
-    "@things-factory/shell": "^6.2.122"
+    "@things-factory/auth-base": "^6.2.126",
+    "@things-factory/env": "^6.2.126",
+    "@things-factory/export-ui-excel": "^6.2.126",
+    "@things-factory/shell": "^6.2.126"
   },
-  "gitHead": "7d694035e7e886593088face69dfefe70b8c0486"
+  "gitHead": "6939e013d9a091fb17094d6f988c32f4dab278f4"
 }

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

@@ -11,32 +11,46 @@ import { parseTaxInvoiceByUnipostFormat } from '../tax-invoice/tax-invoice-util'
 @Resolver(TaxInvoiceApi)
 export class TaxInvoiceApiMutation {
   @Directive('@transaction')
-  @Mutation(returns => TaxInvoiceApi, { description: 'To modify Tax Invoice Api information' })
-  async updateMultipleTaxInvoiceApi(@Arg('patch', type => TaxInvoiceApiPatch) patch: TaxInvoiceApiPatch, @Ctx() context: ResolverContext): Promise<TaxInvoiceApi> {
+  @Mutation(returns => [TaxInvoiceApi], { description: 'To modify Tax Invoice Api information' })
+  async updateMultipleTaxInvoiceApi(
+    @Arg('patches', type => [TaxInvoiceApiPatch]) patches: TaxInvoiceApiPatch[],
+    @Ctx() context: ResolverContext
+  ): Promise<TaxInvoiceApi[]> {
     const { domain, user, tx } = context.state
+
+    let results = []
+    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
+    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
     const taxInvoiceApiRepo = tx.getRepository(TaxInvoiceApi)
-    let results
-
-    if (patch.cuFlag.toUpperCase() === '+') {
-      const result = await taxInvoiceApiRepo.save({
-        ...patch,
-        domain,
-        creator: user,
-        updater: user
-      })
 
-      results = { ...result, cuFlag: '+' }
+    if (_createRecords.length > 0) {
+      for (let i = 0; i < _createRecords.length; i++) {
+        const newRecord = _createRecords[i]
+
+        const result = await taxInvoiceApiRepo.save({
+          ...newRecord,
+          domain,
+          creator: user,
+          updater: user
+        })
+
+        results.push({ ...result, cuFlag: '+' })
+      }
     }
 
-    if (patch.cuFlag.toUpperCase() === 'M') {
-      const taxInvoiceApi = await taxInvoiceApiRepo.findOneBy({ id: patch.id })
-      const result = await taxInvoiceApiRepo.save({
-        ...taxInvoiceApi,
-        ...patch,
-        updater: user
-      })
+    if (_updateRecords.length > 0) {
+      for (let i = 0; i < _updateRecords.length; i++) {
+        const updateRecord = _updateRecords[i]
+        const taxAuditResult = await taxInvoiceApiRepo.findOneBy({ id: updateRecord.id })
 
-      results = { ...result, cuFlag: 'M' }
+        const result = await taxInvoiceApiRepo.save({
+          ...taxAuditResult,
+          ...updateRecord,
+          updater: user
+        })
+
+        results.push({ ...result, cuFlag: 'M' })
+      }
     }
 
     return results

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

@@ -1,17 +1,23 @@
-import { Resolver, Query, FieldResolver, Root, Ctx } from 'type-graphql'
-import { Domain, getRepository } from '@things-factory/shell'
+import { Resolver, Query, FieldResolver, Root, Args, Ctx } from 'type-graphql'
+import { Domain, ListParam, getQueryBuilderFromListParams, getRepository } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { TaxInvoiceApi } from './tax-invoice-api'
+import { TaxInvoiceApiList } from './tax-invoice-api-type'
 
 @Resolver(TaxInvoiceApi)
 export class TaxInvoiceApiQuery {
-  @Query(returns => TaxInvoiceApi!, { nullable: true, description: 'To fetch a Tax Invoice Api' })
-  async taxInvoiceApi(@Ctx() context: ResolverContext): Promise<TaxInvoiceApi> {
+  @Query(returns => TaxInvoiceApiList!, { nullable: true, description: 'To fetch a Tax Invoice Api List' })
+  async taxInvoiceApis(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<TaxInvoiceApiList> {
     const { domain } = context.state
 
-    return await getRepository(TaxInvoiceApi).findOne({
-      where: { domain: { id: domain.id } }
+    const queryBuilder = getQueryBuilderFromListParams({
+      domain,
+      params,
+      repository: await getRepository(TaxInvoiceApi)
     })
+    const [items, total] = await queryBuilder.getManyAndCount()
+
+    return { items, total }
   }
 
   @FieldResolver(type => Domain)

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

@@ -10,13 +10,10 @@ export class TaxInvoiceApiPatch {
   id?: string
 
   @Field({ nullable: true })
-  name?: string
+  isDefault?: boolean
 
   @Field({ nullable: true })
-  description?: string
-
-  @Field({ nullable: true })
-  apiKey?: string
+  provider?: string
 
   @Field({ nullable: true })
   apiAccountId?: string

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

@@ -1,12 +1,11 @@
-import { CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Entity, Index, Column, RelationId, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
+import { CreateDateColumn, UpdateDateColumn, Entity, Index, Column, RelationId, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
 import { ObjectType, Field, ID } from 'type-graphql'
 
 import { Domain, ScalarObject, encryptTransformer } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 
-@Entity('tax_invoice_api') // api는 한개만 존재해야함.
-@Index('ix_tax_invoice_api_0', (taxInvoiceApi: TaxInvoiceApi) => [taxInvoiceApi.domain, taxInvoiceApi.name, taxInvoiceApi.deletedAt])
-@Index('ix_tax_invoice_api_1', (taxInvoiceApi: TaxInvoiceApi) => [taxInvoiceApi.domain, taxInvoiceApi.description, taxInvoiceApi.deletedAt])
+@Entity()
+@Index('ix_tax_invoice_api_provider', (taxInvoiceApi: TaxInvoiceApi) => [taxInvoiceApi.domain, taxInvoiceApi.provider], { unique: true })
 @ObjectType({ description: 'Entity for Tax Invoice Api' })
 export class TaxInvoiceApi {
   @PrimaryGeneratedColumn('uuid')
@@ -20,18 +19,13 @@ export class TaxInvoiceApi {
   @RelationId((taxInvoiceApi: TaxInvoiceApi) => taxInvoiceApi.domain)
   domainId?: string
 
-  // 2개 이상 들어가는 것을 방지하는 플래그
-  @Field({ nullable: false })
-  @Column({ nullable: false, default: 1, unique: true })
-  uniqueSequence!: number
+  @Column({ nullable: true, comment: '디폴트 여부' })
+  @Field({ nullable: true, description: '디폴트 여부' })
+  isDefault?: boolean
 
-  @Field({ nullable: false })
-  @Column({ nullable: false })
-  name!: string
-
-  @Field({ nullable: true })
-  @Column({ nullable: true })
-  description?: string
+  @Column({ nullable: false, comment: '공급자' })
+  @Field({ nullable: false, description: '공급자' })
+  provider!: string
 
   @Column({ nullable: true, comment: 'API Key', transformer: encryptTransformer })
   @Field({ nullable: true, description: 'API Key' })
@@ -105,10 +99,6 @@ export class TaxInvoiceApi {
   @Field({ nullable: true })
   updatedAt?: Date
 
-  @DeleteDateColumn()
-  @Field({ nullable: true })
-  deletedAt?: Date
-
   @ManyToOne(type => User, { nullable: true })
   @Field(type => User, { nullable: true })
   creator?: User

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

@@ -1,8 +1,9 @@
 import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx } from 'type-graphql'
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
-import { TaxInvoiceCompany, companyTypeLabel } from './tax-invoice-company'
-import { TaxInvoiceCompanyList } from './tax-invoice-company-type'
+import { TaxInvoiceCompany } from './tax-invoice-company'
+import { TaxInvoiceCompanyList, TaxInvoiceMyCompany } from './tax-invoice-company-type'
+import { TaxInvoiceApi } from '../tax-invoice-api/tax-invoice-api'
 
 @Resolver(TaxInvoiceCompany)
 export class TaxInvoiceCompanyQuery {
@@ -31,9 +32,27 @@ export class TaxInvoiceCompanyQuery {
     return { items, total }
   }
 
-  @FieldResolver(type => String)
-  async convertedType(@Root() taxInvoiceCompany: TaxInvoiceCompany): Promise<string> {
-    return companyTypeLabel[taxInvoiceCompany.type]
+  // 프로젝트 마다 구현 (기본 공급자 정보를 리턴하는 리졸버)
+  @Query(returns => TaxInvoiceMyCompany, { nullable: true, description: 'To fetch a Tax Invoice My Company' })
+  async taxInvoiceDefaultCompany(@Ctx() context: ResolverContext): Promise<TaxInvoiceMyCompany> {
+    const { domain } = context.state
+    const taxInvoiceApi = await getRepository(TaxInvoiceApi).findOne({
+      where: { domain: { id: domain.id }, isDefault: true }
+    })
+
+    const taxInvoiceCompany: TaxInvoiceMyCompany = { ...taxInvoiceApi }
+
+    return taxInvoiceCompany
+  }
+
+  @Query(returns => TaxInvoiceMyCompany, { nullable: true, description: 'To fetch a Tax Invoice My Companies' })
+  async taxInvoiceMyCompanies(@Ctx() context: ResolverContext): Promise<TaxInvoiceMyCompany> {
+    const { domain } = context.state
+    const taxInvoiceApi = await getRepository(TaxInvoiceApi).find({
+      where: { domain: { id: domain.id } }
+    })
+
+    return null
   }
 
   @FieldResolver(type => Domain)

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

@@ -1,6 +1,6 @@
 import { ObjectType, Field, InputType, Int, ID } from 'type-graphql'
 import { ScalarObject } from '@things-factory/shell'
-import { CompanyType, TaxInvoiceCompany } from './tax-invoice-company'
+import { TaxInvoiceCompany } from './tax-invoice-company'
 
 @InputType()
 export class TaxInvoiceCompanyPatch {
@@ -13,9 +13,6 @@ export class TaxInvoiceCompanyPatch {
   @Field({ nullable: true })
   description?: string
 
-  @Field({ nullable: true })
-  type?: CompanyType
-
   @Field({ nullable: true })
   businessRegistrationNumber?: string
 
@@ -59,6 +56,45 @@ export class TaxInvoiceCompanyPatch {
   cuFlag?: string
 }
 
+@ObjectType()
+export class TaxInvoiceMyCompany {
+  @Field({ nullable: true })
+  businessRegistrationNumber?: string
+
+  @Field({ nullable: true })
+  branchIdentification?: string
+
+  @Field({ nullable: true })
+  businessName?: string
+
+  @Field({ nullable: true })
+  representativeName?: string
+
+  @Field({ nullable: true })
+  address?: string
+
+  @Field({ nullable: true })
+  businessType?: string
+
+  @Field({ nullable: true })
+  industryType?: string
+
+  @Field({ nullable: true })
+  department?: string
+
+  @Field({ nullable: true })
+  contactName?: string
+
+  @Field({ nullable: true })
+  contactPhone?: string
+
+  @Field({ nullable: true })
+  contactEmail?: string
+
+  @Field({ nullable: true })
+  contactCellPhone?: string
+}
+
 @ObjectType()
 export class TaxInvoiceCompanyList {
   @Field(type => [TaxInvoiceCompany])

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

@@ -15,20 +15,6 @@ import { ObjectType, Field, ID, registerEnumType } from 'type-graphql'
 
 import { Domain, ScalarObject, encryptTransformer } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
-import { TaxInvoiceApi } from '../tax-invoice-api/tax-invoice-api'
-
-export enum CompanyType {
-  SUPPLIER = 10, // 공급자
-  BUYER = 20 // 거래처
-}
-export const companyTypeLabel = {
-  [CompanyType.SUPPLIER]: '공급자',
-  [CompanyType.BUYER]: '거래처'
-}
-registerEnumType(CompanyType, {
-  name: 'CompanyType',
-  description: 'company type'
-})
 
 @Entity()
 @Index('ix_tax_invoice_company_0', (taxInvoiceCompany: TaxInvoiceCompany) => [taxInvoiceCompany.domain, taxInvoiceCompany.name, taxInvoiceCompany.deletedAt])
@@ -54,10 +40,6 @@ export class TaxInvoiceCompany {
   @Column({ nullable: true })
   description?: string
 
-  @Field({ nullable: false })
-  @Column({ nullable: false })
-  type!: CompanyType
-
   @Column({ nullable: true, comment: '사업자등록번호', transformer: encryptTransformer })
   @Field({ nullable: true, description: '사업자등록번호' })
   businessRegistrationNumber?: string

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

@@ -1,16 +1,12 @@
 import { Category } from '../tax-invoice/tax-invoice'
+import { config } from '@things-factory/env'
 // import getTestTaxInvoiceData from './test-data'
 
+const UNITAX_CONFIG = config.get('unitax', {})
 // 세금계산서 조회 API
-const INQUIRY_URL = {
-  dev: 'https://inf1dev.unipost.co.kr:47523/unitax/rest/v3/hometax/searchbills',
-  prod: 'https://inf1.unipost.co.kr/unitax/rest/v3/hometax/searchbills'
-}
+const INQUIRY_URL = UNITAX_CONFIG.INQUIRY_URL || ''
 // 세금계산서 조회 후 처리 결과 갱신
-const CONFIRM_URL = {
-  dev: 'https://inf1dev.unipost.co.kr:47523/unitax/rest/v3/hometax/updateBills',
-  prod: 'https://inf1.unipost.co.kr/unitax/rest/v3/hometax/updateBills'
-}
+const CONFIRM_URL = UNITAX_CONFIG.CONFIRM_URL || ''
 
 export enum UnipostTaxType {
   EXPORT = 'AR', // 매출
@@ -69,7 +65,7 @@ export async function getTaxInvoiceByUniposApi(businessRegistrationNumber: strin
 }
 
 async function _callTaxInvoiceInquiry(businessRegistrationNumber: string, aid: string, bearer: string, taxType: UnipostTaxType) {
-  const response = await fetch(INQUIRY_URL.dev, {
+  const response = await fetch(INQUIRY_URL, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -88,7 +84,7 @@ async function _callTaxInvoiceInquiry(businessRegistrationNumber: string, aid: s
   return response
 }
 export async function callTaxInvoiceConfirm(businessRegistrationNumber: string, aid: string, bearer: string, confirmData: ConfirmData[]) {
-  const response = await fetch(CONFIRM_URL.dev, {
+  const response = await fetch(CONFIRM_URL, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',

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

@@ -1,8 +1,8 @@
+import { config } from '@things-factory/env'
+
+const UNITAX_CONFIG = config.get('unitax', {})
 // 세금계산서 발행 API
-const SEND_URL = {
-  dev: 'https://inf2dev.unipost.co.kr:47543/mbill-etaxr-server/api/rest/v3/receivebill',
-  prod: 'https://inf1.unipost.co.kr/mbill-etaxr-server/api/rest/v3/receivebill'
-}
+const SEND_URL = UNITAX_CONFIG.SEND_URL || ''
 
 export async function sendTaxInvoiceByUniposApi(businessRegistrationNumber: string, aid: string, bearer: string, taxInvoiceSendList) {
   if (!businessRegistrationNumber || !aid || !bearer || !taxInvoiceSendList) {
@@ -16,7 +16,7 @@ export async function sendTaxInvoiceByUniposApi(businessRegistrationNumber: stri
 
 async function _callTaxInvoiceSend(businessRegistrationNumber: string, aid: string, bearer: string, taxInvoiceSendList) {
   try {
-    return await fetch(SEND_URL.dev, {
+    return await fetch(SEND_URL, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',

package/translations/ko.json

@@ -21,6 +21,7 @@
   "text.tax invoice description purpose 02": "청구",
   "text.success tax send": "세금계산서가 발행되었습니다.",
 
+  "field.is_default": "기본 여부",
   "field.memo": "메모",
   "field.business registration number": "사업자등록번호",
   "field.short business registration number": "등록번호",