@things-factory/attachment-base 8.0.0-alpha.8 → 8.0.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/attachment-base",
-  "version": "8.0.0-alpha.8",
+  "version": "8.0.0-beta.1",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -29,11 +29,11 @@
     "@aws-sdk/s3-presigned-post": "^3.46.0",
     "@azure/storage-blob": "^12.18.0",
     "@koa/multer": "^3.0.0",
-    "@things-factory/auth-base": "^8.0.0-alpha.8",
-    "@things-factory/env": "^8.0.0-alpha.8",
-    "@things-factory/shell": "^8.0.0-alpha.8",
+    "@things-factory/auth-base": "^8.0.0-beta.1",
+    "@things-factory/env": "^8.0.0-beta.1",
+    "@things-factory/shell": "^8.0.0-beta.1",
     "mime": "^3.0.0",
     "multer": "^1.4.5-lts.1"
   },
-  "gitHead": "0a9fb3ab431934982294b58c743d01b6f782a15f"
+  "gitHead": "36c494e587640c1490318ef7b95adab02606e0c2"
 }

package/server/index.ts

@@ -13,3 +13,12 @@ import './routes'
 
 export * from './attachment-const'
 export * from './util'
+
+import { normalizeNamesToNFC } from './nfc-normalize'
+
+process.on('bootstrap-module-start' as any, async ({ app, config, client }: any) => {
+  /* 이 코드는 기존 첨부파일의 NFC 정규화를 강제로 실행하기 위해서 임시로 작성되었다. */
+  normalizeNamesToNFC()
+    .then(() => console.log('Normalization completed.'))
+    .catch(err => console.error('Error during normalization:', err))
+})

package/server/nfc-normalize.ts

@@ -0,0 +1,25 @@
+import { getRepository } from '@things-factory/shell'
+import { Attachment } from './service/attachment/attachment'
+
+export async function normalizeNamesToNFC() {
+  const attachmentRepository = getRepository(Attachment)
+
+  // 모든 Attachment 항목을 조회
+  const attachments = await attachmentRepository.find()
+
+  // NFD로 저장된 name을 NFC로 변환하여 업데이트
+  for (const attachment of attachments) {
+    if (attachment.name) {
+      const normalizedName = attachment.name.normalize('NFC')
+
+      // name이 NFD로 저장된 경우만 업데이트
+      if (attachment.name !== normalizedName) {
+        attachment.name = normalizedName
+        await attachmentRepository.save(attachment)
+        console.log(`Updated name for attachment ID ${attachment.id}: ${normalizedName}`)
+      }
+    }
+  }
+
+  console.log('All names have been normalized to NFC.')
+}

package/server/service/attachment/attachment-query.ts

@@ -23,20 +23,7 @@ export class AttachmentQuery {
       domain,
       alias: 'attachment',
       searchables: ['name', 'description', 'tags']
-    }).addSelect([
-      'attachment.domain',
-      'attachment.id',
-      'attachment.name',
-      'attachment.path',
-      'attachment.size',
-      'attachment.mimetype',
-      'attachment.encoding',
-      'attachment.category',
-      'attachment.updatedAt',
-      'attachment.updater',
-      'attachment.createdAt',
-      'attachment.creator'
-    ])
+    })
 
     const [items, total] = await queryBuilder.getManyAndCount()
 

package/server/service/attachment/attachment.ts

@@ -75,7 +75,10 @@ export class Attachment {
   @Field()
   path?: string
 
-  @Column()
+  @Column({
+    nullable: true,
+    type: DATABASE_TYPE == 'mssql' ? 'bigint' : undefined
+  })
   @Field()
   size?: string
 
@@ -86,7 +89,10 @@ export class Attachment {
         ? 'longblob'
         : DATABASE_TYPE == 'postgres'
           ? 'bytea'
-          : 'blob'
+          : DATABASE_TYPE == 'mssql'
+            ? 'varbinary'
+            : 'blob',
+    length: DATABASE_TYPE == 'mssql' ? 'MAX' : undefined
   })
   contents?: Buffer
 

package/server/storage-database.ts

@@ -11,7 +11,9 @@ const crypto = require('crypto')
 if (STORAGE && STORAGE.type == 'database') {
   STORAGE.uploadFile = async ({ id, file, context }) => {
     var { createReadStream, filename, mimetype, encoding } = await file
-    filename = Buffer.from(filename, 'latin1').toString('utf-8') /* Because busboy uses latin1 encoding */
+    filename = Buffer.from(filename, 'latin1')
+      .toString('utf-8')
+      .normalize('NFC') /* Because busboy uses latin1 encoding */
 
     const stream = createReadStream()
 

package/server/storage-file.ts

@@ -14,7 +14,9 @@ if (STORAGE && STORAGE.type == 'file') {
 
   STORAGE.uploadFile = async ({ id, file }) => {
     var { createReadStream, filename, mimetype, encoding } = await file
-    filename = Buffer.from(filename, 'latin1').toString('utf-8') /* Because busboy uses latin1 encoding */
+    filename = Buffer.from(filename, 'latin1')
+      .toString('utf-8')
+      .normalize('NFC') /* Because busboy uses latin1 encoding */
 
     const stream = createReadStream()
 

package/server/storage-s3.ts

@@ -36,7 +36,9 @@ if (STORAGE && STORAGE.type == 's3') {
   /* upload file */
   STORAGE.uploadFile = async ({ id, file }) => {
     var { createReadStream, filename, mimetype, encoding } = await file
-    filename = Buffer.from(filename, 'latin1').toString('utf-8') /* Because busboy uses latin1 encoding */
+    filename = Buffer.from(filename, 'latin1')
+      .toString('utf-8')
+      .normalize('NFC') /* Because busboy uses latin1 encoding */
 
     const stream = createReadStream()
     id = id || crypto.randomUUID()