@things-factory/attachment-base 7.0.1-rc.8 → 7.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/attachment-base",
-  "version": "7.0.1-rc.8",
+  "version": "7.0.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": "^7.0.1-rc.8",
-    "@things-factory/env": "^7.0.1-rc.8",
-    "@things-factory/shell": "^7.0.1-rc.8",
+    "@things-factory/auth-base": "^7.0.0",
+    "@things-factory/env": "^7.0.0",
+    "@things-factory/shell": "^7.0.0",
     "mime": "^3.0.0",
     "multer": "^1.4.5-lts.1"
   },
-  "gitHead": "cf1d0f8f261c73eadecb517fc6c82e92e50d6caf"
+  "gitHead": "02f50498ba92589813db2d13907894d2b9220d8c"
 }

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

@@ -65,9 +65,10 @@ export class AttachmentMutation {
   @Mutation(returns => Boolean)
   async deleteAttachmentsByRef(
     @Arg('refBys', type => [String]) refBys: string[],
+    @Arg('refType', type => String, { nullable: true }) refType: string,
     @Ctx() context: ResolverContext
   ): Promise<boolean> {
-    return await deleteAttachmentsByRef(null, { refBys }, context)
+    return await deleteAttachmentsByRef(null, { refBys, refType }, context)
   }
 
   @Directive('@transaction')
@@ -109,15 +110,17 @@ export class AttachmentMutation {
 export async function createAttachment(_: any, { attachment }, context: ResolverContext): Promise<Attachment> {
   const { file, category, refType = '', refBy, description } = attachment
   const { mimetype } = (await file) as FileUpload
-  
-  if(allowedMimeTypes instanceof Array && allowedMimeTypes.length > 0 && !allowedMimeTypes.includes('*/*')) {
+
+  if (allowedMimeTypes instanceof Array && allowedMimeTypes.length > 0 && !allowedMimeTypes.includes('*/*')) {
     const isAllowed = allowedMimeTypes.some(type => {
       const [typeMain, typeSub] = type.split('/')
       const [mimeMain, mimeSub] = mimetype.split('/')
-      return (typeMain === mimeMain && (typeSub === '*' || typeSub === mimeSub)) || (typeMain === '*' && typeSub === '*')
+      return (
+        (typeMain === mimeMain && (typeSub === '*' || typeSub === mimeSub)) || (typeMain === '*' && typeSub === '*')
+      )
     })
 
-    if(!isAllowed) {
+    if (!isAllowed) {
       throw Error(context.t(`error.not allowed file type for upload`, { mimetype }))
     }
   }
@@ -176,18 +179,32 @@ export async function deleteAttachment(_: any, { id }, context: ResolverContext)
   }
 }
 
-export async function deleteAttachmentsByRef(_: any, { refBys }, context: ResolverContext): Promise<boolean> {
+interface DeleteAttachmentsObject {
+  refBys: Array<string>
+  refType?: string
+}
+export async function deleteAttachmentsByRef(
+  _: any,
+  { refBys, refType = null }: DeleteAttachmentsObject,
+  context: ResolverContext
+): Promise<boolean> {
   const { domain, tx } = context.state
-
   const repository = tx ? tx.getRepository(Attachment) : getRepository(Attachment)
+  const inquryWhereClause: any = { domain: { id: domain.id }, refBy: In(refBys) }
+  const deleteWhereClause: any = { refBy: In(refBys) }
+  
+  // refType이 존재하면 where 절에 추가
+  if (refType) {
+    inquryWhereClause.refType = refType;
+    deleteWhereClause.refType = refType;
+  }
+  
   const attachments = await repository.find({
-    where: { domain: { id: domain.id }, refBy: In(refBys) }
+    where: inquryWhereClause
   })
 
   //remove attachment from repo
-  await repository.delete({
-    refBy: In(refBys)
-  })
+  await repository.delete(deleteWhereClause)
 
   //remove files from attachments folder
   if (attachments.length) {