@things-factory/worklist 6.0.12 → 6.0.16

package/server/service/activity-thread/activity-thread-history.ts

@@ -0,0 +1,177 @@
+import { Field, ID, Int, ObjectType } from 'type-graphql'
+import { Column, Entity, Index, ManyToOne, OneToMany, 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 { Domain, ScalarObject } from '@things-factory/shell'
+
+import { ActivityThread, ActivityThreadStatus } from './activity-thread'
+import { ActivityInstance } from '../activity-instance/activity-instance'
+
+const ORMCONFIG = config.get('ormconfig', {})
+const DATABASE_TYPE = ORMCONFIG.type
+
+@Entity()
+@Index(
+  'ix_activity_thread_history_0',
+  (activityThreadHistory: ActivityThreadHistory) => [activityThreadHistory.originalId, activityThreadHistory.version],
+  { unique: true }
+)
+@Index(
+  'ix_activity_thread_history_1',
+  (activityThreadHistory: ActivityThreadHistory) => [
+    activityThreadHistory.domain,
+    activityThreadHistory.originalId,
+    activityThreadHistory.version
+  ],
+  { unique: true }
+)
+@ObjectType({ description: 'History Entity of ActivityThread' })
+export class ActivityThreadHistory implements HistoryEntityInterface<ActivityThread> {
+  @PrimaryGeneratedColumn('uuid')
+  @Field(type => ID)
+  readonly id: string
+
+  @Column({
+    nullable: true,
+    default: 1
+  })
+  @Field({ nullable: true })
+  version?: number = 1
+
+  @ManyToOne(type => Domain)
+  @Field({ nullable: true })
+  domain?: Domain
+
+  @RelationId((activityThread: ActivityThread) => activityThread.domain)
+  domainId?: string
+
+  @ManyToOne(type => ActivityInstance)
+  @Field(type => ActivityInstance, { nullable: true })
+  activityInstance?: ActivityInstance
+
+  @RelationId((activityThread: ActivityThread) => activityThread.activityInstance)
+  activityInstanceId?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  state?: ActivityThreadStatus
+
+  @Column('simple-json', { nullable: true })
+  @Field(type => ScalarObject, { nullable: true })
+  output?: { [key: string]: any }
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field({ nullable: true })
+  assignee?: User
+
+  @RelationId((activityThread: ActivityThread) => activityThread.assignee)
+  assigneeId?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  round: number
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  transaction: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  dueAt?: Date
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  assignedAt?: Date
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  startedAt?: Date
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  terminatedAt?: Date
+
+  @Column()
+  @Field({ nullable: true })
+  createdAt?: Date
+
+  @Column()
+  @Field({ nullable: true })
+  updatedAt?: Date
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field({ nullable: true })
+  creator?: User
+
+  @RelationId((activityThread: ActivityThread) => activityThread.creator)
+  creatorId?: string
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field({ nullable: true })
+  updater?: User
+
+  @RelationId((activityThread: ActivityThread) => activityThread.updater)
+  updaterId?: string
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field({ nullable: true })
+  terminator?: User
+
+  @RelationId((activityThread: ActivityThread) => activityThread.terminator)
+  terminatorId?: string
+
+  @HistoryOriginalIdColumn()
+  public originalId!: string
+
+  @HistoryActionColumn({
+    nullable: false,
+    type:
+      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'enum'
+        : DATABASE_TYPE == 'oracle'
+        ? 'varchar2'
+        : 'smallint',
+    enum: HistoryActionType
+  })
+  public action!: HistoryActionType
+
+  isPendingStarted(): boolean {
+    switch (this.state) {
+      case ActivityThreadStatus.Assigned:
+        return true
+      default:
+        return false
+    }
+  }
+
+  isPendingEnded(): boolean {
+    switch (this.state) {
+      case ActivityThreadStatus.Started:
+      case ActivityThreadStatus.Rejected:
+        return true
+      default:
+        return false
+    }
+  }
+
+  isValid(): boolean {
+    switch (this.state) {
+      case ActivityThreadStatus.Assigned:
+      case ActivityThreadStatus.Started:
+      case ActivityThreadStatus.Ended:
+      case ActivityThreadStatus.Rejected:
+        return true
+      case ActivityThreadStatus.Delegated:
+      case ActivityThreadStatus.Aborted:
+      default:
+        return false
+    }
+  }
+}

package/server/service/activity-thread/activity-thread-mutation.ts

@@ -3,7 +3,15 @@ import { In } from 'typeorm'
 
 import { ObjectRef, ScalarObject } from '@things-factory/shell'
 
-import { abort, delegate, end, save as saveActivityThread, start, submit } from '../../controllers/activity-thread'
+import {
+  abort,
+  delegate,
+  end,
+  restart,
+  save as saveActivityThread,
+  start,
+  submit
+} from '../../controllers/activity-thread'
 import { ActivityThread } from './activity-thread'
 import { ActivityThreadSave } from './activity-thread-type'
 
@@ -12,7 +20,7 @@ export class ActivityThreadMutation {
   /* transactions ... */
 
   @Directive('@transaction')
-  @Mutation(returns => ActivityThread!, { nullable: true, description: 'To start ActivityThread information' })
+  @Mutation(returns => ActivityThread!, { nullable: true, description: 'To start ActivityThread' })
   async startActivityThread(
     @Arg('id') id: string,
     @Arg('output', type => ScalarObject, { nullable: true }) output: { [key: string]: any },
@@ -22,6 +30,17 @@ export class ActivityThreadMutation {
     return await start(id, output, reason, context)
   }
 
+  @Directive('@transaction')
+  @Mutation(returns => ActivityThread!, { nullable: true, description: 'To restart ActivityThread' })
+  async restartActivityThread(
+    @Arg('id') id: string,
+    @Arg('output', type => ScalarObject, { nullable: true }) output: { [key: string]: any },
+    @Arg('reason', { nullable: true }) reason: string,
+    @Ctx() context: ResolverContext
+  ): Promise<ActivityThread> {
+    return await restart(id, output, reason, context)
+  }
+
   @Directive('@transaction')
   @Mutation(returns => ActivityThread, { description: 'To delegate a ActivityThread' })
   async delegateActivityThread(

package/server/service/activity-thread/activity-thread-query.ts

@@ -39,10 +39,13 @@ export class ActivityThreadQuery {
     var { domain, user } = context.state
 
     const status = [
-      ActivityThreadStatus.Assigned,
-      ActivityThreadStatus.Started,
-      ActivityThreadStatus.Submitted,
-      ActivityThreadStatus.Rejected
+      // ActivityThreadStatus.Assigned,
+      // ActivityThreadStatus.Started,
+      // ActivityThreadStatus.Submitted,
+      // ActivityThreadStatus.Escalated,
+      // ActivityThreadStatus.Rejected,
+      ActivityThreadStatus.Ended,
+      ActivityThreadStatus.Aborted
     ]
 
     const [items, total] = await getQueryBuilderFromListParams({
@@ -56,7 +59,7 @@ export class ActivityThreadQuery {
         description: { columnName: 'description', relationColumn: 'activityInstance' }
       }
     })
-      .andWhere('at.state IN (:...status)', { status })
+      .andWhere('at.state NOT IN (:...status)', { status })
       .andWhere('at.assignee = :user', { user: user.id })
       .getManyAndCount()
 
@@ -89,4 +92,9 @@ export class ActivityThreadQuery {
   async creator(@Root() activityThread: ActivityThread): Promise<User> {
     return await getRepository(User).findOneBy({ id: activityThread.creatorId })
   }
+
+  @FieldResolver(type => User)
+  async terminator(@Root() activityThread: ActivityThread): Promise<User> {
+    return await getRepository(User).findOneBy({ id: activityThread.terminatorId })
+  }
 }

package/server/service/activity-thread/activity-thread-subscription.ts

@@ -24,9 +24,9 @@ export class ActivityThreadSubscription {
         () => pubsub.asyncIterator('activity-thread'),
         async (payload, variables, context, info) => {
           const { activityThread } = payload
-          const { domain } = activityThread
+          const { domainId } = activityThread
 
-          if (subdomain !== domain?.subdomain) {
+          if (domainId !== domain?.id) {
             return false
           }
 

package/server/service/activity-thread/activity-thread.ts

@@ -8,6 +8,7 @@ import {
   ManyToOne,
   PrimaryGeneratedColumn,
   RelationId,
+  VersionColumn,
   UpdateDateColumn
 } from 'typeorm'
 
@@ -53,6 +54,10 @@ export class ActivityThread {
   @RelationId((activityThread: ActivityThread) => activityThread.domain)
   domainId?: string
 
+  @VersionColumn({ default: 1 })
+  @Field({ nullable: true })
+  version?: number = 1
+
   @ManyToOne(type => ActivityInstance, activityInstance => activityInstance.activityThreads)
   @Field(type => ActivityInstance, { nullable: true })
   activityInstance?: ActivityInstance
@@ -60,21 +65,6 @@ export class ActivityThread {
   @RelationId((activityThread: ActivityThread) => activityThread.activityInstance)
   activityInstanceId?: string
 
-  @ManyToOne(type => ActivityThread, { nullable: true })
-  @Field(type => ActivityThread, { nullable: true })
-  originalThread?: ActivityThread
-
-  @RelationId((activityThread: ActivityThread) => activityThread.originalThread)
-  originalThreadId?: string
-
-  @OneToMany(type => ActivityThread, activityThread => activityThread.originalThread)
-  @Field(type => [ActivityThread])
-  derivedThreads?: ActivityThread
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  active?: boolean
-
   @Column({ nullable: true })
   @Field({ nullable: true })
   state?: ActivityThreadStatus
@@ -90,6 +80,14 @@ export class ActivityThread {
   @RelationId((activityThread: ActivityThread) => activityThread.assignee)
   assigneeId?: string
 
+  @Column({ nullable: true, default: 1 })
+  @Field({ nullable: true })
+  round: number = 1
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  transaction: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   dueAt?: Date

package/server/service/activity-thread/event-subscriber.ts

@@ -1,8 +1,10 @@
-import { EventSubscriber, EntitySubscriberInterface, InsertEvent, RemoveEvent, UpdateEvent } from 'typeorm'
+import { EventSubscriber, EntitySubscriberInterface, InsertEvent, UpdateEvent } from 'typeorm'
+import { HistoryEntitySubscriber } from '@operato/typeorm-history'
 
 import { pubsub } from '@things-factory/shell'
 
 import { ActivityThread } from './activity-thread'
+import { ActivityThreadHistory } from './activity-thread-history'
 
 @EventSubscriber()
 export class ActivityThreadSubscriber implements EntitySubscriberInterface<ActivityThread> {
@@ -29,3 +31,17 @@ export class ActivityThreadSubscriber implements EntitySubscriberInterface<Activ
     console.log('activity-thread updated', activityThread.id)
   }
 }
+
+@EventSubscriber()
+export class ActivityThreadHistoryEntitySubscriber extends HistoryEntitySubscriber<
+  ActivityThread,
+  ActivityThreadHistory
+> {
+  public get entity() {
+    return ActivityThread
+  }
+
+  public get historyEntity() {
+    return ActivityThreadHistory
+  }
+}

package/server/service/activity-thread/index.ts

@@ -1,9 +1,10 @@
 import { ActivityThread } from './activity-thread'
+import { ActivityThreadHistory } from './activity-thread-history'
 import { ActivityThreadMutation } from './activity-thread-mutation'
 import { ActivityThreadQuery } from './activity-thread-query'
 import { ActivityThreadSubscription } from './activity-thread-subscription'
-import { ActivityThreadSubscriber } from './event-subscriber'
+import { ActivityThreadHistoryEntitySubscriber, ActivityThreadSubscriber } from './event-subscriber'
 
-export const entities = [ActivityThread]
+export const entities = [ActivityThread, ActivityThreadHistory]
 export const resolvers = [ActivityThreadQuery, ActivityThreadMutation, ActivityThreadSubscription]
-export const subscribers = [ActivityThreadSubscriber]
+export const subscribers = [ActivityThreadSubscriber, ActivityThreadHistoryEntitySubscriber]

package/server/service/index.ts

@@ -4,9 +4,14 @@ export * from './activity-thread/activity-thread'
 export * from './activity-template/activity-template'
 export * from './activity-instance/activity-instance'
 export * from './activity/activity'
+export * from './activity-summary/activity-summary'
 
 /* IMPORT ENTITIES AND RESOLVERS */
-import { entities as ActivityApprovalEntities, resolvers as ActivityApprovalResolvers, subscribers as ActivityApprovalSubscribers } from './activity-approval'
+import {
+  entities as ActivityApprovalEntities,
+  resolvers as ActivityApprovalResolvers,
+  subscribers as ActivityApprovalSubscribers
+} from './activity-approval'
 import {
   entities as ActivityEntities,
   resolvers as ActivityResolvers,
@@ -23,19 +28,21 @@ import {
   resolvers as ActivityThreadResolvers,
   subscribers as ActivityThreadSubscribers
 } from './activity-thread'
+import { entities as ActivitySummaryEntities, resolvers as ActivitySummaryResolvers } from './activity-summary'
 
 export const entities = [
   /* ENTITIES */
-	...ActivityApprovalEntities,
+  ...ActivityApprovalEntities,
   ...ActivityEntities,
   ...ActivityInstanceEntities,
   ...ActivityTemplateEntities,
-  ...ActivityThreadEntities
+  ...ActivityThreadEntities,
+  ...ActivitySummaryEntities
 ]
 
 export const subscribers = [
   /* SUBSCRIBERS */
-	...ActivityApprovalSubscribers,
+  ...ActivityApprovalSubscribers,
   ...ActivityInstanceSubscribers,
   ...ActivitySubscribers,
   ...ActivityThreadSubscribers
@@ -44,10 +51,11 @@ export const subscribers = [
 export const schema = {
   resolverClasses: [
     /* RESOLVER CLASSES */
-		...ActivityApprovalResolvers,
+    ...ActivityApprovalResolvers,
     ...ActivityResolvers,
     ...ActivityInstanceResolvers,
     ...ActivityTemplateResolvers,
-    ...ActivityThreadResolvers
+    ...ActivityThreadResolvers,
+    ...ActivitySummaryResolvers
   ]
 }

package/translations/en.json

@@ -1,11 +1,14 @@
 {
+  "button.abort": "abort",
   "button.approve": "approve",
   "button.assign": "assign",
   "button.buy": "buy",
+  "button.delegate": "delegate",
   "button.draft": "draft",
   "button.finish": "finish",
   "button.pick": "pick",
   "button.post": "post",
+  "button.restart": "restart",
   "button.start": "start",
   "button.submit": "submit",
   "field.activity-type": "activity type",

package/translations/ko.json

@@ -1,11 +1,14 @@
 {
+  "button.abort": "중단",
   "button.approve": "승인",
   "button.assign": "할당",
   "button.buy": "구매",
+  "button.delegate": "위임",
   "button.draft": "초안",
   "button.finish": "완료",
   "button.pick": "선택",
   "button.post": "게시",
+  "button.restart": "재시작",
   "button.start": "시작",
   "button.submit": "제출",
   "field.activity-type": "업무 타입",

package/translations/ms.json

@@ -1,11 +1,14 @@
 {
+  "button.abort": "abort",
   "button.approve": "approve",
   "button.assign": "assign",
   "button.buy": "buy",
+  "button.delegate": "delegate",
   "button.draft": "draft",
   "button.finish": "finish",
   "button.pick": "pick",
   "button.post": "post",
+  "button.restart": "restart",
   "button.start": "start",
   "button.submit": "submit",
   "field.activity-type": "activity type",

package/translations/zh.json

@@ -1,11 +1,14 @@
 {
+  "button.abort": "abort",
   "button.approve": "approve",
   "button.assign": "assign",
   "button.buy": "buy",
+  "button.delegate": "delegate",
   "button.draft": "draft",
   "button.finish": "finish",
   "button.pick": "pick",
   "button.post": "post",
+  "button.restart": "restart",
   "button.start": "start",
   "button.submit": "submit",
   "field.activity-type": "activity type",

package/server/controllers/activity-approval/abort.ts

@@ -1,33 +0,0 @@
-import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'
-
-export async function abort(
-  { id, comment }: { id: string; comment: string },
-  context: ResolverContext
-): Promise<ActivityApproval> {
-  const { domain, user, tx } = context.state
-
-  var repository = tx.getRepository(ActivityApproval)
-
-  var activityApproval = await repository.findOne({
-    where: { domain: { id: domain.id }, id },
-    relations: ['domain', 'activityThread', 'updater', 'creator']
-  })
-
-  if (!activityApproval) {
-    throw new Error(
-      context.t('error.activity-approval not found', {
-        activityApproval: id
-      })
-    )
-  }
-
-  return await repository.save({
-    ...activityApproval,
-    judgment: ActivityApprovalJudgment.Aborted,
-    comment,
-    transaction: 'abort',
-    updater: user,
-    terminatedAt: new Date(),
-    terminator: user
-  })
-}

package/server/controllers/activity-approval/escalate.ts

@@ -1,33 +0,0 @@
-import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'
-
-export async function escalate(
-  { id, comment }: { id: string; comment: string },
-  context: ResolverContext
-): Promise<ActivityApproval> {
-  const { domain, user, tx } = context.state
-
-  var repository = tx.getRepository(ActivityApproval)
-
-  var activityApproval = await repository.findOne({
-    where: { domain: { id: domain.id }, id },
-    relations: ['domain', 'activityThread', 'updater', 'creator']
-  })
-
-  if (!activityApproval) {
-    throw new Error(
-      context.t('error.activity-approval not found', {
-        activityApproval: id
-      })
-    )
-  }
-
-  return await repository.save({
-    ...activityApproval,
-    judgment: ActivityApprovalJudgment.Escalated,
-    comment,
-    transaction: 'abort',
-    updater: user,
-    terminatedAt: new Date(),
-    terminator: user
-  })
-}