@dssp/supervision 0.0.24 → 0.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dssp/supervision",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "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.24",
-    "@dssp/project": "^0.0.24",
+    "@dssp/building-complex": "^0.0.26",
+    "@dssp/project": "^0.0.26",
     "@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": "534da1901bb069b633bb2aa390817724cc542a6f"
+  "gitHead": "240bdb67cf79bb5d922fc082db3d84f6e3cc488c"
 }

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

@@ -22,7 +22,11 @@ export class BuildingInspectionHistory implements HistoryEntityInterface<Buildin
   @HistoryOriginalIdColumn()
   public originalId!: string
 
-  @Column({ nullable: false, comment: '상태(REQUEST: 요청, PASS: 합격, FAIL: 불합격)' })
+  @Column({
+    nullable: false,
+    comment:
+      '상태(WAIT: 검측 대기, OVERALL_WAIT: 총괄자 검측 대기, REQUEST: 검측 요청, OVERALL_REQUEST: 총괄자 검측 요청, PASS: 합격, FAIL: 불합격)'
+  })
   @Field({ nullable: true })
   status?: BuildingInspectionStatus
 

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

@@ -84,7 +84,10 @@ export class BuildingInspectionMutation {
     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
+    const isConstructor: boolean =
+      status == BuildingInspectionStatus.WAIT ||
+      status == BuildingInspectionStatus.OVERALL_WAIT ||
+      status == BuildingInspectionStatus.FAIL
     let inspectionStatus = null
 
     // 1. 벨리데이션
@@ -97,14 +100,27 @@ export class BuildingInspectionMutation {
       if (checklistItem.length !== checklistItem.filter(v => v.constructionConfirmStatus).length) {
         throw new Error('아이템을 모두 체크해야 합니다.')
       }
-      if (!checklist.overallConstructorSignature) throw new Error('총괄 시공책임자 사인이 없습니다.')
-      if (!checklist.taskConstructorSignature) throw new Error('공종별 시공관리자	사인이 없습니다.')
+      if (status == BuildingInspectionStatus.OVERALL_WAIT && !checklist.overallConstructorSignature) {
+        throw new Error('총괄 시공책임자 사인이 없습니다.')
+      }
+      if (status == BuildingInspectionStatus.WAIT && !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) {
+
+      if (!isPassed) {
+        // 1. 검측이 불햡격 = 상태는 불합격으로, 시공자 싸인은 모두 초기화
+        inspectionStatus = BuildingInspectionStatus.FAIL
+        checklist.overallConstructorSignature = null
+        checklist.taskConstructorSignature = null
+      } else if (isPassed && (status === BuildingInspectionStatus.WAIT || status === BuildingInspectionStatus.FAIL)) {
+        // 2. 검측이 합격이면서 공종 시공자 스탭 = 상태는 총괄 시공자 스탭으로
+        inspectionStatus = BuildingInspectionStatus.OVERALL_WAIT
+      } else if (isPassed && status === BuildingInspectionStatus.OVERALL_WAIT) {
+        // 3. 검측이 합격이면서 총괄 시공자 스탭 = 상태는 공종 감리자 스탭으로, 감리자 싸인은 모두 초기화
+        inspectionStatus = BuildingInspectionStatus.REQUEST
         checklist.overallSupervisorySignature = null
         checklist.taskSupervisorySignature = null
       }
@@ -113,16 +129,26 @@ export class BuildingInspectionMutation {
       if (checklistItem.length !== checklistItem.filter(v => v.supervisoryConfirmStatus).length) {
         throw new Error('아이템을 모두 체크해야 합니다.')
       }
-      if (!checklist.overallSupervisorySignature) throw new Error('총괄 감리책임자 사인이 없습니다.')
-      if (!checklist.taskSupervisorySignature) throw new Error('공종별 감리 책임자 사인이 없습니다.')
+      if (status == BuildingInspectionStatus.OVERALL_REQUEST && !checklist.overallSupervisorySignature) {
+        throw new Error('총괄 감리책임자 사인이 없습니다.')
+      }
+      if (status == BuildingInspectionStatus.REQUEST && !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) {
+      if (!isPassed) {
+        // 1. 검측이 불햡격 = 상태는 불합격으로, 시공자 싸인은 모두 초기화
+        inspectionStatus = BuildingInspectionStatus.FAIL
         checklist.overallConstructorSignature = null
         checklist.taskConstructorSignature = null
+      } else if (isPassed && status === BuildingInspectionStatus.REQUEST) {
+        // 2. 검측이 합격이면서 공종 감리자 스탭 = 상태는 총괄 감리자 스탭으로
+        inspectionStatus = BuildingInspectionStatus.OVERALL_REQUEST
+      } else if (isPassed && status === BuildingInspectionStatus.OVERALL_REQUEST) {
+        // 3. 검측이 합격이면서 총괄 감리자 스탭 = 상태는 합격으로
+        inspectionStatus = BuildingInspectionStatus.PASS
       }
     }
 

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

@@ -112,8 +112,12 @@ export class BuildingInspectionQuery {
   ): Promise<BuildingInspectionSummary> {
     const buildingInspectionSummary = await getRepository(BuildingInspection)
       .createQueryBuilder('bi')
-      .select(`COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.WAIT}' THEN 1 ELSE NULL END) AS wait`)
-      .addSelect(`COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.REQUEST}' THEN 1 ELSE NULL END) AS request`)
+      .select(
+        `COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.WAIT}' OR bi.status='${BuildingInspectionStatus.OVERALL_WAIT}' THEN 1 ELSE NULL END) AS wait`
+      )
+      .addSelect(
+        `COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.REQUEST}' OR bi.status='${BuildingInspectionStatus.OVERALL_REQUEST}' THEN 1 ELSE NULL END) AS request`
+      )
       .addSelect(`COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.PASS}' THEN 1 ELSE NULL END) AS pass`)
       .addSelect(`COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.FAIL}' THEN 1 ELSE NULL END) AS fail`)
       .where('bi.building_level_id = :buildingLevelId', { buildingLevelId })
@@ -139,8 +143,12 @@ export class BuildingInspectionQuery {
     const buildingInspectionSummary = await getRepository(BuildingInspection)
       .createQueryBuilder('bi')
       .select(`TO_CHAR(bi.request_date, 'YYYY-MM-DD') AS "requestDate"`)
-      .addSelect(`COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.WAIT}' THEN 1 ELSE NULL END) AS wait`)
-      .addSelect(`COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.REQUEST}' THEN 1 ELSE NULL END) AS request`)
+      .addSelect(
+        `COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.WAIT}' OR bi.status='${BuildingInspectionStatus.OVERALL_WAIT}' THEN 1 ELSE NULL END) AS wait`
+      )
+      .addSelect(
+        `COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.REQUEST}' OR bi.status='${BuildingInspectionStatus.OVERALL_REQUEST}' THEN 1 ELSE NULL END) AS request`
+      )
       .addSelect(`COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.PASS}' THEN 1 ELSE NULL END) AS pass`)
       .addSelect(`COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.FAIL}' THEN 1 ELSE NULL END) AS fail`)
       .where('bi.building_level_id = :buildingLevelId', { buildingLevelId })
@@ -157,8 +165,12 @@ export class BuildingInspectionQuery {
   async buildingInspectionSummary(@Root() buildingLevel: BuildingLevel): Promise<BuildingInspectionSummary> {
     const buildingInspectionSummary = await getRepository(BuildingInspection)
       .createQueryBuilder('bi')
-      .select(`COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.WAIT}' THEN 1 ELSE NULL END) AS wait`)
-      .addSelect(`COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.REQUEST}' THEN 1 ELSE NULL END) AS request`)
+      .select(
+        `COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.WAIT}' OR bi.status='${BuildingInspectionStatus.OVERALL_WAIT}' THEN 1 ELSE NULL END) AS wait`
+      )
+      .addSelect(
+        `COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.REQUEST}' OR bi.status='${BuildingInspectionStatus.OVERALL_REQUEST}' THEN 1 ELSE NULL END) AS request`
+      )
       .addSelect(`COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.PASS}' THEN 1 ELSE NULL END) AS pass`)
       .addSelect(`COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.FAIL}' THEN 1 ELSE NULL END) AS fail`)
       .where('bi.building_level_id = :buildingLevelId', { buildingLevelId: buildingLevel.id })
@@ -182,8 +194,12 @@ export class BuildingInspectionQuery {
 
     const result = await getRepository(Project)
       .createQueryBuilder('p')
-      .select(`COUNT(CASE WHEN bi.status = '${BuildingInspectionStatus.WAIT}' THEN 1 ELSE NULL END) AS wait`)
-      .addSelect(`COUNT(CASE WHEN bi.status = '${BuildingInspectionStatus.REQUEST}' THEN 1 ELSE NULL END) AS request`)
+      .select(
+        `COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.WAIT}' OR bi.status='${BuildingInspectionStatus.OVERALL_WAIT}' THEN 1 ELSE NULL END) AS wait`
+      )
+      .addSelect(
+        `COUNT(CASE WHEN bi.status='${BuildingInspectionStatus.REQUEST}' OR bi.status='${BuildingInspectionStatus.OVERALL_REQUEST}' THEN 1 ELSE NULL END) AS request`
+      )
       .addSelect(`COUNT(CASE WHEN bi.status = '${BuildingInspectionStatus.PASS}' THEN 1 ELSE NULL END) AS pass`)
       .addSelect(`COUNT(CASE WHEN bi.status = '${BuildingInspectionStatus.FAIL}' THEN 1 ELSE NULL END) AS fail`)
       .innerJoin('p.buildingComplex', 'bc')

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

@@ -1,5 +1,5 @@
-import { ObjectType, Field, InputType, Int, ID } from 'type-graphql'
-import { BuildingInspection, BuildingInspectionStatus } from './building-inspection'
+import { ObjectType, Field, InputType, Int } from 'type-graphql'
+import { BuildingInspection } from './building-inspection'
 
 @InputType()
 class ChecklistInputType {

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

@@ -18,7 +18,9 @@ import { Checklist } from '../checklist/checklist'
 
 export enum BuildingInspectionStatus {
   WAIT = 'WAIT',
+  OVERALL_WAIT = 'OVERALL_WAIT',
   REQUEST = 'REQUEST',
+  OVERALL_REQUEST = 'OVERALL_REQUEST',
   PASS = 'PASS',
   FAIL = 'FAIL'
 }
@@ -46,8 +48,9 @@ export class BuildingInspection {
 
   @Column({
     nullable: false,
-    comment: '상태(WAIT: 검측 대기, REQUEST: 검측 요청, PASS: 합격, FAIL: 불합격)',
-    default: 'WAIT'
+    comment:
+      '상태(WAIT: 검측 대기, OVERALL_WAIT: 총괄자 검측 대기, REQUEST: 검측 요청, OVERALL_REQUEST: 총괄자 검측 요청, PASS: 합격, FAIL: 불합격)',
+    default: BuildingInspectionStatus.WAIT
   })
   @Field({ nullable: true })
   status?: BuildingInspectionStatus