@dssp/supervision 0.0.19 → 0.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dssp/supervision",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "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.19",
-    "@dssp/project": "^0.0.19",
+    "@dssp/building-complex": "^0.0.20",
+    "@dssp/project": "^0.0.20",
     "@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": "a7d5da01e7a8920b9eb9c4f9340a4eb5ebdb12f9"
+  "gitHead": "6c30a83bb7199f0478d4488b814c76725de3fc62"
 }

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

@@ -1,10 +1,8 @@
 import { Field, ID, ObjectType } from 'type-graphql'
 import { Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId } from 'typeorm'
-
 import { HistoryActionColumn, HistoryActionType, HistoryEntityInterface, HistoryOriginalIdColumn } from '@operato/typeorm-history'
 import { User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
-
 import { BuildingInspection, BuildingInspectionStatus } from './building-inspection'
 import { BuildingLevel } from '@dssp/building-complex'
 
@@ -36,9 +34,9 @@ export class BuildingInspectionHistory implements HistoryEntityInterface<Buildin
   @RelationId((buildingInspectionHistory: BuildingInspectionHistory) => buildingInspectionHistory.buildingLevel)
   buildingLevelId?: string
 
-  @Column({ nullable: false, comment: '검측 요청일' })
-  @Field({ nullable: true })
-  requestDate?: Date
+  @Column({ type: 'date', nullable: true, comment: '검측 요청일' })
+  @Field(type => String, { nullable: true })
+  requestDate?: string
 
   // 체크리스트 ID (1:1 테이블 참조)
   @Field({ nullable: true })

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

@@ -62,7 +62,6 @@ export class BuildingInspectionMutation {
     const result = await buildingInspectionRepository.save({
       status: BuildingInspectionStatus.WAIT,
       buildingLevel: { id: buildingLevelId },
-      requestDate: new Date(),
       checklist: savedChecklist,
       creator: user,
       updater: user

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

@@ -128,6 +128,33 @@ export class BuildingInspectionQuery {
     }
   }
 
+  // 층 별로 검수 개수 써머리
+  @Query(returns => [BuildingInspectionSummary]!, { nullable: true, description: 'To fetch a BuildingInspection Summary' })
+  async buildingInspectionDateSummaryOfLevelAndMonth(
+    @Arg('buildingLevelId') buildingLevelId: string,
+    @Arg('yearMonth') yearMonth: string,
+    @Ctx() context: ResolverContext
+  ): Promise<BuildingInspectionSummary[]> {
+    const [year, month] = yearMonth.split('-') // 'YYYY-MM' 형식에서 연도와 월 추출
+    const startDate = `${year}-${month}-01`
+    const endDate = new Date(Number(year), Number(month), 0).toISOString().split('T')[0] // 해당 월의 마지막 날짜 계산
+
+    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.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 })
+      .andWhere('bi.request_date BETWEEN :startDate AND :endDate', { startDate, endDate })
+      .groupBy('bi.building_level_id')
+      .addGroupBy('bi.request_date')
+      .getRawMany()
+
+    return buildingInspectionSummary
+  }
+
   // 층 별로 검수 개수 써머리
   @FieldResolver(type => BuildingInspectionSummary)
   async buildingInspectionSummary(@Root() buildingLevel: BuildingLevel): Promise<BuildingInspectionSummary> {
@@ -172,10 +199,10 @@ export class BuildingInspectionQuery {
       .getRawOne()
 
     return {
-      wait: result.wait || 0,
-      request: result.request || 0,
-      pass: result.pass || 0,
-      fail: result.fail || 0
+      wait: result?.wait || 0,
+      request: result?.request || 0,
+      pass: result?.pass || 0,
+      fail: result?.fail || 0
     }
   }
 

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

@@ -119,6 +119,9 @@ export class BuildingInspectionsOfBuildingLevel {
 
 @ObjectType()
 export class BuildingInspectionSummary {
+  @Field(type => String, { nullable: true, description: '요청일자' })
+  requestDate?: string
+
   @Field(type => Int, { description: '검측 대기 수' })
   wait: number
 

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

@@ -12,7 +12,6 @@ import {
   JoinColumn
 } from 'typeorm'
 import { ObjectType, Field, ID, registerEnumType } from 'type-graphql'
-
 import { User } from '@things-factory/auth-base'
 import { BuildingLevel } from '@dssp/building-complex'
 import { Checklist } from '../checklist/checklist'
@@ -53,9 +52,9 @@ export class BuildingInspection {
   @Field({ nullable: true })
   status?: BuildingInspectionStatus
 
-  @Column({ nullable: false, comment: '검측 요청일' })
-  @Field({ nullable: true })
-  requestDate?: Date
+  @Column({ type: 'date', default: () => 'CURRENT_DATE', nullable: true, comment: '검측 요청일' })
+  @Field(type => String, { nullable: true })
+  requestDate?: string
 
   @Column({ type: 'simple-json', nullable: true, comment: '도면 마커' })
   @Field(type => String, { nullable: true })

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

@@ -4,6 +4,7 @@ import { User } from '@things-factory/auth-base'
 import { Checklist } from './checklist'
 import { ChecklistList } from './checklist-type'
 import { ChecklistItem } from '../checklist-item/checklist-item'
+import { BuildingInspection } from '../building-inspection/building-inspection'
 
 @Resolver(Checklist)
 export class ChecklistQuery {
@@ -40,6 +41,11 @@ export class ChecklistQuery {
       .getMany()
   }
 
+  @FieldResolver(type => BuildingInspection)
+  async buildingInspection(@Root() checklist: Checklist): Promise<BuildingInspection> {
+    return await getRepository(BuildingInspection).findOneBy({ checklist: { id: checklist.id } })
+  }
+
   @FieldResolver(type => User)
   async updater(@Root() checklist: Checklist): Promise<User> {
     return await getRepository(User).findOneBy({ id: checklist.updaterId })

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

@@ -1,9 +1,9 @@
-import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
-import { Attachment } from '@things-factory/attachment-base'
-import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
+import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx } from 'type-graphql'
+import { getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { ChecklistTemplateItem } from './checklist-template-item'
 import { ChecklistTemplateItemList } from './checklist-template-item-type'
+import { ChecklistType } from '../checklist-type/checklist-type'
 
 @Resolver(ChecklistTemplateItem)
 export class ChecklistTemplateItemQuery {
@@ -27,6 +27,11 @@ export class ChecklistTemplateItemQuery {
     return { items, total }
   }
 
+  @FieldResolver(type => String)
+  async detailTypeName(@Root() checklistTemplateItem: ChecklistTemplateItem): Promise<string> {
+    return (await getRepository(ChecklistType).findOneBy({ id: checklistTemplateItem.detailType }))?.detailType || ''
+  }
+
   @FieldResolver(type => User)
   async updater(@Root() checklistTemplateItem: ChecklistTemplateItem): Promise<User> {
     return await getRepository(User).findOneBy({ id: checklistTemplateItem.updaterId })

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

@@ -9,6 +9,7 @@ import { ChecklistTypeMainType } from '../checklist-type/checklist-type'
 @Index('ix_checklist_template_item_0', (checklistTemplateItem: ChecklistTemplateItem) => [checklistTemplateItem.name], {
   unique: true
 })
+@Index('ix_checklist_template_item_1', (checklistTemplateItem: ChecklistTemplateItem) => [checklistTemplateItem.detailType])
 @ObjectType()
 export class ChecklistTemplateItem {
   @PrimaryGeneratedColumn('uuid')
@@ -31,7 +32,7 @@ export class ChecklistTemplateItem {
   @Field({ nullable: false })
   mainType: ChecklistTypeMainType
 
-  @Column({ nullable: false, comment: '상세 구분' })
+  @Column({ nullable: false, comment: '상세 구분 ID (F.K)' })
   @Field({ nullable: false })
   detailType: string