@dssp/supervision 0.0.10 → 0.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dssp/supervision",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,8 +27,8 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@dssp/building-complex": "^0.0.10",
-    "@dssp/project": "^0.0.10",
+    "@dssp/building-complex": "^0.0.11",
+    "@dssp/project": "^0.0.11",
     "@operato/event-view": "^8.0.0-alpha",
     "@operato/graphql": "^8.0.0-alpha",
     "@operato/image-marker": "^8.0.0-alpha",
@@ -37,5 +37,5 @@
     "@things-factory/auth-base": "^8.0.0-alpha",
     "@things-factory/shell": "^8.0.0-alpha"
   },
-  "gitHead": "f5e70faf42512bfb57de29892fff63e0bacf5d0e"
+  "gitHead": "a52f2688d11ebf3e7d727fbd8ff825920840be83"
 }

package/server/service/building-inspection/building-inspection-history.ts

@@ -21,6 +21,9 @@ export class BuildingInspectionHistory implements HistoryEntityInterface<Buildin
   @Field(type => ID)
   readonly id: string
 
+  @HistoryOriginalIdColumn()
+  public originalId!: string
+
   @Column({ nullable: false, comment: '상태(REQUEST: 요청, PASS: 합격, FAIL: 불합격)' })
   @Field({ nullable: true })
   status?: BuildingInspectionStatus
@@ -30,7 +33,7 @@ export class BuildingInspectionHistory implements HistoryEntityInterface<Buildin
   @Field({ nullable: true })
   buildingLevel?: BuildingLevel
 
-  @RelationId((buildingInspection: BuildingInspection) => buildingInspection.buildingLevel)
+  @RelationId((buildingInspectionHistory: BuildingInspectionHistory) => buildingInspectionHistory.buildingLevel)
   buildingLevelId?: string
 
   @Column({ nullable: false, comment: '검측 요청일' })
@@ -50,12 +53,9 @@ export class BuildingInspectionHistory implements HistoryEntityInterface<Buildin
   @Field(type => User, { nullable: true })
   creator?: User
 
-  @RelationId((buildingInspection: BuildingInspection) => buildingInspection.creator)
+  @RelationId((buildingInspectionHistory: BuildingInspectionHistory) => buildingInspectionHistory.creator)
   creatorId?: string
 
