@dssp/project 0.0.18 → 0.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dssp/project",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,7 +27,7 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@dssp/building-complex": "^0.0.18",
+    "@dssp/building-complex": "^0.0.19",
     "@operato/graphql": "^8.0.0-alpha",
     "@operato/shell": "^8.0.0-alpha",
     "@things-factory/auth-base": "^8.0.0-alpha",
@@ -38,5 +38,5 @@
     "@things-factory/shell": "^8.0.0-alpha",
     "exceljs": "^4.4.0"
   },
-  "gitHead": "91ab5e849f08f4a991f588be3e1f79b60a0e7ea7"
+  "gitHead": "a7d5da01e7a8920b9eb9c4f9340a4eb5ebdb12f9"
 }

package/server/migrations/1723861478420-seed-/bsample-project.ts

@@ -4,7 +4,7 @@ import { logger } from '@things-factory/env'
 import { Domain, getRepository } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { BuildingComplex } from '@dssp/building-complex'
-import { Project, ProjectStatus } from '../service/project/project'
+import { Project, ProjectState } from '../service/project/project'
 
 const SEED_SAMPLE_BUILDING_COMPLEX = {
   address: '서울시 마포구 공덕동 아파트 17번지',
@@ -26,7 +26,7 @@ const SEED_SAMPLE_BUILDING_COMPLEX = {
 
 const SEED_SAMPLE_PROJECT = {
   name: '서울시 마포구 공덕동 아파트 신축공사',
-  state: ProjectStatus.ONGOING,
+  state: ProjectState.ONGOING,
   startDate: '2024-01-01',
   endDate: '2025-12-31',
   totalProgress: 40,

package/server/service/project/project-mutation.ts

@@ -1,7 +1,7 @@
 import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
 import { In } from 'typeorm'
 import { createAttachment, deleteAttachmentsByRef, ATTACHMENT_PATH } from '@things-factory/attachment-base'
-import { Project } from './project'
+import { Project, ProjectState } from './project'
 import { NewProject, ProjectPatch } from './project-type'
 import { BuildingComplex, Building, BuildingLevel } from '@dssp/building-complex'
 import { pdfToImage } from '@things-factory/board-service/dist-server/controllers/headless-pdf-to-image'
@@ -45,7 +45,8 @@ export class ProjectMutation {
     const buildings = project.buildingComplex?.buildings || []
 
     // 1. 프로젝트 수정
-    const projectResult = await projectRepo.save({ ...project, updater: user })
+    const projectState = project.totalProgress == 100 ? ProjectState.COMPLETED : ProjectState.ONGOING
+    const projectResult = await projectRepo.save({ ...project, state: projectState, updater: user })
 
     // 2. 단지 정보 수정
     await buildingComplexRepo.save({ ...buildingComplex, updater: user })
@@ -54,7 +55,7 @@ export class ProjectMutation {
     await createAttachmentAfterDelete(context, project?.mainPhotoUpload, project.id, Project.name)
 
     // 2-2. 단지 BIM 이미지 첨부파일 나머지 삭제 후 저장
-    await createAttachmentAfterDelete(context, buildingComplex?.drawingUpload, buildingComplex.id, BuildingComplex.name)
+    await createAttachmentAfterDelete(context, buildingComplex?.drawingUpload, buildingComplex.id, BuildingComplex.name + '_bim')
 
     // 3. 동의 층 정보가 바뀌었으면 층 초기화 후 다시 생성
     const originBuilding = await buildingRepo.findBy({ buildingComplex: { id: buildingComplex.id } }) // 이전 동 정보 가져오기

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

@@ -27,7 +27,7 @@ export class ProjectQuery {
       domain,
       params,
       repository: await getRepository(Project),
-      searchables: ['name', 'description']
+      searchables: ['name', 'description', 'state']
     })
 
     const [items, total] = await queryBuilder.getManyAndCount()

package/server/service/project/project.ts

@@ -20,7 +20,7 @@ import { Task } from '../task/task'
 import { BuildingComplex } from '@dssp/building-complex'
 import { Attachment } from '@things-factory/attachment-base'
 
-export enum ProjectStatus {
+export enum ProjectState {
   'ONGOING' = '10',
   'COMPLETED' = '20'
 }
@@ -44,9 +44,9 @@ export class Project {
   @Field({ nullable: false })
   name?: string
 
-  @Column({ nullable: false, default: ProjectStatus.ONGOING, comment: '프로젝트 상태 (10: 진행중, 20: 완료)' })
+  @Column({ nullable: false, default: ProjectState.ONGOING, comment: '프로젝트 상태 (10: 진행중, 20: 완료)' })
   @Field({ nullable: false })
-  state?: ProjectStatus
+  state?: ProjectState
 
   @Column({ type: 'date', nullable: true, comment: '착공일정' })
   @Field({ nullable: true })