@things-factory/board-service 6.2.82 → 6.2.84

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/board-service",
-  "version": "6.2.82",
+  "version": "6.2.84",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,11 +24,11 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^6.2.82",
+    "@things-factory/auth-base": "^6.2.84",
     "@things-factory/env": "^6.2.33",
-    "@things-factory/fav-base": "^6.2.82",
-    "@things-factory/font-base": "^6.2.82",
-    "@things-factory/integration-base": "^6.2.82",
+    "@things-factory/fav-base": "^6.2.84",
+    "@things-factory/font-base": "^6.2.84",
+    "@things-factory/integration-base": "^6.2.84",
     "@things-factory/operato-license-checker": "^4.0.4",
     "content-disposition": "^0.5.3",
     "generic-pool": "^3.8.2"
@@ -37,5 +37,5 @@
     "@thiagoelg/node-printer": "0.6.2",
     "puppeteer": "^20.7.3"
   },
-  "gitHead": "bc2048e76dd3ce68869735bac51290a9e3421252"
+  "gitHead": "3c272e989acc14bbd02f4ec79624dfd7dc4e6acd"
 }

package/server/controllers/headless-model.ts

@@ -2,8 +2,9 @@ import { In } from 'typeorm'
 import { getContextPath, getRepository } from '@things-factory/shell'
 
 import { Board } from '../service/board/board'
+import { BoardHistory } from '../service/board/board-history'
 
-export const headlessModel = async target => {
+export const headlessModel = async (target, devmode: boolean = false) => {
   var { domain, id, model, name } = target || {}
 
   if (model) {
@@ -12,18 +13,36 @@ export const headlessModel = async target => {
     } else if (typeof model !== 'object') {
       throw 'model should be a string or object'
     }
-  } else if (id) {
-    var board = await getRepository(Board).findOne({
-      where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id }
-    })
-    model = JSON.parse(board.model)
-  } else if (name) {
-    var board = await getRepository(Board).findOne({
-      where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, name }
-    })
-    model = JSON.parse(board.model)
   } else {
-    throw 'parameter model or id mandatory'
+    if (id) {
+      var board = await getRepository(Board).findOne({
+        where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id }
+      })
+    } else if (name) {
+      var board = await getRepository(Board).findOne({
+        where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, name }
+      })
+    } else {
+      throw 'parameter model or id mandatory'
+    }
+
+    if (!devmode && board) {
+      const latestReleased =
+        board.state == 'released'
+          ? board
+          : await getRepository(BoardHistory)
+              .createQueryBuilder('history')
+              .where('history.originalId = :originalId', { originalId: board.id })
+              .orderBy('history.version', 'DESC')
+              .limit(1)
+              .getOne()
+
+      if (latestReleased) {
+        model = latestReleased.model
+      }
+    }
+
+    model = JSON.parse(board.model)
   }
 
   return {

package/server/controllers/headless-playlist.ts

@@ -1,8 +1,9 @@
 import { getContextPath, getRepository } from '@things-factory/shell'
 
 import { PlayGroup } from '../service/play-group/play-group'
+import { BoardHistory } from '../service/board/board-history'
 
-export const headlessPlaylist = async target => {
+export const headlessPlaylist = async (target, devmode: boolean = false) => {
   var { domain, id, name } = target || {}
 
   if (id || name) {
@@ -20,6 +21,25 @@ export const headlessPlaylist = async target => {
       })
     }
 
+    if (!devmode && playGroup) {
+      const { boards } = playGroup
+      for (let board of boards) {
+        const latestReleased =
+          board.state == 'released'
+            ? board
+            : await getRepository(BoardHistory)
+                .createQueryBuilder('history')
+                .where('history.originalId = :originalId', { originalId: board.id })
+                .orderBy('history.version', 'DESC')
+                .limit(1)
+                .getOne()
+
+        if (latestReleased) {
+          board.model = latestReleased.model
+        }
+      }
+    }
+
     playGroup.boards = playGroup.boards.sort((a, b) => {
       // 배열 A에 포함된 아이디의 순서를 가져옵니다.
       const indexOfOrder = (playGroup.order || []).indexOf(a.id)

package/server/service/group/group.ts

@@ -14,6 +14,7 @@ import { ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
 import { Domain } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { Board } from '../board/board'
+import { BoardHistory } from '../board/board-history'
 
 @Entity()
 @Index('ix_group_0', (group: Group) => [group.domain, group.name], { unique: true })