@things-factory/board-service 6.1.113 → 6.1.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/board-service",
-  "version": "6.1.113",
+  "version": "6.1.115",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,9 +24,9 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^6.1.112",
+    "@things-factory/auth-base": "^6.1.115",
     "@things-factory/env": "^6.1.112",
-    "@things-factory/font-base": "^6.1.112",
+    "@things-factory/font-base": "^6.1.115",
     "content-disposition": "^0.5.3",
     "generic-pool": "^3.8.2"
   },
@@ -34,5 +34,5 @@
     "@thiagoelg/node-printer": "0.6.2",
     "puppeteer": "^20.7.3"
   },
-  "gitHead": "5c2a899ed475188d9555fcdd70db9d41b298a2ed"
+  "gitHead": "3677982365595b0f3a8ec26e47c234878ecbb910"
 }

package/server/service/board/board-history.ts

@@ -0,0 +1,120 @@
+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 { Domain } from '@things-factory/shell'
+import { config } from '@things-factory/env'
+
+import { Board } from './board'
+import { Group } from '../group/group'
+
+const ORMCONFIG = config.get('ormconfig', {})
+const DATABASE_TYPE = ORMCONFIG.type
+
+@Entity()
+@Index('ix_board_history_0', (boardHistory: BoardHistory) => [boardHistory.originalId, boardHistory.version], {
+  unique: true
+})
+@ObjectType({ description: 'History Entity of Board' })
+export class BoardHistory implements HistoryEntityInterface<Board> {
+  @PrimaryGeneratedColumn('uuid')
+  @Field(type => ID)
+  readonly id: string
+
+  @Column({ nullable: true, default: 1 })
+  @Field({ nullable: true })
+  version?: number = 1
+
+  @ManyToOne(type => Domain)
+  @Field(type => Domain, { nullable: true })
+  domain?: Domain
+
+  @RelationId((board: Board) => board.domain)
+  domainId?: string
+
+  @Column()
+  @Field()
+  name?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  description?: string
+
+  @Column({
+    nullable: true,
+    type:
+      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'longtext'
+        : DATABASE_TYPE == 'oracle'
+        ? 'clob'
+        : 'varchar'
+  })
+  @Field({ nullable: true })
+  model?: string
+
+  @Column({
+    nullable: true,
+    type:
+      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'longtext'
+        : DATABASE_TYPE == 'oracle'
+        ? 'clob'
+        : 'varchar'
+  })
+  @Field({ nullable: true })
+  thumbnail?: string
+
+  @ManyToOne(type => Group, group => group.boards)
+  @Field(type => Group, { nullable: true })
+  group?: Group
+
+  @RelationId((board: Board) => board.group)
+  groupId?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  createdAt?: Date
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  updatedAt?: Date
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field(type => User, { nullable: true })
+  creator?: User
+
+  @RelationId((board: Board) => board.creator)
+  creatorId?: string
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field(type => User, { nullable: true })
+  updater?: User
+
+  @RelationId((board: Board) => board.updater)
+  updaterId?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deletedAt?: Date
+
+  @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
+}

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

@@ -83,15 +83,16 @@ export class BoardMutation {
       throw t('error.name must be unique from the original board', { name: patch.name })
     }
 
