@dssp/supervision 0.0.31 → 0.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dssp/supervision",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "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.31",
-    "@dssp/drawing": "^0.0.31",
-    "@dssp/project": "^0.0.31",
+    "@dssp/building-complex": "^0.0.33",
+    "@dssp/drawing": "^0.0.33",
+    "@dssp/project": "^0.0.33",
     "@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": "40979cb16f6f962bc4d0635b7cb0024c4d494df5"
+  "gitHead": "65cbb3d3b4aafcaeb8d7b0da22ae250345ac0f51"
 }

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

@@ -4,6 +4,7 @@ import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from
 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'
 
 @Resolver(ChecklistItem)
 export class ChecklistItemQuery {
@@ -31,6 +32,16 @@ export class ChecklistItemQuery {
     return { items, total }
   }
 
+  @FieldResolver(type => [ChecklistItemComment])
+  async checklistItemComments(@Root() checklistItem: ChecklistItem): Promise<ChecklistItemComment[]> {
+    return await getRepository(ChecklistItemComment).findBy({ checklistItem: { id: checklistItem.id } })
+  }
+
+  @FieldResolver(type => Number)
+  async checklistItemCommentCount(@Root() checklistItem: ChecklistItem): Promise<number> {
+    return await getRepository(ChecklistItemComment).countBy({ checklistItem: { id: checklistItem.id } })
+  }
+
   @FieldResolver(type => User)
   async updater(@Root() checklistItem: ChecklistItem): Promise<User> {
     return await getRepository(User).findOneBy({ id: checklistItem.updaterId })

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

@@ -7,12 +7,14 @@ import {
   Column,
   RelationId,
   ManyToOne,
+  OneToMany,
   PrimaryGeneratedColumn
 } from 'typeorm'
 import { ObjectType, Field, ID, Int, registerEnumType } from 'type-graphql'
 
 import { User } from '@things-factory/auth-base'
 import { Checklist } from '../checklist/checklist'
+import { ChecklistItemComment } from '../checklist-item-comment/checklist-item-comment'
 
 export enum ChecklistItemConfirmStatus {
   T = '적합',
@@ -60,9 +62,10 @@ export class ChecklistItem {
   @Field({ nullable: true })
   supervisoryConfirmStatus?: ChecklistItemConfirmStatus
 
-  @Column({ nullable: true, comment: '참고 사항' })
-  @Field({ nullable: true })
-  comment?: string
+  // 조치 사항 정보 (하위 테이블 참조)
+  @OneToMany(() => ChecklistItemComment, checklistItemComment => checklistItemComment.checklistItem)
+  @Field(() => [ChecklistItemComment])
+  checklistItemComments?: ChecklistItemComment[]
 
   // 체크리스트 정보 (상위 테이블 참조)
   @ManyToOne(type => Checklist)

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

@@ -0,0 +1,69 @@
+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 { ChecklistItemComment } from './checklist-item-comment'
+import { ChecklistItem } from '../checklist-item/checklist-item'
+
+const ORMCONFIG = config.get('ormconfig', {})
+const DATABASE_TYPE = ORMCONFIG.type
+
+@Entity()
+@Index('ix_checklist-item-comment_history_0', (checklistItemCommentHistory: ChecklistItemCommentHistory) => [
+  checklistItemCommentHistory.originalId
+])
+@Index('ix_checklist-item-comment_history_1', (checklistItemCommentHistory: ChecklistItemCommentHistory) => [
+  checklistItemCommentHistory.checklistItem
+])
+@ObjectType({ description: 'History Entity of ChecklistItemComment' })
+export class ChecklistItemCommentHistory implements HistoryEntityInterface<ChecklistItemComment> {
+  @PrimaryGeneratedColumn('uuid')
+  @Field(type => ID)
+  readonly id: string
+
+  @Column({ nullable: true, comment: '조치 사항 코멘트' })
+  @Field({ nullable: true })
+  comment?: string
+
+  // 체크리스트 아이템 정보 (상위 테이블 참조)
+  @ManyToOne(type => ChecklistItem)
+  @Field(type => ChecklistItem, { nullable: true })
+  checklistItem?: ChecklistItem
+
+  @RelationId((checklistItemComment: ChecklistItemComment) => checklistItemComment.checklistItem)
+  checklistItemId?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  createdAt?: Date
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deletedAt?: Date
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field(type => User, { nullable: true })
+  creator?: User
+
+  @RelationId((checklistItemComment: ChecklistItemComment) => checklistItemComment.creator)
+  creatorId?: string
+
+  @HistoryOriginalIdColumn()
+  public originalId!: string
+
+  @HistoryActionColumn({
+    nullable: false,
+    type:
+      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'enum'
+        : DATABASE_TYPE == 'oracle'
+          ? 'varchar2'
+          : DATABASE_TYPE == 'mssql'
+            ? 'nvarchar'
+            : 'varchar',
+    enum: DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? HistoryActionType : undefined,
+    length: DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? undefined : 32
+  })
+  public action!: HistoryActionType
+}

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

@@ -0,0 +1,60 @@
+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'
+
+@Resolver(ChecklistItemComment)
+export class ChecklistItemCommentMutation {
+  @Directive('@transaction')
+  @Mutation(returns => ChecklistItemComment, { description: 'To create new ChecklistItemComment' })
+  async createChecklistItemComment(
+    @Arg('checklistItemComment') checklistItemComment: NewChecklistItemComment,
+    @Ctx() context: ResolverContext
+  ): Promise<ChecklistItemComment> {
+    const { user, tx } = context.state
+    const { comment, checklistItemId } = checklistItemComment
+
+    const result = await getRepository(ChecklistItemComment, tx).save({
+      comment,
+      checklistItem: { id: checklistItemId },
+      createdAt: new Date(),
+      creator: user,
+      updater: user
+    })
+
+    return result
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => ChecklistItemComment, { description: 'To modify ChecklistItemComment information' })
+  async updateChecklistItemComment(
+    @Arg('id') id: string,
+    @Arg('patch') patch: ChecklistItemCommentPatch,
+    @Ctx() context: ResolverContext
+  ): Promise<ChecklistItemComment> {
+    const { user, tx } = context.state
+
+    const repository = getRepository(ChecklistItemComment, tx)
+    const checklistItemComment = await repository.findOne({
+      where: { id }
+    })
+
+    const result = await repository.save({
+      ...checklistItemComment,
+      ...patch,
+      updater: user
+    })
+
+    return result
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => Boolean, { description: 'To delete ChecklistItemComment' })
+  async deleteChecklistItemComment(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {
+    const { tx } = context.state
+
+    await getRepository(ChecklistItemComment, tx).softDelete({ id })
+
+    return true
+  }
+}

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

@@ -0,0 +1,36 @@
+import { Resolver, Query, FieldResolver, Root, Arg, Ctx } from 'type-graphql'
+import { getRepository, Pagination } from '@things-factory/shell'
+import { User } from '@things-factory/auth-base'
+import { ChecklistItemComment } from './checklist-item-comment'
+
+@Resolver(ChecklistItemComment)
+export class ChecklistItemCommentQuery {
+  @Query(returns => [ChecklistItemComment], { description: 'To fetch multiple ChecklistItemComments' })
+  async checklistItemComments(
+    @Arg('checklistItemId') checklistItemId: string,
+    @Arg('pagination') pagination: Pagination,
+    @Ctx() context: ResolverContext
+  ): Promise<ChecklistItemComment[]> {
+    const { limit, page } = pagination
+
+    // 페이지네이션을 위한 offset 계산
+    const offset = (page - 1) * limit
+
+    // 코멘트와 총 개수를 가져오는 쿼리
+    const items = await getRepository(ChecklistItemComment)
+      .createQueryBuilder('cic')
+      .innerJoin('cic.checklistItem', 'ci')
+      .where('cic.checklistItem = :checklistItemId', { checklistItemId })
+      .skip(offset)
+      .take(limit)
+      .orderBy('cic.createdAt', 'DESC')
+      .getMany()
+
+    return items
+  }
+
+  @FieldResolver(type => User)
+  async creator(@Root() checklistItemComment: ChecklistItemComment): Promise<User> {
+    return checklistItemComment.creatorId && (await getRepository(User).findOneBy({ id: checklistItemComment.creatorId }))
+  }
+}

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

@@ -0,0 +1,32 @@
+import { ObjectType, Field, InputType, Int, ID } from 'type-graphql'
+import { ChecklistItemComment } from './checklist-item-comment'
+
+@InputType()
+export class NewChecklistItemComment {
+  @Field({ nullable: true })
+  comment?: string
+
+  @Field({ nullable: true })
+  checklistItemId?: string
+}
+
+@InputType()
+export class ChecklistItemCommentPatch {
+  @Field(type => ID, { nullable: true })
+  id?: string
+
+  @Field({ nullable: true })
+  comment?: string
+
+  @Field({ nullable: true })
+  checklistItemId?: string
+}
+
+@ObjectType()
+export class ChecklistItemCommentList {
+  @Field(type => [ChecklistItemComment])
+  items: ChecklistItemComment[]
+
+  @Field(type => Int)
+  total: number
+}

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

@@ -0,0 +1,56 @@
+import {
+  CreateDateColumn,
+  UpdateDateColumn,
+  DeleteDateColumn,
+  Entity,
+  Index,
+  Column,
+  RelationId,
+  ManyToOne,
+  PrimaryGeneratedColumn
+} from 'typeorm'
+import { ObjectType, Field, ID } from 'type-graphql'
+import { User } from '@things-factory/auth-base'
+import { ChecklistItem } from '../checklist-item/checklist-item'
+
+@Entity()
+@Index(
+  'ix_checklist_item_comment_0',
+  (checklistItemComment: ChecklistItemComment) => [checklistItemComment.checklistItem, checklistItemComment.createdAt],
+  {
+    where: '"deleted_at" IS NULL'
+  }
+)
+@ObjectType({ description: 'Entity for ChecklistItemComment' })
+export class ChecklistItemComment {
+  @PrimaryGeneratedColumn('uuid')
+  @Field(type => ID)
+  readonly id: string
+
+  @Column({ nullable: true, comment: '조치 사항 코멘트' })
+  @Field({ nullable: true })
+  comment?: string
+
+  // 체크리스트 아이템 정보 (상위 테이블 참조)
+  @ManyToOne(type => ChecklistItem)
+  @Field(type => ChecklistItem, { nullable: true })
+  checklistItem?: ChecklistItem
+
+  @RelationId((checklistItemComment: ChecklistItemComment) => checklistItemComment.checklistItem)
+  checklistItemId?: string
+
+  @CreateDateColumn()
+  @Field({ nullable: true })
+  createdAt?: Date
+
+  @DeleteDateColumn()
+  @Field({ nullable: true })
+  deletedAt?: Date
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field(type => User, { nullable: true })
+  creator?: User
+
+  @RelationId((checklistItemComment: ChecklistItemComment) => checklistItemComment.creator)
+  creatorId?: string
+}

package/server/service/checklist-item-comment/event-subscriber.ts

@@ -0,0 +1,17 @@
+import { EventSubscriber } from 'typeorm'
+
+import { HistoryEntitySubscriber } from '@operato/typeorm-history'
+
+import { ChecklistItemComment } from './checklist-item-comment'
+import { ChecklistItemCommentHistory } from './checklist-item-comment-history'
+
+@EventSubscriber()
+export class ChecklistItemCommentHistoryEntitySubscriber extends HistoryEntitySubscriber<ChecklistItemComment, ChecklistItemCommentHistory> {
+  public get entity() {
+    return ChecklistItemComment
+  }
+
+  public get historyEntity() {
+    return ChecklistItemCommentHistory
+  }
+}

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

@@ -0,0 +1,9 @@
+import { ChecklistItemComment } from './checklist-item-comment'
+import { ChecklistItemCommentHistory } from './checklist-item-comment-history'
+import { ChecklistItemCommentHistoryEntitySubscriber } from './event-subscriber'
+import { ChecklistItemCommentQuery } from './checklist-item-comment-query'
+import { ChecklistItemCommentMutation } from './checklist-item-comment-mutation'
+
+export const entities = [ChecklistItemComment, ChecklistItemCommentHistory]
+export const resolvers = [ChecklistItemCommentQuery, ChecklistItemCommentMutation]
+export const subscribers = [ChecklistItemCommentHistoryEntitySubscriber]

package/server/service/index.ts

@@ -6,6 +6,7 @@ export * from './supervisor/supervisor'
 export * from './checklist-type/checklist-type'
 export * from './checklist/checklist'
 export * from './checklist-item/checklist-item'
+export * from './checklist-item-comment/checklist-item-comment'
 export * from './checklist-template/checklist-template'
 export * from './checklist-template-item/checklist-template-item'
 export * from './building-inspection/building-inspection'
@@ -29,6 +30,11 @@ import {
 } from './supervisor'
 import { entities as ChecklistEntities, resolvers as ChecklistResolvers, subscribers as ChecklistSubscribers } from './checklist'
 import { entities as ChecklistItemEntities, resolvers as ChecklistItemResolvers } from './checklist-item'
+import {
+  entities as ChecklistItemCommentEntities,
+  resolvers as ChecklistItemCommentResolvers,
+  subscribers as ChecklistItemCommentSubscribers
+} from './checklist-item-comment'
 import { entities as ChecklistTypeEntities, resolvers as ChecklistTypeResolvers } from './checklist-type'
 import { entities as ChecklistTemplateEntities, resolvers as ChecklistTemplateResolvers } from './checklist-template'
 import { entities as ChecklistTemplateItemEntities, resolvers as ChecklistTemplateItemResolvers } from './checklist-template-item'
@@ -46,6 +52,7 @@ export const entities = [
   ...SupervisorEntities,
   ...ChecklistEntities,
   ...ChecklistItemEntities,
+  ...ChecklistItemCommentEntities,
   ...ChecklistTypeEntities,
   ...ChecklistTemplateItemEntities,
   ...ChecklistTemplateEntities,
@@ -59,7 +66,8 @@ export const subscribers = [
   ...ProjectReportSubscribers,
   ...SupervisorSubscribers,
   ...BuildingInspectionSubscribers,
-  ...ChecklistSubscribers
+  ...ChecklistSubscribers,
+  ...ChecklistItemCommentSubscribers
 ]
 
 export const schema = {
@@ -71,6 +79,7 @@ export const schema = {
     ...SupervisorResolvers,
     ...ChecklistResolvers,
     ...ChecklistItemResolvers,
+    ...ChecklistItemCommentResolvers,
     ...ChecklistTypeResolvers,
     ...ChecklistTemplateItemResolvers,
     ...ChecklistTemplateResolvers,