File upload functionality for own interiors (#39)

.env.example

@@ -2,3 +2,7 @@ DATABASE_URL=postgresql://fondberg:@docker.for.mac.localhost/photowall
 COGNITO_POOL_ID=eu-west-1_3O4VfvPn7
 INTERIORS_TOKEN=
 INTERIORS_URL=https://0hrq0zel2h.execute-api.eu-west-1.amazonaws.com/Prod
+AWS_SECRET_ACCESS_KEY=
+AWS_ACCESS_KEY_ID=
+AWS_DEFAULT_REGION=eu-west-1
+

cloudformation/Makefile

@@ -31,12 +31,16 @@ ifeq ($(STACK_ENVIRONMENT_NAME),production)
 	DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_PRODUCTION)
 	CPU_SIZE=1024
 	MEMORY_SIZE=2GB
+	IMAGES_BUCKET=photowall-images
+	UPLOAD_BUCKET=photowall-inquiries
 else
 	SUBDOMAIN=$(STACK_NAME)-$(STACK_ENVIRONMENT_NAME)
 	GITHUB_BRANCH=$(STACK_ENVIRONMENT_NAME)
 	DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_STAGING)
 	CPU_SIZE=512
 	MEMORY_SIZE=1GB
+	IMAGES_BUCKET=photowall-images-dev
+	UPLOAD_BUCKET=photowall-inquiries-dev
 endif
 
 check-create-initial-ecr-image:
@@ -99,7 +103,9 @@ create-stack: check-create-variables-set check-create-initial-ecr-image
 								 ParameterKey="GitHubBranch",ParameterValue="$(GITHUB_BRANCH)" \
 								 ParameterKey="GitHubToken",ParameterValue="$(GITHUB_TOKEN)" \
 								 ParameterKey="CpuSize",ParameterValue="$(CPU_SIZE)" \
-								 ParameterKey="MemorySize",ParameterValue="$(MEMORY_SIZE)"
+								 ParameterKey="MemorySize",ParameterValue="$(MEMORY_SIZE)" \
+								 ParameterKey="ImagesBucket",ParameterValue="$(IMAGES_BUCKET)" \
+								 ParameterKey="UploadBucket",ParameterValue="$(UPLOAD_BUCKET)"
 
 update-stack: set-repository-lifecycle-policy
 	$(call checkdef,STACK_NAME)
@@ -117,4 +123,6 @@ update-stack: set-repository-lifecycle-policy
 								 ParameterKey="GitHubBranch",UsePreviousValue=true \
 								 ParameterKey="GitHubToken",UsePreviousValue=true \
 								 ParameterKey="CpuSize",ParameterValue="$(CPU_SIZE)" \
-								 ParameterKey="MemorySize",ParameterValue="$(MEMORY_SIZE)"
+								 ParameterKey="MemorySize",ParameterValue="$(MEMORY_SIZE)" \
+								 ParameterKey="ImagesBucket",ParameterValue="$(IMAGES_BUCKET)" \
+								 ParameterKey="UploadBucket",ParameterValue="$(UPLOAD_BUCKET)"

cloudformation/ecs-service.yaml

@@ -87,6 +87,12 @@ Parameters:
   GitHubUser:
     Type: String
 
+  # Buckets
+  ImagesBucket:
+    Type: String
+  UploadBucket:
+    Type: String
+
 Resources:
   Cluster:
     Type: AWS::ECS::Cluster
@@ -149,6 +155,32 @@ Resources:
       ManagedPolicyArns:
         - 'arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy'
         - arn:aws:iam::aws:policy/AmazonSSMReadOnlyAccess
