@things-factory/attachment-base 5.0.7 → 6.0.0-alpha.0

package/dist-server/util/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./upload-awb"), exports);
+//# sourceMappingURL=index.js.map

package/dist-server/util/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/util/index.ts"],"names":[],"mappings":";;;AAAA,uDAA4B","sourcesContent":["export * from './upload-awb'"]}

package/dist-server/util/upload-awb.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uploadAwb = void 0;
+require("../awb-storage-s3");
+const attachment_const_1 = require("../attachment-const");
+async function uploadAwb(param) {
+    const { content, title } = param;
+    let result = await attachment_const_1.AWBSTORAGE.uploadFile({ stream: content, filename: title });
+    return result;
+}
+exports.uploadAwb = uploadAwb;
+//# sourceMappingURL=upload-awb.js.map

package/dist-server/util/upload-awb.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upload-awb.js","sourceRoot":"","sources":["../../server/util/upload-awb.ts"],"names":[],"mappings":";;;AAAA,6BAA0B;AAE1B,0DAAgD;AAEzC,KAAK,UAAU,SAAS,CAAC,KAAU;IACxC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;IAEhC,IAAI,MAAM,GAAG,MAAM,6BAAU,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAA;IAE9E,OAAO,MAAM,CAAA;AACf,CAAC;AAND,8BAMC","sourcesContent":["import '../awb-storage-s3'\n\nimport { AWBSTORAGE } from '../attachment-const'\n\nexport async function uploadAwb(param: any) {\n  const { content, title } = param\n\n  let result = await AWBSTORAGE.uploadFile({ stream: content, filename: title })\n\n  return result\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/attachment-base",
-  "version": "5.0.7",
+  "version": "6.0.0-alpha.0",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -28,12 +28,12 @@
     "@aws-sdk/lib-storage": "^3.46.0",
     "@aws-sdk/s3-presigned-post": "^3.46.0",
     "@koa/multer": "^3.0.0",
-    "@things-factory/auth-base": "^5.0.7",
-    "@things-factory/env": "^5.0.0",
-    "@things-factory/shell": "^5.0.7",
+    "@things-factory/auth-base": "^6.0.0-alpha.0",
+    "@things-factory/env": "^6.0.0-alpha.0",
+    "@things-factory/shell": "^6.0.0-alpha.0",
     "memfs": "^3.0.1",
     "mime": "^2.4.4",
     "multer": "^1.4.5-lts.1"
   },
-  "gitHead": "1c7c7618e2e3c9ef8b07d730c3df84c8bc01b35f"
+  "gitHead": "e5b9823ab3ebc5d6ae5bcb4b5aa60c1306e4dd7e"
 }

package/server/attachment-const.ts

@@ -1,4 +1,5 @@
 import { config } from '@things-factory/env'
 
 export var STORAGE: any = config.get('storage')
+export var AWBSTORAGE: any = config.get('awbFileStorage')
 export const ATTACHMENT_PATH: string = config.get('attachmentPath', 'attachment')

package/server/awb-storage-s3.ts

@@ -0,0 +1,44 @@
+import { S3Client } from '@aws-sdk/client-s3'
+import { Upload } from '@aws-sdk/lib-storage'
+import { logger } from '@things-factory/env'
+
+import { AWBSTORAGE } from './attachment-const'
+
+if (AWBSTORAGE && AWBSTORAGE.type == 's3') {
+  const client = new S3Client({
+    credentials: {
+      accessKeyId: AWBSTORAGE.accessKeyId,
+      secretAccessKey: AWBSTORAGE.secretAccessKey
+    },
+    region: AWBSTORAGE.region
+  })
+
+  /* upload file */
+  AWBSTORAGE.uploadFile = async ({ stream, filename }) => {
+    const upload = new Upload({
+      client,
+      params: {
+        Bucket: AWBSTORAGE.bucketName,
+        Key: `${filename}.pdf`,
+        Body: stream,
+        ContentType: 'application/pdf'
+      }
+    })
+
+    let result
+    let url
+    try {
+      result = (await upload.done()) as any
+      url = `https://${AWBSTORAGE.bucketName}.s3.${AWBSTORAGE.region}.amazonaws.com/${filename}.pdf`
+    } catch (e) {
+      console.log(e)
+    }
+
+    return {
+      result,
+      url
+    }
+  }
+
+  logger.info('operato-awb: S3 Bucket Storage is Ready.')
+}

