@dssp/project 0.0.30 → 0.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dssp/project",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "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.30",
+    "@dssp/building-complex": "^0.0.32",
     "@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": "1091ab6303e2995122bfa3acf7a7a0988e8bc5cc"
+  "gitHead": "e69c41de325f16b46022d7f41e9ae1a4723af0b0"
 }

package/server/controllers/import-task.ts

@@ -4,23 +4,15 @@ import { Project } from '../service/project/project'
 import { Task, TaskType } from '../service/task/task'
 import { TaskResource } from '../service/task-resource/task-resource'
 import { Resource } from '../service/resource/resource'
+import { RawTask } from './types'
 
-export interface RawResource {
-  type: string
-  allocated: number
-}
+function excelSerialToJSDate(serial) {
+  const excelEpoch = new Date(1899, 11, 30) // Excel epoch (30th December 1899)
+  const days = Math.floor(serial) // Get the number of days
+  const milliseconds = (serial - days) * 86400 * 1000 // Convert the fractional day part to milliseconds
 
-export interface RawTask {
-  code: string
-  title: string
-  type?: TaskType
-  duration?: number
-  startDate?: string /* YYYY-MM-DD */
-  dependsOn?: string
-  progress?: number
-  tags?: string[]
-  resources?: RawResource[]
-  children?: RawTask[]
+  const jsDate = new Date(excelEpoch.getTime() + days * 86400 * 1000 + milliseconds)
+  return jsDate
 }
 
 export async function importTasks(project: Project, tasks: RawTask[], context: ResolverContext) {
@@ -34,7 +26,6 @@ export async function importTasks(project: Project, tasks: RawTask[], context: R
   await taskRepository.softDelete({ project: { id: project.id } })
 
   // 2. 태스크 임포트
-
   const importTaskData = async (rawTask: RawTask, parent?: Task) => {
     if (rawTask.children && rawTask.children.length > 0) {
       rawTask.type = TaskType.GROUP
@@ -49,27 +40,31 @@ export async function importTasks(project: Project, tasks: RawTask[], context: R
 
     if (rawTask.type == TaskType.TASK) {
       // 시작일, 종료일 계산
-      var startDate: Date | undefined = rawTask.startDate ? new Date(rawTask.startDate) : undefined
+      var startDate: Date = new Date(rawTask.startDate)
+
+      var endDate
       if (!startDate && rawTask.dependsOn) {
         const dependsOnTask = await taskRepository.findOne({ where: { code: rawTask.dependsOn, project: { id: project.id } } })
-        if (!dependsOnTask || !dependsOnTask.endDate) {
-          throw new Error(`Task '${rawTask.code}' depends on a task '${rawTask.dependsOn}' that doesn't have a valid end date.`)
+        if (dependsOnTask && dependsOnTask.endDate) {
+          startDate = new Date(dependsOnTask.endDate)
+          startDate.setDate(startDate.getDate() + 1)
+        } else {
+          // TODO handler error
+          // throw new Error(`Task '${rawTask.code}' depends on a task '${rawTask.dependsOn}' that doesn't have a valid end date.`)
         }
-        startDate = new Date(dependsOnTask.endDate)
-        startDate.setDate(startDate.getDate() + 1)
       }
 
       if (!startDate) {
         throw new Error(`Task '${rawTask.code}' must have either a start date or a valid dependency.`)
       }
 
-      var duration = rawTask.duration
-      var endDate = new Date(startDate)
+      const duration = rawTask.duration
+      endDate = new Date(startDate)
       endDate.setDate(startDate.getDate() + duration - 1)
     }
 
     // 태스크 생성 및 저장
-    var task = await taskRepository.save({
+    var task: Task = await taskRepository.save({
       code: rawTask.code,
       name: rawTask.title,
       type: rawTask.type,
@@ -77,10 +72,11 @@ export async function importTasks(project: Project, tasks: RawTask[], context: R
       endDate,
       project,
       parent,
-      duration,
+      duration: rawTask.duration,
       dependsOn: rawTask.dependsOn,
       progress: rawTask.progress,
       tags: rawTask.tags,
+      style: rawTask.style,
       updater: user,
       creator: user
     })
@@ -102,9 +98,9 @@ export async function importTasks(project: Project, tasks: RawTask[], context: R
     }
 
     // 자식 태스크 처리
-    if (rawTask.children) {
-      var lastEndDate = null
-      var lastStartDate = null
+    if (rawTask.children && rawTask.children.length > 0) {
+      let lastEndDate = null
+      let lastStartDate = null
       for (const childTask of rawTask.children) {
         const subtask = await importTaskData(childTask, task)
 
@@ -118,9 +114,7 @@ export async function importTasks(project: Project, tasks: RawTask[], context: R
           ? Math.ceil((lastEndDate.getTime() - lastStartDate.getTime()) / (1000 * 60 * 60 * 24)) + 1
           : 0
 
-      task = (await taskRepository.findOne({
-        where: { id: task.id }
-      })) as any
+      task = await taskRepository.findOne({ where: { id: task.id } })
 
       return await taskRepository.save({
         ...task,

package/server/controllers/parse-excel.ts

@@ -0,0 +1,86 @@
+import ExcelJS from 'exceljs'
+import { RawTask } from './types'
+import { Project } from '../service/project/project'
+import { importTasks } from './import-task'
+
+export async function parseExcelAndImportTasks(buffer: Buffer, project: Project, context: ResolverContext) {
+  // 1. 엑셀 파일을 읽어들입니다.
+  const workbook = new ExcelJS.Workbook()
+  await workbook.xlsx.load(buffer)
+
+  // 2. 첫 번째 워크시트를 가져옵니다.
+  const worksheet = workbook.getWorksheet(1) // Index or sheet name can be used
+
+  // 3. 첫 번째 row를 header로 사용합니다.
+  const headers: string[] = []
+  let taskCodeColumnIndex = -1
+
+  const headerRow = worksheet.getRow(1)
+  headerRow.eachCell((cell, colNumber) => {
+    const headerText = cell.text.toString()
+    headers[colNumber - 1] = headerText // Store headers in an array
+
+    if (headerText === '작업코드') {
+      taskCodeColumnIndex = colNumber // Store the column index for "작업코드"
+    }
+  })
+
+  if (taskCodeColumnIndex === -1) {
+    throw new Error('작업코드 column not found')
+  }
+
+  // 4. 엑셀 데이터를 RawTask 형식으로 변환합니다.
+  const tasks: RawTask[] = []
+
+  // Start processing from the second row onward to skip the header
+  for (let rowIndex = 2; rowIndex <= worksheet.rowCount; rowIndex++) {
+    const row = worksheet.getRow(rowIndex)
+    const taskData: any = {}
+
+    row.eachCell((cell, colNumber) => {
+      const header = headers[colNumber - 1]
+
+      // Check if the cell has a formula(or sharedFormula) and use the formula result
+      let cellValue: any = cell.value
+      if (cellValue && typeof cellValue === 'object' && ('formula' in cellValue || 'sharedFormula' in cellValue)) {
+        // Cell contains a formula, use the calculated result if available
+        cellValue = cellValue.result ?? cellValue.value // Use the result, or fallback to value if result is not calculated
+      }
+
+      taskData[header] = cellValue
+    })
+
+    const taskCodeCell = row.getCell(taskCodeColumnIndex)
+    let bgColor = '#FFFFFF'
+    const fill = taskCodeCell.style.fill
+
+    if (fill && fill.type === 'pattern' && fill.pattern === 'solid') {
+      const fgColor = fill.fgColor
+      if (fgColor && fgColor.argb) {
+        // ARGB is a color in the format AARRGGBB, remove the alpha channel (first two characters)
+        bgColor = `#${fgColor.argb.slice(2)}`
+      }
+    }
+
+    const task: RawTask = {
+      code: taskData['작업코드'],
+      title: taskData['작업명'],
+      type: taskData['세부공종'],
+      duration: taskData['기간'],
+      startDate: taskData['시작일'],
+      dependsOn: taskData['선행작업코드'],
+      progress: taskData['진척율'],
+      tags: taskData['Tags'] ? taskData['Tags'].split(',') : [],
+      resources: taskData['Resources'] ? JSON.parse(taskData['Resources']) : [],
+      style: bgColor,
+      children: []
+    }
+
+    if (task.code && task.type) {
+      tasks.push(task)
+    }
+  }
+
+  // 5. 변환된 데이터를 importTasks 함수로 전달합니다.
+  await importTasks(project, tasks, context)
+}

package/server/controllers/types.ts

@@ -0,0 +1,20 @@
+import { Task, TaskType } from '../service/task/task'
+
+export interface RawResource {
+  type: string
+  allocated: number
+}
+
+export interface RawTask {
+  code: string
+  title: string
+  type?: TaskType
+  duration?: number
+  startDate?: Date | string
+  dependsOn?: string
+  progress?: number
+  tags?: string[]
+  style?: string
+  resources?: RawResource[]
+  children?: RawTask[]
+}

package/server/routes.ts

@@ -1,6 +1,6 @@
 import contentDisposition from 'content-disposition'
 
-import { Task, generateExcel } from './controllers/project-to-excel'
+import { Task, generateExcel } from './controllers/export-tasks'
 
 // const debug = require('debug')('dssp:project:routes')
 

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

@@ -1,19 +1,21 @@
 import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
 import { In } from 'typeorm'
-import { createAttachment, deleteAttachmentsByRef, ATTACHMENT_PATH } from '@things-factory/attachment-base'
+import { getRepository } from '@things-factory/shell'
+import { Attachment, createAttachment, deleteAttachmentsByRef, ATTACHMENT_PATH } from '@things-factory/attachment-base'
 import { Project, ProjectState } from './project'
 import { NewProject, ProjectPatch, UploadProjectScheduleTable } 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'
 
+import { parseExcelAndImportTasks } from '../../controllers/parse-excel'
 @Resolver(Project)
 export class ProjectMutation {
   @Directive('@transaction')
   @Mutation(returns => Project, { description: '프로젝트 생성' })
   async createProject(@Arg('project') project: NewProject, @Ctx() context: ResolverContext): Promise<Project> {
     const { domain, user, tx } = context.state
-    const projectRepo = tx.getRepository(Project)
-    const buildingComplexRepo = tx.getRepository(BuildingComplex)
+    const projectRepo = getRepository(Project, tx)
+    const buildingComplexRepo = getRepository(BuildingComplex, tx)
 
     const newBuildingComplex = await buildingComplexRepo.save({
       domain,
@@ -36,10 +38,10 @@ export class ProjectMutation {
   @Mutation(returns => Project, { description: '프로젝트 업데이트' })
   async updateProject(@Arg('project') project: ProjectPatch, @Ctx() context: ResolverContext): Promise<Project> {
     const { user, tx } = context.state
-    const projectRepo = tx.getRepository(Project)
-    const buildingComplexRepo = tx.getRepository(BuildingComplex)
-    const buildingRepo = tx.getRepository(Building)
-    const buildingLevelRepo = tx.getRepository(BuildingLevel)
+    const projectRepo = getRepository(Project, tx)
+    const buildingComplexRepo = getRepository(BuildingComplex, tx)
+    const buildingRepo = getRepository(Building, tx)
+    const buildingLevelRepo = getRepository(BuildingLevel, tx)
 
     const buildingComplex = project.buildingComplex
     const buildings = project.buildingComplex?.buildings || []
@@ -97,10 +99,10 @@ export class ProjectMutation {
   @Mutation(returns => Project, { description: '프로젝트 도면 업데이트' })
   async updateProjectPlan(@Arg('project') project: ProjectPatch, @Ctx() context: ResolverContext): Promise<Project> {
     const { user, tx, domain } = context.state
-    const projectRepo = tx.getRepository(Project)
-    const buildingComplexRepo = tx.getRepository(BuildingComplex)
-    const buildingRepo = tx.getRepository(Building)
-    const buildingLevelRepo = tx.getRepository(BuildingLevel)
+    const projectRepo = getRepository(Project, tx)
+    const buildingComplexRepo = getRepository(BuildingComplex, tx)
+    const buildingRepo = getRepository(Building, tx)
+    const buildingLevelRepo = getRepository(BuildingLevel, tx)
     const buildingComplex = project.buildingComplex
     const buildings = project.buildingComplex?.buildings || []
 
@@ -126,7 +128,7 @@ export class ProjectMutation {
         // 첨부된 PDF가 있으면 PDF 파일대로 썸네일 생성
         if (mainDrawingAttatchment) {
           const mainDrawingUpload = await buildingLevel.mainDrawingUpload
-          const pdfPath = `/${ATTACHMENT_PATH}/${mainDrawingAttatchment.path}`
+          const pdfPath = `/${ATTACHMENT_PATH}/${mainDrawingAttatchment.path}` // TODO ATTACHMENT_PATH 제거, mainDrawingAttachment.fullpath 로 해도 될 것 같은데...
           const fileName = mainDrawingUpload.filename.replace('.pdf', '')
           const pngFile = await pdfToImage({ pdfPath, fileName })
           await createAttachmentAfterDelete(context, pngFile, buildingLevel.id, BuildingLevel.name + '_mainDrawing_image')
@@ -200,11 +202,27 @@ export class ProjectMutation {
     @Arg('param') param: UploadProjectScheduleTable,
     @Ctx() context: ResolverContext
   ): Promise<boolean> {
-    const { user, tx } = context.state
+    const { domain, user, tx } = context.state
     const { projectId, scheduleTable } = param
 
-    // 프로젝트 공정표 파일 업로드
-    await createAttachmentAfterDelete(context, scheduleTable, projectId, Project.name + '_schedule_table')
+    const projectRepo = getRepository(Project, tx)
+    const project = await projectRepo.findOne({
+      where: { domain: { id: domain.id }, id: projectId }
+    })
+
+    const { createReadStream, filename, mimetype } = await scheduleTable
+
+    const stream = createReadStream()
+
+    const chunks = []
+    for await (const chunk of stream) {
+      chunks.push(chunk)
+    }
+
+    const buffer = Buffer.concat(chunks)
+
+    await parseExcelAndImportTasks(buffer, project, context)
+    // await parseExcelAndImportTasks(attachment.fullpath, project, context)
 
     return true
   }
@@ -214,7 +232,7 @@ export class ProjectMutation {
   async deleteProject(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { domain, tx } = context.state
 
-    await tx.getRepository(Project).delete({ domain: { id: domain.id }, id })
+    await getRepository(Project, tx).delete({ domain: { id: domain.id }, id })
     await deleteAttachmentsByRef(null, { refBys: [id] }, context)
 
     return true
@@ -222,18 +240,16 @@ export class ProjectMutation {
 }
 
 export async function createAttachmentAfterDelete(context: ResolverContext, file: any, refBy: any, refType: any) {
-  let result = null
+  if (file === undefined) {
+    return null
+  }
 
-  // undefined = 기존 파일 그대로
-  if (file === undefined) return result
+  const { tx } = context.state
 
   // 기존 첨부 파일이 있으면 삭제
   await deleteAttachmentsByRef(null, { refBys: [refBy], refType }, context)
 
-  // 파일이 있으면 생성 (null로 들어올 경우 delete까지만)
-  if (file) {
-    result = await createAttachment(null, { attachment: { file, refType, refBy } }, context)
-  }
+  let result = await createAttachment(null, { attachment: { file, refType, refBy } }, context)
 
-  return result
+  return await getRepository(Attachment, tx).findOne({ where: { id: result.id } })
 }

package/server/service/task/task.ts

@@ -90,6 +90,10 @@ export class Task {
   @Field({ nullable: true })
   progress?: number
 
+  @Column({ nullable: true, comment: '스타일' })
+  @Field({ nullable: true })
+  style?: string
+
   // @OneToMany(type => Checklist, checklist => checklist.task, { nullable: true })
   // @Field(type => [Checklist], { nullable: true })
   // checklists?: Checklist[]

package/dist-server/controllers/project-to-excel.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"project-to-excel.js","sourceRoot":"","sources":["../../server/controllers/project-to-excel.ts"],"names":[],"mappings":";;;AAAA,qCAA6C;AAS7C,SAAS,gBAAgB,CAAC,KAAa,EAAE,SAAoB,EAAE,QAAgB,CAAC;IAC9E,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;QAEvE,GAAG,CAAC,YAAY,GAAG,KAAK,CAAA;QAExB,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7C,gBAAgB,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;SACtD;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,KAAa;IAC/C,MAAM,QAAQ,GAAG,IAAI,kBAAQ,EAAE,CAAA;IAC/B,MAAM,SAAS,GAAG,QAAQ,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;IAEtD,SAAS,CAAC,UAAU,CAAC,iBAAiB,GAAG;QACvC,YAAY,EAAE,KAAK;QACnB,YAAY,EAAE,KAAK;KACpB,CAAA;IAED,SAAS,CAAC,OAAO,GAAG;QAClB,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;QAC/C,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,EAAE;QACrD,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE;KAClD,CAAA;IAED,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;IAElC,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAA;AAC1C,CAAC;AAlBD,sCAkBC","sourcesContent":["import { Workbook, Worksheet } from 'exceljs'\n\nexport interface Task {\n  name: string\n  startDate: Date\n  endDate: Date\n  subtasks?: Task[]\n}\n\nfunction createGanttChart(tasks: Task[], worksheet: Worksheet, level: number = 0) {\n  tasks.forEach(task => {\n    const row = worksheet.addRow([task.name, task.startDate, task.endDate])\n\n    row.outlineLevel = level\n\n    if (task.subtasks && task.subtasks.length > 0) {\n      createGanttChart(task.subtasks, worksheet, level + 1)\n    }\n  })\n}\n\nexport async function generateExcel(tasks: Task[]) {\n  const workbook = new Workbook()\n  const worksheet = workbook.addWorksheet('Gantt Chart')\n\n  worksheet.properties.outlineProperties = {\n    summaryBelow: false,\n    summaryRight: false\n  }\n\n  worksheet.columns = [\n    { header: 'Task Name', key: 'name', width: 30 },\n    { header: 'Start Date', key: 'startDate', width: 20 },\n    { header: 'End Date', key: 'endDate', width: 20 }\n  ]\n\n  createGanttChart(tasks, worksheet)\n\n  return await workbook.xlsx.writeBuffer()\n}\n"]}