+
+  TaskRoleAccessPolicy:
+    Type: 'AWS::IAM::ManagedPolicy'
+    Properties:
+      Description: Create access policies for the container task
+      Path: /
+      PolicyDocument:
+        Version: '2012-10-17'
+        Statement:
+          - Effect: Allow
+            Action:
+              - s3:*
+            Resource: !Sub arn:aws:s3:::${ImagesBucket}/*
+          - Effect: Allow
+            Action:
+              - s3:*
+            Resource: !Sub arn:aws:s3:::${ImagesBucket}
+          - Effect: Allow
+            Action:
+              - s3:*
+            Resource: !Sub arn:aws:s3:::${UploadBucket}/*
+          - Effect: Allow
+            Action:
+              - s3:*
+            Resource: !Sub arn:aws:s3:::${UploadBucket}
+
   # A role for the containers
   TaskRole:
     Type: AWS::IAM::Role
@@ -160,6 +192,8 @@ Resources:
             Principal:
               Service: ecs-tasks.amazonaws.com
             Action: 'sts:AssumeRole'
+      ManagedPolicyArns:
+        - !Ref TaskRoleAccessPolicy
 
   # A role needed for auto scaling
   AutoScalingRole:

docker-compose.yml

@@ -16,6 +16,9 @@ services:
       - DATABASE_URL=${DATABASE_URL}
       - INTERIORS_TOKEN=${INTERIORS_TOKEN}
       - INTERIORS_URL=${INTERIORS_URL}
+      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
+      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
+      - AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION}
 
 networks:
   default:

package.json

@@ -11,6 +11,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.31.0",
+    "@aws-sdk/s3-request-presigner": "^3.31.0",
     "apollo-datasource": "^3.1.0",
     "apollo-datasource-rest": "^3.2.0",
     "apollo-server": "^3.3.0",

src/config.ts

@@ -17,3 +17,13 @@ export const dbConfig = {
     },
   ],
 };
+
+export const uploadBucket =
+  process.env.ENVIRONMENT_NAME === 'production'
+    ? 'photowall-inquiries-dev'
+    : 'photowall-inquiries-dev';
+
+export const imageBucket =
+  process.env.ENVIRONMENT_NAME === 'production'
+    ? 'photowall-images'
+    : 'photowall-images-dev';

src/datasources/interior-api.ts

@@ -4,10 +4,11 @@ import {
   InteriorType,
 } from '../types/interior-types';
 import { Orientation } from '../types/product-types';
-import { Maybe } from '../types/types';
+import { IdNumberResult, Maybe } from '../types/types';
 import { BaseSQLDataSource } from './BaseSQLDataSource';
 import { ImageServerApi } from './imageserver-api';
-import { convertToPossibleType } from './utils';
+import * as CONFIG from '../config';
+import { moveS3File } from '../s3';
 
 const MINUTE = 60;
 
@@ -120,4 +121,35 @@ export class InteriorAPI extends BaseSQLDataSource {
         });
       });
   }
+
+  // Mutations
+  async addOwnUploadToPrintId(
+    printId: number,
+    uploadedS3Key: string,
+  ): Promise<IdNumberResult> {
+    // Get the last position entered in interiors for this printId
+    const positionRes: any = await this.knex
+      .queryBuilder()
+      .from('interiors')
+      .where({ print_id: printId })
+      .max('position')
+      .first();
+    const position = positionRes.max === null ? 0 : positionRes.max + 1;
+
+    // Insert the printId in interiors returning the id (important as it is used as image key name)
+    const res = await this.knex('interiors')
+      .insert({ print_id: printId, position: position })
+      .returning('id');
+    const interiorId = res[0];
+    // Move file
+    moveS3File(
+      CONFIG.uploadBucket,
+      uploadedS3Key,
+      CONFIG.imageBucket,
+      `interior-images/${interiorId}.jpg`,
+    );
+    return {
+      id: interiorId,
+    };
+  }
 }

src/resolvers/file-upload-resolvers.ts

@@ -0,0 +1,31 @@
+import { EXPIRES_DEFAULT_SECS, getSignedPutObjectUrl } from '../s3';
+import {
+  SignedUploadURL,
+  SignedUploadURLInput,
+} from '../types/file-upload-types';
+import * as CONFIG from '../config';
+
+async function getSignedFileUploadURL(
+  _,
+  args: SignedUploadURLInput,
+  __,
+): Promise<SignedUploadURL> {
+  const config = args.config;
+  const bucket = CONFIG.uploadBucket;
+
+  const url = await getSignedPutObjectUrl(
+    bucket,
+    config.key,
+    config.contentType,
+  );
+  return {
+    url: url,
+    key: config.key,
+    bucket: bucket,
+    expires: EXPIRES_DEFAULT_SECS,
+  };
+}
+
+export const imagesQueryTypeDefs = {
+  signedFileUploadURL: getSignedFileUploadURL,
+};

src/resolvers/index.ts

@@ -18,6 +18,7 @@ import {
 
 import { DateTimeResolver, DateResolver, JSONResolver } from 'graphql-scalars';
 import { interiorsQueryTypeDefs, interiorTypeDefs } from './interiors-resolver';
+import { imagesQueryTypeDefs } from './file-upload-resolvers';
 const resolvers = {
   Query: {
     ...orderQueryTypeDefs,
@@ -27,6 +28,7 @@ const resolvers = {
     ...keywordsQueryTypeDefs,
     ...marketsQueryTypeDefs,
     ...interiorsQueryTypeDefs,
+    ...imagesQueryTypeDefs,
   },
   Mutation: {
     ...productMutationTypeDefs,

src/resolvers/products-resolver.ts

@@ -4,6 +4,7 @@ import {
   ProductListResult,
   ProductsFilterInput,
 } from '../types/product-types';
+import * as CONFIG from '../config';
 import { CategoryAPI } from '../datasources/category-api';
 import { Category } from '../types/category-types';
 import { KeywordAPI } from '../datasources/keyword-api';
@@ -11,6 +12,7 @@ import { Keyword } from '../types/keyword-types';
 import { MarketLocaleAPI } from '../datasources/market-locale-api';
 import { InteriorAPI } from '../datasources/interior-api';
 import { InteriorsLambdaAPI } from '../datasources/interiors-lambda-api';
+import { IdNumberResult } from '../types/types';
 
 const ProductBlacklist = {
   async market(parent, _args, { dataSources }) {
@@ -127,6 +129,16 @@ export const productMutationTypeDefs = {
     );
     return (<ProductAPI>dataSources.productApi).getProduct(productId);
   },
+  async addOwnInteriorToPrintProduct(
+    _,
+    { printId, uploadedS3Key },
+    { dataSources },
+  ): Promise<IdNumberResult> {
+    return (<InteriorAPI>dataSources.interiorApi).addOwnUploadToPrintId(
+      printId,
+      uploadedS3Key,
+    );
+  },
   async productWallpaperType(
     _,
     { productId, wallpaperTypes },

src/s3.ts

@@ -0,0 +1,48 @@
+import {
+  S3Client,
+  CopyObjectCommand,
+  DeleteObjectCommand,
+  PutObjectCommand,
+} from '@aws-sdk/client-s3';
+import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
+export const EXPIRES_DEFAULT_SECS = 300;
+
+export const getSignedPutObjectUrl = (
+  bucket: string,
+  key: string,
+  contentType: string,
+): Promise<string> => {
+  const s3 = new S3Client({ region: 'eu-west-1' });
+
+  return getSignedUrl(
+    s3,
+    new PutObjectCommand({
+      Bucket: bucket,
+      Key: key,
+      ContentType: contentType,
+    }),
+    { expiresIn: EXPIRES_DEFAULT_SECS },
+  );
+};
+
+export const moveS3File = async (
+  fromBucket: string,
+  fromKey: string,
+  toBucket: string,
+  toKey: string,
+): Promise<any> => {
+  const s3 = new S3Client({ region: 'eu-west-1' });
+
+  const copyCmd = new CopyObjectCommand({
+    Bucket: toBucket,
+    CopySource: `${fromBucket}/${fromKey}`,
+    Key: toKey,
+  });
+  await s3.send(copyCmd);
+
+  const deleteCmd = new DeleteObjectCommand({
+    Bucket: fromBucket,
+    Key: fromKey,
+  });
+  return s3.send(deleteCmd);
+};

src/schema.graphql

@@ -5,6 +5,17 @@ scalar DateTime
 scalar Date
 scalar JSON
 
+enum CacheControlScope {
+  PUBLIC
+  PRIVATE
+}
+
+directive @cacheControl(
+  maxAge: Int
+  scope: CacheControlScope
+  inheritMaxAge: Boolean
+) on FIELD_DEFINITION | OBJECT | INTERFACE | UNION
+
 type Query {
   orders(pagination: PaginationInput!, filter: DateFilterInput!): OrdersResult
   order(id: ID!): Order
@@ -24,6 +35,13 @@ type Query {
   locales: [Locale]
   locale(value: String!): Locale
   interiors(filter: InteriorsFilterInput): [Interior]
+  signedFileUploadURL(config: SignedUploadURLInput): SignedUploadURL
+    @cacheControl(maxAge: 0)
+}
+
+input SignedUploadURLInput {
+  contentType: String!
+  key: String!
 }
 
 input PaginationInput {
@@ -68,6 +86,13 @@ input InteriorsFilterInput {
   productId: Int!
 }
 
+type SignedUploadURL {
+  url: String!
+  key: String!
+  bucket: String!
+  expires: Int!
+}
+
 type Market {
   id: ID!
   name: String!
@@ -394,6 +419,10 @@ input ProductBlacklistingInput {
   groupIds: [Int]
 }
 
+type IdNumberResult {
+  id: Int!
+}
+
 type Mutation {
   productInfo(productId: Int!, info: ProductInfoInput!): Product
   productFocusPoint(
@@ -407,6 +436,10 @@ type Mutation {
   ): Product
   productGroup(productId: Int!, groupIds: [Int]): Product
   productKeywords(productId: Int!, keywordIds: [Int]): Product
+  addOwnInteriorToPrintProduct(
+    printId: Int!
+    uploadedS3Key: String!
+  ): IdNumberResult
   productWallpaperType(
     productId: Int!
     wallpaperTypes: [ProductWallpaperType]!

src/types/file-upload-types.ts

@@ -0,0 +1,15 @@
+export interface SignedUploadURLInput {
+  config: SignedUploadURLInputConfig;
+}
+
+export interface SignedUploadURLInputConfig {
+  contentType: string;
+  key: string;
+}
+
+export interface SignedUploadURL {
+  url: string;
+  key: string;
+  bucket: string;
+  expires: number;
+}

src/types/types.ts

@@ -24,3 +24,7 @@ export interface PaginationResult {
   offset: number;
   limit: number;
 }
+
+export interface IdNumberResult {
+  id: number;
+}