package/server/index.ts

@@ -13,3 +13,4 @@ export {
 import './routes'
 
 export * from './attachment-const'
+export * from './util'

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

@@ -2,9 +2,10 @@ import type { FileUpload } from 'graphql-upload/GraphQLUpload.js'
 import GraphQLUpload from 'graphql-upload/GraphQLUpload.js'
 import promisesAll from 'promises-all'
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { getRepository, In } from 'typeorm'
+import { In } from 'typeorm'
 
 import { logger } from '@things-factory/env'
+import { getRepository } from '@things-factory/shell'
 
 import { STORAGE } from '../../attachment-const'
 import { Attachment } from './attachment'
@@ -16,7 +17,7 @@ export class AttachmentMutation {
   @Mutation(returns => Attachment)
   async createAttachment(
     @Arg('attachment', type => NewAttachment) attachment: NewAttachment,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Attachment> {
     return await createAttachment(null, { attachment }, context)
   }
@@ -25,7 +26,7 @@ export class AttachmentMutation {
   @Mutation(returns => [Attachment])
   async createAttachments(
     @Arg('attachments', type => [NewAttachment]) attachments: NewAttachment[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Attachment[]> {
     return await createAttachments(null, { attachments }, context)
   }
@@ -35,11 +36,11 @@ export class AttachmentMutation {
   async updateAttachment(
     @Arg('id') id: string,
     @Arg('patch', type => AttachmentPatch) patch: AttachmentPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Attachment> {
     const attachment = await getRepository(Attachment).findOne({
       where: {
-        domain: context.state.domain,
+        domain: { id: context.state.domain.id },
         id
       }
     })
@@ -53,7 +54,7 @@ export class AttachmentMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deleteAttachment(@Arg('id') id: string, @Ctx() context: any): Promise<boolean> {
+  async deleteAttachment(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {
     return await deleteAttachment(null, { id }, context)
   }
 
@@ -61,14 +62,17 @@ export class AttachmentMutation {
   @Mutation(returns => Boolean)
   async deleteAttachmentsByRef(
     @Arg('refBys', type => [String]) refBys: string[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<boolean> {
     return await deleteAttachmentsByRef(null, { refBys }, context)
   }
 
   @Directive('@transaction')
   @Mutation(returns => Attachment)
-  async singleUpload(@Arg('file', type => GraphQLUpload) file: FileUpload, @Ctx() context: any): Promise<Attachment> {
+  async singleUpload(
+    @Arg('file', type => GraphQLUpload) file: FileUpload,
+    @Ctx() context: ResolverContext
+  ): Promise<Attachment> {
     return await singleUpload(null, { file }, context)
   }
 
@@ -76,7 +80,7 @@ export class AttachmentMutation {
   @Mutation(returns => [Attachment])
   async multipleUpload(
     @Arg('files', type => [GraphQLUpload]) files: FileUpload[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Attachment[]> {
     return await multipleUpload(null, { files }, context)
   }
@@ -84,13 +88,13 @@ export class AttachmentMutation {
   @Mutation(returns => UploadURL)
   async generateUploadURL(
     @Arg('type', type => String) type: string,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<{ url: string; fields: { [key: string]: string } }> {
     return await generateUploadURL(null, { type }, context)
   }
 }
 
-export async function createAttachment(_: any, { attachment }, context: any): Promise<Attachment> {
+export async function createAttachment(_: any, { attachment }, context: ResolverContext): Promise<Attachment> {
   const { file, category, refType = '', refBy, description } = attachment
   const { createReadStream, filename, mimetype, encoding } = await file
   const stream = createReadStream()
@@ -115,7 +119,7 @@ export async function createAttachment(_: any, { attachment }, context: any): Pr
   })
 }
 
-export async function createAttachments(_: any, { attachments }, context: any): Promise<Attachment[]> {
+export async function createAttachments(_: any, { attachments }, context: ResolverContext): Promise<Attachment[]> {
   const { resolve, reject } = await promisesAll.all(
     attachments.map(attachment => createAttachment(_, { attachment }, context))
   )
@@ -129,10 +133,12 @@ export async function createAttachments(_: any, { attachments }, context: any):
   return resolve
 }
 
-export async function deleteAttachment(_: any, { id }, context: any): Promise<boolean> {
+export async function deleteAttachment(_: any, { id }, context: ResolverContext): Promise<boolean> {
+  const { domain } = context.state
+
   const repository = getRepository(Attachment)
   const attachment = await repository.findOne({
-    where: { domain: context.state.domain, id }
+    where: { domain: { id: domain.id }, id }
   })
 
   if (attachment) {
@@ -144,12 +150,12 @@ export async function deleteAttachment(_: any, { id }, context: any): Promise<bo
   }
 }
 
-export async function deleteAttachmentsByRef(_: any, { refBys }, context: any): Promise<boolean> {
+export async function deleteAttachmentsByRef(_: any, { refBys }, context: ResolverContext): Promise<boolean> {
   const { domain } = context.state
 
   const repository = getRepository(Attachment)
   const attachments = await repository.find({
-    where: { domain, refBy: In(refBys) }
+    where: { domain: { id: domain.id }, refBy: In(refBys) }
   })
 
   //remove attachment from repo
@@ -174,15 +180,15 @@ export async function deleteAttachmentsByRef(_: any, { refBys }, context: any):
 export async function generateUploadURL(
   _: any,
   { type },
-  context: any
+  context: ResolverContext
 ): Promise<{ url: string; fields: { [key: string]: string } }> {
   return await STORAGE.generateUploadURL(type)
 }
 
-export async function singleUpload(_: any, { file }, context: any): Promise<Attachment> {
+export async function singleUpload(_: any, { file }, context: ResolverContext): Promise<Attachment> {
   return await createAttachment(null, { attachment: { file } }, context)
 }
 
-export async function multipleUpload(_: any, { files }, context: any): Promise<Attachment[]> {
+export async function multipleUpload(_: any, { files }, context: ResolverContext): Promise<Attachment[]> {
   return await createAttachments(null, { attachments: { files } }, context)
 }

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

@@ -1,8 +1,7 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 
 import { AttachmentList } from '../'
 import { Attachment } from './attachment'
@@ -10,7 +9,7 @@ import { Attachment } from './attachment'
 @Resolver(Attachment)
 export class AttachmentQuery {
   @Query(returns => AttachmentList)
-  async attachments(@Ctx() context: any, @Args() params: ListParam): Promise<AttachmentList> {
+  async attachments(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<AttachmentList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -26,30 +25,32 @@ export class AttachmentQuery {
   }
 
   @Query(returns => Attachment)
-  async attachment(@Arg('id') id: string, @Ctx() context: any): Promise<Attachment> {
+  async attachment(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<Attachment> {
+    const { domain } = context.state
+
     return await getRepository(Attachment).findOne({
-      where: { domain: context.state.domain, id },
+      where: { domain: { id: domain.id }, id },
       relations: ['domain', 'creator', 'updater']
     })
   }
 
   @FieldResolver(type => Domain)
   async domain(@Root() attachment: Attachment) {
-    return await getRepository(Domain).findOne({
+    return await getRepository(Domain).findOneBy({
       id: attachment.domainId
     })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() attachment: Attachment): Promise<User> {
-    return await getRepository(User).findOne({
+    return await getRepository(User).findOneBy({
       id: attachment.updaterId
     })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() attachment: Attachment): Promise<User> {
-    return await getRepository(User).findOne({
+    return await getRepository(User).findOneBy({
       id: attachment.creatorId
     })
   }

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

@@ -21,7 +21,7 @@ export class UploadURL {
   url: string
 
   @Field(type => ScalarAny)
-  fields: ScalarAny
+  fields: any
 }
 
 @InputType()

package/server/service/attachment/attachment.ts

@@ -61,11 +61,11 @@ export class Attachment {
 
   @Column({ nullable: true, default: '' })
   @Field({ nullable: true })
-  refType: String = ''
+  refType: string = ''
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  refBy: String
+  refBy: string
 
   @Column()
   @Field()

package/server/util/index.ts

@@ -0,0 +1 @@
+export * from './upload-awb'

package/server/util/upload-awb.ts

@@ -0,0 +1,11 @@
+import '../awb-storage-s3'
+
+import { AWBSTORAGE } from '../attachment-const'
+
+export async function uploadAwb(param: any) {
+  const { content, title } = param
+
+  let result = await AWBSTORAGE.uploadFile({ stream: content, filename: title })
+
+  return result
+}