@things-factory/id-rule-base 7.0.1-beta.14 → 7.0.1-beta.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/id-rule-base",
-  "version": "7.0.1-beta.14",
+  "version": "7.0.1-beta.22",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -29,9 +29,9 @@
   "dependencies": {
     "@operato/data-grist": "^2.0.0-beta.0",
     "@operato/input": "^2.0.0-beta.0",
-    "@things-factory/i18n-base": "^7.0.1-beta.14",
-    "@things-factory/setting-base": "^7.0.1-beta.14",
-    "@things-factory/shell": "^7.0.1-beta.14"
+    "@things-factory/i18n-base": "^7.0.1-beta.22",
+    "@things-factory/setting-base": "^7.0.1-beta.22",
+    "@things-factory/shell": "^7.0.1-beta.22"
   },
-  "gitHead": "f98cf5cb94295657c43465d39cf55162f5566c59"
+  "gitHead": "60c6bc4d55359465636a549687fc3e3f03d44a18"
 }

package/server/service/doc-number/doc-number-query.ts

@@ -1,4 +1,3 @@
-
 import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
 import { ListParam, convertListParams, getRepository, getQueryBuilderFromListParams } from '@things-factory/shell'
 import { DocNumber } from './doc-number'
@@ -7,7 +6,6 @@ import { DocNumberList } from './doc-number-type'
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
 