-    if (patch.groupId !== undefined) {
-      const groupRepository = tx.getRepository(Group)
-      board.group =
-        (await groupRepository.findOneBy({
-          domain: { id: domain.id },
-          id: patch.groupId
-        })) || null
+    const { groupId, ...patched } = patch
 
-      delete patch.groupId
+    if (groupId !== undefined) {
+      const groupRepository = tx.getRepository(Group)
+      board.group = groupId
+        ? (await groupRepository.findOneBy({
+            domain: { id: domain.id },
+            id: groupId
+          })) || null
+        : null
     }
 
     const { id: excluded, ...clone } = board
@@ -99,7 +100,8 @@ export class BoardMutation {
     const cloned = await repository.save({
       domain,
       ...clone,
-      ...patch,
+      ...patched,
+      version: 1,
       updater: user,
       creator: user
     })
@@ -127,7 +129,10 @@ export class BoardMutation {
     const { domain, user, notify, tx } = context.state
     const repository = tx.getRepository(Board)
 
-    const board = await repository.findOneBy({ domain: { id: domain.id }, id })
+    const board = await repository.findOne({
+      where: { domain: { id: domain.id }, id },
+      relations: ['creator']
+    })
 
     if (patch.model) {
       const base64 = await thumbnail({
@@ -142,20 +147,22 @@ export class BoardMutation {
       }
     }
 
-    if (patch.groupId !== undefined) {
-      const groupRepository = tx.getRepository(Group)
-      board.group =
-        (await groupRepository.findOneBy({
-          domain: { id: domain.id },
-          id: patch.groupId
-        })) || null
+    const { groupId, ...patched } = patch
 
-      delete patch.groupId
+    if (groupId !== undefined) {
+      const groupRepository = tx.getRepository(Group)
+      board.group = groupId
+        ? (await groupRepository.findOneBy({
+            domain: { id: domain.id },
+            id: groupId
+          })) || null
+        : null
     }
 
     const updated = await repository.save({
+      domain,
       ...board,
-      ...patch,
+      ...patched,
       updater: user
     })
 
@@ -179,7 +186,7 @@ export class BoardMutation {
     const repository = tx.getRepository(Board)
     const board = await repository.findOneBy({ domain: { id: domain.id }, id })
 
-    const deleted = await repository.delete(id)
+    const deleted = await repository.softDelete(id)
 
     notify &&
       notify({

package/server/service/board/board-type.ts

@@ -23,7 +23,7 @@ export class NewBoard {
 @InputType()
 export class BoardPatch {
   @Field({ nullable: true })
-  name: string
+  name?: string
 
   @Field({ nullable: true })
   description?: string

package/server/service/board/board.ts

@@ -7,7 +7,10 @@ import {
   ManyToOne,
   PrimaryGeneratedColumn,
   RelationId,
-  UpdateDateColumn
+  DeleteDateColumn,
+  UpdateDateColumn,
+  VersionColumn,
+  BeforeUpdate
 } from 'typeorm'
 import { Field, ID, ObjectType } from 'type-graphql'
 
@@ -21,7 +24,10 @@ const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
 
 @Entity()
-@Index('ix_board_0', (board: Board) => [board.domain, board.name], { unique: true })
+@Index('ix_board_1', (board: Board) => [board.domain, board.name], {
+  unique: true,
+  where: '"deleted_at" IS NULL'
+})
 @Index('ix_board_3', (board: Board) => [board.domain, board.group])
 @ObjectType({ description: 'Entity for Visualization Board' })
 export class Board {
@@ -29,6 +35,10 @@ export class Board {
   @Field(type => ID, { nullable: true })
   readonly id?: string
 
+  @VersionColumn({ nullable: true, default: 1 })
+  @Field({ nullable: true })
+  version?: number = 1
+
   @ManyToOne(type => Domain)
   @Field(type => Domain, { nullable: true })
   domain?: Domain
@@ -38,11 +48,9 @@ export class Board {
 
   @Column()
   @Field()
-  name: string
+  name?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   description?: string
 
@@ -102,4 +110,8 @@ export class Board {
 
   @RelationId((board: Board) => board.updater)
   updaterId?: string
+
+  @DeleteDateColumn()
+  @Field({ nullable: true })
+  deletedAt?: Date
 }

package/server/service/board/event-subscriber.ts

@@ -1,8 +1,10 @@
 import { EventSubscriber, EntitySubscriberInterface, InsertEvent, UpdateEvent } from 'typeorm'
 
+import { HistoryEntitySubscriber } from '@operato/typeorm-history'
 import { pubsub, getRepository } from '@things-factory/shell'
 
 import { Board } from './board'
+import { BoardHistory } from './board-history'
 
 @EventSubscriber()
 export class BoardSubscriber implements EntitySubscriberInterface<Board> {
@@ -10,13 +12,13 @@ export class BoardSubscriber implements EntitySubscriberInterface<Board> {
     return Board
   }
 
-  // afterInsert(event: InsertEvent<Board>): Promise<any> | void {
-  //   const board = event.entity
+  async beforeUpdate(event: UpdateEvent<Board>): Promise<any> {
+    var board = event.entity
 
-  //   pubsub.publish('board', {
-  //     board
-  //   })
-  // }
+    if (!board.version) {
+      board.version = 1
+    }
+  }
 
   async afterUpdate(event: UpdateEvent<Board>): Promise<any> {
     var board = event.entity
@@ -37,3 +39,14 @@ export class BoardSubscriber implements EntitySubscriberInterface<Board> {
     })
   }
 }
+
+@EventSubscriber()
+export class BoardHistoryEntitySubscriber extends HistoryEntitySubscriber<Board, BoardHistory> {
+  public get entity() {
+    return Board
+  }
+
+  public get historyEntity() {
+    return BoardHistory
+  }
+}

package/server/service/board/index.ts

@@ -1,9 +1,10 @@
 import { Board } from './board'
+import { BoardHistory } from './board-history'
 import { BoardQuery } from './board-query'
 import { BoardMutation } from './board-mutation'
 import { BoardSubscription } from './board-subscription'
-import { BoardSubscriber } from './event-subscriber'
+import { BoardSubscriber, BoardHistoryEntitySubscriber } from './event-subscriber'
 
-export const entities = [Board]
+export const entities = [Board, BoardHistory]
 export const resolvers = [BoardQuery, BoardMutation, BoardSubscription]
-export const subscribers = [BoardSubscriber]
+export const subscribers = [BoardSubscriber, BoardHistoryEntitySubscriber]