-  @HistoryOriginalIdColumn()
-  public originalId!: string
-
   @HistoryActionColumn({
     nullable: false,
     type:

package/server/service/building-inspection/building-inspection-mutation.ts

@@ -1,7 +1,11 @@
 import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
 import { In } from 'typeorm'
 import { BuildingInspection } from './building-inspection'
-import { NewBuildingInspection, UpdateBuildingInspection } from './building-inspection-type'
+import {
+  NewBuildingInspection,
+  UpdateBuildingInspectionDrawingMarker,
+  UpdateBuildingInspectionSubmitType
+} from './building-inspection-type'
 import { BuildingInspectionStatus } from './building-inspection'
 import { Checklist } from '../checklist/checklist'
 import { ChecklistItem } from '../checklist-item/checklist-item'
@@ -67,10 +71,98 @@ export class BuildingInspectionMutation {
     return result
   }
 
+  // 검측 상태 변경 & 체크리스트 갱신
+  @Directive('@transaction')
+  @Mutation(returns => Boolean, { description: 'To create Building Inspection And Checklist information' })
+  async updateBuildingInspectionChecklist(
+    @Arg('buildingInspection') buildingInspection: UpdateBuildingInspectionSubmitType,
+    @Ctx() context: ResolverContext
+  ): Promise<boolean> {
+    const { user, tx } = context.state
+    const { id: buildingInspectionId, checklist, checklistItem } = buildingInspection
+    const buildingInspectionRepo = tx.getRepository(BuildingInspection)
+    const checklistRepo = tx.getRepository(Checklist)
+    const checklistItemRepo = tx.getRepository(ChecklistItem)
+    const oldBuildingInspection = await buildingInspectionRepo.findOneBy({ id: buildingInspectionId })
+    const status = oldBuildingInspection.status
+    const isConstructor: boolean = status == BuildingInspectionStatus.WAIT || status == BuildingInspectionStatus.FAIL
+    let inspectionStatus = null
+
+    // 1. 벨리데이션
+    if (!buildingInspectionId) throw new Error('검측 아이디가 없습니다.')
+    if (!status) throw new Error('검측 상태가 없습니다.')
+    if (status == BuildingInspectionStatus.PASS) throw new Error('검측 상태가 수정할 수 있는 상태가 아닙니다.')
+
+    if (isConstructor) {
+      // 시공자 타입별 밸리데이션
+      if (checklistItem.length !== checklistItem.filter(v => v.constructionConfirmStatus).length) {
+        throw new Error('아이템을 모두 체크해야 합니다.')
+      }
+      if (!checklist.overallConstructorSignature) throw new Error('총괄 시공책임자 사인이 없습니다.')
+      if (!checklist.taskConstructorSignature) throw new Error('공종별 시공관리자	사인이 없습니다.')
+
+      // 시공자 상태 데이터
+      const isPassed = checklistItem.length === checklistItem.filter(v => v.constructionConfirmStatus === 'T').length
+      inspectionStatus = isPassed ? BuildingInspectionStatus.REQUEST : BuildingInspectionStatus.FAIL
+      // 시공자가 검측 요청시 검측자 사인은 초기화
+      if (inspectionStatus === BuildingInspectionStatus.REQUEST) {
+        checklist.overallSupervisorySignature = null
+        checklist.taskSupervisorySignature = null
+      }
+    } else {
+      // 감리자 타입별 밸리데이션
+      if (checklistItem.length !== checklistItem.filter(v => v.supervisoryConfirmStatus).length) {
+        throw new Error('아이템을 모두 체크해야 합니다.')
+      }
+      if (!checklist.overallSupervisorySignature) throw new Error('총괄 감리책임자 사인이 없습니다.')
+      if (!checklist.taskSupervisorySignature) throw new Error('공종별 감리 책임자 사인이 없습니다.')
+
+      // 감리자 상태 데이터
+      const isPassed = checklistItem.length === checklistItem.filter(v => v.supervisoryConfirmStatus === 'T').length
+      inspectionStatus = isPassed ? BuildingInspectionStatus.PASS : BuildingInspectionStatus.FAIL
+      // 감리사가 검측 불합격으로 재검측 요청시 시공자 사인은 초기화
+      if (inspectionStatus === BuildingInspectionStatus.FAIL) {
+        checklist.overallConstructorSignature = null
+        checklist.taskConstructorSignature = null
+      }
+    }
+
+    // 2. buildingInspection 저장
+    await buildingInspectionRepo.save({
+      ...oldBuildingInspection,
+      status: inspectionStatus,
+      updater: user
+    })
+
+    // 3. checklist 저장
+    const oldChecklist = await checklistRepo.findOneBy({ id: checklist.id })
+    const inspectionDateField = isConstructor ? 'constructionInspectionDate' : 'supervisorInspectionDate'
+    await checklistRepo.save({
+      ...oldChecklist,
+      [inspectionDateField]: new Date(),
+      overallConstructorSignature: checklist.overallConstructorSignature,
+      taskConstructorSignature: checklist.taskConstructorSignature,
+      overallSupervisorySignature: checklist.overallSupervisorySignature,
+      taskSupervisorySignature: checklist.taskSupervisorySignature,
+      updater: user
+    })
+
+    // 4. checklistItem 저장
+    for (let item of checklistItem) {
+      const confirmStatusField = isConstructor ? 'constructionConfirmStatus' : 'supervisoryConfirmStatus'
+      await checklistItemRepo.update(item.id, {
+        [confirmStatusField]: item[confirmStatusField],
+        updater: user
+      })
+    }
+
+    return true
+  }
+
   @Directive('@transaction')
   @Mutation(returns => BuildingInspection, { description: 'To update Building Inspection information' })
   async updateBuildingInspection(
-    @Arg('patch') patch: UpdateBuildingInspection,
+    @Arg('patch') patch: UpdateBuildingInspectionDrawingMarker,
     @Ctx() context: ResolverContext
   ): Promise<BuildingInspection> {
     const { user, tx } = context.state
@@ -95,7 +187,7 @@ export class BuildingInspectionMutation {
     @Arg('ids', type => [String]) ids: string[],
     @Ctx() context: ResolverContext
   ): Promise<boolean> {
-    const { domain, tx } = context.state
+    const { tx } = context.state
     const buildingInspectionRepository = tx.getRepository(BuildingInspection)
     const checklistRepository = tx.getRepository(Checklist)
     const checklistItemRepository = tx.getRepository(ChecklistItem)

package/server/service/building-inspection/building-inspection-type.ts

@@ -1,5 +1,5 @@
 import { ObjectType, Field, InputType, Int, ID } from 'type-graphql'
-import { BuildingInspection } from './building-inspection'
+import { BuildingInspection, BuildingInspectionStatus } from './building-inspection'
 
 @InputType()
 class ChecklistInputType {
@@ -50,7 +50,48 @@ export class NewBuildingInspection {
 }
 
 @InputType()
-export class UpdateBuildingInspection {
+class ChecklistSubmitInputType {
+  @Field({ nullable: false })
+  id: string
+
+  @Field({ nullable: true })
+  overallConstructorSignature?: string
+
+  @Field({ nullable: true })
+  taskConstructorSignature?: string
+
+  @Field({ nullable: true })
+  overallSupervisorySignature?: string
+
+  @Field({ nullable: true })
+  taskSupervisorySignature?: string
+}
+
+@InputType()
+class ChecklistItemSubmitInputType {
+  @Field({ nullable: false })
+  id: string
+
+  @Field({ nullable: true })
+  constructionConfirmStatus?: string
+
+  @Field({ nullable: true })
+  supervisoryConfirmStatus?: string
+}
+
+@InputType()
+export class UpdateBuildingInspectionSubmitType {
+  @Field({ nullable: false })
+  id: string
+
+  @Field(type => ChecklistSubmitInputType, { nullable: false })
+  checklist: ChecklistSubmitInputType
+
+  @Field(type => [ChecklistItemSubmitInputType], { nullable: false })
+  checklistItem: ChecklistItemSubmitInputType[]
+}
+@InputType()
+export class UpdateBuildingInspectionDrawingMarker {
   @Field({ nullable: false })
   id: string
 

package/server/service/checklist/checklist-history.ts

@@ -46,11 +46,11 @@ export class ChecklistHistory implements HistoryEntityInterface<Checklist> {
 
   @Column({ nullable: true, comment: '시공자 점검일' })
   @Field({ nullable: true })
-  constructionInsprctionDate?: Date
+  constructionInspectionDate?: Date
 
   @Column({ nullable: true, comment: '감리자 점검일' })
   @Field({ nullable: true })
-  supervisorInsprctionDate?: Date
+  supervisorInspectionDate?: Date
 
   @Column({ nullable: true, comment: '총괄 시공 책임자 사인' })
   @Field({ nullable: true })
@@ -76,7 +76,7 @@ export class ChecklistHistory implements HistoryEntityInterface<Checklist> {
   @Field(type => User, { nullable: true })
   creator?: User
 
-  @RelationId((checklist: Checklist) => checklist.creator)
+  @RelationId((checklistHistory: ChecklistHistory) => checklistHistory.creator)
   creatorId?: string
 
   @HistoryOriginalIdColumn()

package/server/service/checklist/checklist.ts

@@ -58,11 +58,11 @@ export class Checklist {
 
   @Column({ nullable: true, comment: '시공자 점검일' })
   @Field({ nullable: true })
-  constructionInsprctionDate?: Date
+  constructionInspectionDate?: Date
 
   @Column({ nullable: true, comment: '감리자 점검일' })
   @Field({ nullable: true })
-  supervisorInsprctionDate?: Date
+  supervisorInspectionDate?: Date
 
   @Column({ nullable: true, comment: '총괄 시공 책임자 사인' })
   @Field({ nullable: true })

package/server/service/index.ts

@@ -27,7 +27,7 @@ import {
   resolvers as SupervisorResolvers,
   subscribers as SupervisorSubscribers
 } from './supervisor'
-import { entities as ChecklistEntities, resolvers as ChecklistResolvers } from './checklist'
+import { entities as ChecklistEntities, resolvers as ChecklistResolvers, subscribers as ChecklistSubscribers } from './checklist'
 import { entities as ChecklistItemEntities, resolvers as ChecklistItemResolvers } from './checklist-item'
 import { entities as ChecklistTypeEntities, resolvers as ChecklistTypeResolvers } from './checklist-type'
 import { entities as ChecklistTemplateEntities, resolvers as ChecklistTemplateResolvers } from './checklist-template'
@@ -58,7 +58,8 @@ export const subscribers = [
   ...IssueSubscribers,
   ...ProjectReportSubscribers,
   ...SupervisorSubscribers,
-  ...BuildingInspectionSubscribers
+  ...BuildingInspectionSubscribers,
+  ...ChecklistSubscribers
 ]
 
 export const schema = {