@dssp/supervision 0.0.34 → 0.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dssp/supervision",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,9 +27,9 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@dssp/building-complex": "^0.0.34",
-    "@dssp/drawing": "^0.0.34",
-    "@dssp/project": "^0.0.34",
+    "@dssp/building-complex": "^0.0.36",
+    "@dssp/drawing": "^0.0.36",
+    "@dssp/project": "^0.0.36",
     "@operato/event-view": "^8.0.0-alpha",
     "@operato/graphql": "^8.0.0-alpha",
     "@operato/image-marker": "^8.0.0-alpha",
@@ -39,5 +39,5 @@
     "@things-factory/auth-base": "^8.0.0-alpha",
     "@things-factory/shell": "^8.0.0-alpha"
   },
-  "gitHead": "2637357c7281ae2080ba8223b659780a8f808757"
+  "gitHead": "07e0389d1068f9bd054d1e054d0ee2e5e88a65f2"
 }

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

@@ -197,6 +197,12 @@ export class BuildingInspectionMutation {
     if (!patch.id) throw new Error('검측 아이디가 없습니다.')
 
     const buildingInspection = await buildingInspectionRepo.findOneBy({ id: patch.id })
+
+    // 완료 상태인 검측데이터면 삭제 못함
+    if (buildingInspection.status === BuildingInspectionStatus.PASS) {
+      throw new Error('완료 상태인 검측정보를 변경할 수 없습니다.')
+    }
+
     const result = await buildingInspectionRepo.save({
       ...buildingInspection,
       ...patch,
@@ -217,8 +223,14 @@ export class BuildingInspectionMutation {
     const checklistRepository = tx.getRepository(Checklist)
     const checklistItemRepository = tx.getRepository(ChecklistItem)
 
-    // 검측 데이터 제거
     const buildingInspections = await buildingInspectionRepository.createQueryBuilder('bi').whereInIds(ids).getMany()
+
+    // 완료 상태인 검측데이터가 한개라도 있으면 삭제 못함
+    if (buildingInspections.filter(bi => bi.status === BuildingInspectionStatus.PASS).length > 0) {
+      throw new Error('완료 상태인 검측정보를 변경할 수 없습니다.')
+    }
+
+    // 검측 데이터 제거
     await buildingInspectionRepository.softDelete({
       id: In(ids)
     })

package/server/service/checklist-item/checklist-item-query.ts

@@ -1,17 +1,16 @@
-import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
+import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx } from 'type-graphql'
 import { Attachment } from '@things-factory/attachment-base'
-import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
+import { getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { ChecklistItem } from './checklist-item'
 import { ChecklistItemList } from './checklist-item-type'
 import { ChecklistItemComment } from '../checklist-item-comment/checklist-item-comment'
+import { BuildingInspection } from '../building-inspection/building-inspection'
 
 @Resolver(ChecklistItem)
 export class ChecklistItemQuery {
   @Query(returns => ChecklistItem!, { nullable: true, description: 'To fetch a ChecklistItem' })
   async checklistItem(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<ChecklistItem> {
-    const { domain } = context.state
-
     return await getRepository(ChecklistItem).findOne({
       where: { id }
     })
@@ -19,8 +18,6 @@ export class ChecklistItemQuery {
 
   @Query(returns => ChecklistItemList, { description: 'To fetch multiple ChecklistItems' })
   async checklistItems(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ChecklistItemList> {
-    const { domain } = context.state
-
     const queryBuilder = getQueryBuilderFromListParams({
       params,
       repository: await getRepository(ChecklistItem),
@@ -32,6 +29,16 @@ export class ChecklistItemQuery {
     return { items, total }
   }
 
+  @Query(returns => BuildingInspection, { description: 'BuildingInspection By ChecklistItemId' })
+  async inspectionByChecklistItemId(checklistItemId: string): Promise<BuildingInspection> {
+    return getRepository(BuildingInspection)
+      .createQueryBuilder('bi')
+      .innerJoin('checklists', 'c', 'bi.checklist_id = c.id')
+      .innerJoin('checklist_items', 'ci', 'c.id = ci.checklist_id')
+      .where('ci.id = :checklistItemId', { checklistItemId })
+      .getOne()
+  }
+
   @FieldResolver(type => [ChecklistItemComment])
   async checklistItemComments(@Root() checklistItem: ChecklistItem): Promise<ChecklistItemComment[]> {
     return await getRepository(ChecklistItemComment).findBy({ checklistItem: { id: checklistItem.id } })

package/server/service/checklist-item-comment/checklist-item-comment-mutation.ts

@@ -2,6 +2,8 @@ import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
 import { getRepository } from '@things-factory/shell'
 import { ChecklistItemComment } from './checklist-item-comment'
 import { NewChecklistItemComment, ChecklistItemCommentPatch } from './checklist-item-comment-type'
+import { BuildingInspectionStatus } from '../building-inspection/building-inspection'
+import { ChecklistItemQuery } from '../checklist-item/checklist-item-query'
 
 @Resolver(ChecklistItemComment)
 export class ChecklistItemCommentMutation {
@@ -14,6 +16,13 @@ export class ChecklistItemCommentMutation {
     const { user, tx } = context.state
     const { comment, checklistItemId } = checklistItemComment
 
+    // 합격 상태인지 체크
+    const checklistItemQuery = new ChecklistItemQuery()
+    const inspection = await checklistItemQuery.inspectionByChecklistItemId(checklistItemId)
+    if (inspection.status === BuildingInspectionStatus.PASS) {
+      throw new Error('완료 상태인 검측정보를 변경할 수 없습니다.')
+    }
+
     const result = await getRepository(ChecklistItemComment, tx).save({
       comment,
       checklistItem: { id: checklistItemId },
@@ -52,8 +61,19 @@ export class ChecklistItemCommentMutation {
   @Mutation(returns => Boolean, { description: 'To delete ChecklistItemComment' })
   async deleteChecklistItemComment(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { tx } = context.state
+    const repository = getRepository(ChecklistItemComment, tx)
+    const checklistItemComment = await repository.findOne({
+      where: { id }
+    })
+
+    // 합격 상태인지 체크
+    const checklistItemQuery = new ChecklistItemQuery()
+    const inspection = await checklistItemQuery.inspectionByChecklistItemId(checklistItemComment.checklistItemId)
+    if (inspection.status === BuildingInspectionStatus.PASS) {
+      throw new Error('완료 상태인 검측정보를 변경할 수 없습니다.')
+    }
 
-    await getRepository(ChecklistItemComment, tx).softDelete({ id })
+    await repository.softDelete({ id })
 
     return true
   }