refactor, fix bug reading existing attachments

Author: kevinkim-ogp

packages/backend/src/apps/postman/common/parameters.ts

@@ -80,26 +80,10 @@ export const transactionalEmailFields: IField[] = [
     key: 'attachments',
     description:
       'Check supported file types [here](https://guide.postman.gov.sg/email-api-guide/programmatic-email-api/send-email-api/attachments#list-of-supported-attachment-file-types).\nPlease note that the maximum file size for each file is 2MB, and the total size of all attachments cannot exceed 10MB.',
-    type: 'attachment-multicheckbox' as const,
+    type: 'attachment' as const,
     required: false,
     variables: true,
     variableTypes: ['file'],
-    subFields: [
-      {
-        label: 'FormSG attachments',
-        key: 'formsgAttachments',
-        type: 'string' as const,
-        required: false,
-        variables: true,
-      },
-      {
-        label: 'Uploaded attachments',
-        key: 'uploadedAttachments',
-        type: 'string' as const,
-        required: false,
-        variables: false,
-      },
-    ],
   },
 ]
 

packages/backend/src/graphql/mutations/generate-presigned-url.ts

@@ -1,6 +1,5 @@
 import { randomUUID } from 'crypto'
 
-import appConfig from '@/config/app'
 import { COMMON_S3_BUCKET, getPresignedUrl } from '@/helpers/s3'
 import Flow from '@/models/flow'
 
@@ -25,14 +24,7 @@ const generatePresignedUrl: MutationResolvers['generatePresignedUrl'] = async (
     manualUpload: manualUpload.toString(),
   })
 
-  const customUrl = url.replace(
-    new RegExp(
-      `https://${COMMON_S3_BUCKET}\\.s3\\.[a-z0-9-]+\\.amazonaws\\.com`,
-    ),
-    `https://upload-${appConfig.appEnv}.plumber.gov.sg`,
-  )
-
-  return { url: customUrl, s3Id: `s3:${COMMON_S3_BUCKET}:${filePath}` }
+  return { url, s3Id: `s3:${COMMON_S3_BUCKET}:${filePath}` }
 }
 
 export default generatePresignedUrl

packages/backend/src/graphql/schema.graphql

@@ -379,6 +379,7 @@ type FlowTemplateConfig {
 
 type FlowAttachmentConfig {
   name: String!
+  displayedValue: String!
   value: String!
   size: Int!
   updatedAt: String!
@@ -454,6 +455,7 @@ enum NotificationFrequency {
 
 input FlowAttachmentsConfigInput {
   name: String!
+  displayedValue: String!
   value: String!
   size: Int!
   updatedAt: String!