-
 @Resolver(DocNumber)
 export class DocNumberQuery {
   @Query(returns => DocNumber, { description: 'To fetch a DocNumber' })
@@ -19,7 +17,7 @@ export class DocNumberQuery {
   }
 
   @Query(returns => DocNumberList, { description: 'To fetch multiple DocNumbers' })
-  async docNumbers(@Args() params: ListParam, @Ctx() context: any): Promise<DocNumberList> {
+  async docNumbers(@Args(type => ListParam) params: ListParam, @Ctx() context: any): Promise<DocNumberList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -43,21 +41,21 @@ export class DocNumberQuery {
     })
 
     // 2. find one by code - TODO by Lock
-    if(docNumber == null) {
+    if (docNumber == null) {
       docNumber = await getRepository(DocNumber).findOne({
-        where: { domain: { id: domain.id }, code : id }
+        where: { domain: { id: domain.id }, code: id }
       })
     }
 
     // 3. TODO throw exception
-    if(docNumber == null) {
+    if (docNumber == null) {
       return null
-    } 
+    }
 
     // 4. 시퀀스 증가
     let newDocNum = docNumber.currentNo
 
-    if(docNumber.useDbSeqFlag) {
+    if (docNumber.useDbSeqFlag) {
       // TODO DATABASE SEQUENCE 호출
       newDocNum += 1
     } else {
@@ -65,14 +63,14 @@ export class DocNumberQuery {
     }
 
     // 5. 문서 번호 expression 구성
-    if(!docNumber.expression) {
+    if (!docNumber.expression) {
       docNumber.updateExpression()
     }
 
-    let expression =  docNumber.expression
+    let expression = docNumber.expression
 
     // 6. 시퀀스 번호 사이클 처리
-    if(newDocNum > docNumber.endNo) {
+    if (newDocNum > docNumber.endNo) {
       newDocNum = docNumber.startNo
     }
 
@@ -82,37 +80,35 @@ export class DocNumberQuery {
     let docNoDigit = docNumber.seqDigitNum ? docNumber.seqDigitNum : 1
 
     // 8. 시퀀스 번호가 시퀀스 번호 사이즈보다 작은 경우 앞에 0을 붙임
-    if(docNoDigit > docNumLength) {
+    if (docNoDigit > docNumLength) {
       let addZeroCnt = docNoDigit - docNumLength
-      for(let i = 0 ; i < addZeroCnt ; i++) {
+      for (let i = 0; i < addZeroCnt; i++) {
         newDocNoStr = '0' + newDocNoStr
       }
-    } 
+    }
 
     // 9. 문서 번호 구성
     let newDocNumber = expression.replace('${SEQ}', newDocNoStr)
     let docUpdateInterval = docNumber.updateInterval
-    if(docUpdateInterval && docUpdateInterval != 'NONE') {
-      const today = new Date();
-      let todayStr = today.getFullYear() + (today.getMonth() > 9 ? '' + today.getMonth() + 1 : '0' + today.getMonth() + 1) + today.getDate()
+    if (docUpdateInterval && docUpdateInterval != 'NONE') {
+      const today = new Date()
+      let todayStr =
+        today.getFullYear() +
+        (today.getMonth() > 9 ? '' + today.getMonth() + 1 : '0' + today.getMonth() + 1) +
+        today.getDate()
       let intervalVal = ''
 
-      if(docUpdateInterval == 'yy') {
+      if (docUpdateInterval == 'yy') {
         intervalVal = todayStr.substring(2, 4)
-
-      } else if(docUpdateInterval == 'yyyy') {
+      } else if (docUpdateInterval == 'yyyy') {
         intervalVal = todayStr.substring(0, 4)
-
-      } else if(docUpdateInterval == 'yyMM') {
+      } else if (docUpdateInterval == 'yyMM') {
         intervalVal = todayStr.substring(2, 6)
-
-      } else if(docUpdateInterval == 'yyyyMM') {
+      } else if (docUpdateInterval == 'yyyyMM') {
         intervalVal = todayStr.substring(0, 6)
-
-      } else if(docUpdateInterval == 'yyMMdd') {
+      } else if (docUpdateInterval == 'yyMMdd') {
         intervalVal = todayStr.substring(2, 8)
-
-      } else if(docUpdateInterval == 'yyyyMMdd') {
+      } else if (docUpdateInterval == 'yyyyMMdd') {
         intervalVal = todayStr
       }
 
@@ -125,22 +121,22 @@ export class DocNumberQuery {
     docNumber.lastDocNumber = newDocNumber
     await getRepository(DocNumber).save(docNumber)
 
-    // 11. 최종 
+    // 11. 최종
     return docNumber
   }
 
   @FieldResolver(type => Domain)
   async domain(@Root() docNumber: DocNumber): Promise<Domain> {
-    return await getRepository(Domain).findOneBy({id:docNumber.domainId})
+    return await getRepository(Domain).findOneBy({ id: docNumber.domainId })
   }
 
   @FieldResolver(type => User)
-  async creator(@Root()  docNumber: DocNumber): Promise<User> {
-    return await getRepository(User).findOneBy({id:docNumber.creatorId})
+  async creator(@Root() docNumber: DocNumber): Promise<User> {
+    return await getRepository(User).findOneBy({ id: docNumber.creatorId })
   }
 
   @FieldResolver(type => User)
-  async updater(@Root()  docNumber: DocNumber): Promise<User> {
-    return await getRepository(User).findOneBy({id:docNumber.updaterId})
+  async updater(@Root() docNumber: DocNumber): Promise<User> {
+    return await getRepository(User).findOneBy({ id: docNumber.updaterId })
   }
 }

package/server/service/doc-number/doc-number.ts

@@ -1,4 +1,14 @@
-import { CreateDateColumn, UpdateDateColumn, Entity, Index, Column, RelationId, ManyToOne, PrimaryGeneratedColumn, BeforeInsert } from 'typeorm'
+import {
+  CreateDateColumn,
+  UpdateDateColumn,
+  Entity,
+  Index,
+  Column,
+  RelationId,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  BeforeInsert
+} from 'typeorm'
 import { ObjectType, Field, Int, ID } from 'type-graphql'
 
 import { User } from '@things-factory/auth-base'
@@ -80,14 +90,14 @@ export class DocNumber {
   domainId: string
 
   @ManyToOne(type => User, { createForeignKeyConstraints: false, nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((docNumber: DocNumber) => docNumber.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { createForeignKeyConstraints: false, nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((docNumber: DocNumber) => docNumber.updater)