fix: rename bucketName -> bucketId in copy and move

Author: inian

src/routes/object/copyObject.ts

@@ -13,10 +13,10 @@ const copyRequestBodySchema = {
   type: 'object',
   properties: {
     sourceKey: { type: 'string', example: 'folder/source.png' },
-    bucketName: { type: 'string', example: 'avatars' },
+    bucketId: { type: 'string', example: 'avatars' },
     destinationKey: { type: 'string', example: 'folder/destination.png' },
   },
-  required: ['sourceKey', 'bucketName', 'destinationKey'],
+  required: ['sourceKey', 'bucketId', 'destinationKey'],
 } as const
 const successResponseSchema = {
   type: 'object',
@@ -48,11 +48,11 @@ export default async function routes(fastify: FastifyInstance) {
       const authHeader = request.headers.authorization
       const jwt = authHeader.substring('Bearer '.length)
 
-      const { sourceKey, destinationKey, bucketName } = request.body
+      const { sourceKey, destinationKey, bucketId } = request.body
       request.log.info(
         'sourceKey is %s and bucketName is %s and destinationKey is %s',
         sourceKey,
-        bucketName,
+        bucketId,
         destinationKey
       )
 
@@ -82,7 +82,7 @@ export default async function routes(fastify: FastifyInstance) {
         .select('bucket_id, metadata')
         .match({
           name: sourceKey,
-          bucket_id: bucketName,
+          bucket_id: bucketId,
         })
         .single()
 
@@ -112,11 +112,11 @@ export default async function routes(fastify: FastifyInstance) {
       }
       request.log.info({ results }, 'results')
 
-      const s3SourceKey = `${projectRef}/${bucketName}/${sourceKey}`
-      const s3DestinationKey = `${projectRef}/${bucketName}/${destinationKey}`
+      const s3SourceKey = `${projectRef}/${bucketId}/${sourceKey}`
+      const s3DestinationKey = `${projectRef}/${bucketId}/${destinationKey}`
       const copyResult = await copyObject(client, globalS3Bucket, s3SourceKey, s3DestinationKey)
       return response.status(copyResult.$metadata.httpStatusCode ?? 200).send({
-        Key: `${bucketName}/${destinationKey}`,
+        Key: `${bucketId}/${destinationKey}`,
       })
     }
   )

src/routes/object/moveObject.ts

@@ -12,11 +12,11 @@ const client = initClient(region, globalS3Endpoint)
 const moveObjectsBodySchema = {
   type: 'object',
   properties: {
-    bucketName: { type: 'string', example: 'avatars' },
+    bucketId: { type: 'string', example: 'avatars' },
     sourceKey: { type: 'string', example: 'folder/cat.png' },
     destinationKey: { type: 'string', example: 'folder/newcat.png' },
   },
-  required: ['bucketName', 'sourceKey', 'destinationKey'],
+  required: ['bucketId', 'sourceKey', 'destinationKey'],
 } as const
 const successResponseSchema = {
   type: 'object',
@@ -49,7 +49,7 @@ export default async function routes(fastify: FastifyInstance) {
       const authHeader = request.headers.authorization
       const jwt = authHeader.substring('Bearer '.length)
 
-      const { destinationKey, sourceKey, bucketName } = request.body
+      const { destinationKey, sourceKey, bucketId } = request.body
 
       if (!isValidKey(destinationKey)) {
         return response
@@ -67,7 +67,7 @@ export default async function routes(fastify: FastifyInstance) {
           last_accessed_at: new Date().toISOString(),
           name: destinationKey,
         })
-        .match({ bucket_id: bucketName, name: sourceKey })
+        .match({ bucket_id: bucketId, name: sourceKey })
         .single()
 
       if (objectResponse.error) {
@@ -77,8 +77,8 @@ export default async function routes(fastify: FastifyInstance) {
       }
 
       // if successfully updated, copy and delete object from s3
-      const oldS3Key = `${projectRef}/${bucketName}/${sourceKey}`
-      const newS3Key = `${projectRef}/${bucketName}/${destinationKey}`
+      const oldS3Key = `${projectRef}/${bucketId}/${sourceKey}`
+      const newS3Key = `${projectRef}/${bucketId}/${destinationKey}`
 
       // @todo what happens if one of these fail?
       await copyObject(client, globalS3Bucket, oldS3Key, newS3Key)

src/test/object.test.ts

@@ -344,7 +344,7 @@ describe('testing copy object', () => {
         authorization: `Bearer ${process.env.AUTHENTICATED_KEY}`,
       },
       payload: {
-        bucketName: 'bucket2',
+        bucketId: 'bucket2',
         sourceKey: 'authenticated/casestudy.png',
         destinationKey: 'authenticated/casestudy11.png',
       },
@@ -362,7 +362,7 @@ describe('testing copy object', () => {
         authorization: `Bearer ${anonKey}`,
       },
       payload: {
-        bucketName: 'bucket2',
+        bucketId: 'bucket2',
         sourceKey: 'authenticated/casestudy.png',
         destinationKey: 'authenticated/casestudy11.png',
       },
@@ -376,7 +376,7 @@ describe('testing copy object', () => {
       method: 'POST',
       url: '/object/copy',
       payload: {
-        bucketName: 'bucket2',
+        bucketId: 'bucket2',
         sourceKey: 'authenticated/casestudy.png',
         destinationKey: 'authenticated/casestudy11.png',
       },
@@ -393,7 +393,7 @@ describe('testing copy object', () => {
         authorization: `Bearer ${anonKey}`,
       },
       payload: {
-        bucketName: 'notfound',
+        bucketId: 'notfound',
         sourceKey: 'authenticated/casestudy.png',
         destinationKey: 'authenticated/casestudy11.png',
       },
@@ -410,7 +410,7 @@ describe('testing copy object', () => {
         authorization: `Bearer ${anonKey}`,
       },
       payload: {
-        bucketName: 'bucket2',
+        bucketId: 'bucket2',
         sourceKey: 'authenticated/notfound.png',
         destinationKey: 'authenticated/casestudy11.png',
       },
@@ -708,7 +708,7 @@ describe('testing move object', () => {
       payload: {
         sourceKey: 'authenticated/move-orig.png',
         destinationKey: 'authenticated/move-new.png',
-        bucketName: 'bucket2',
+        bucketId: 'bucket2',
       },
       headers: {
         authorization: `Bearer ${process.env.AUTHENTICATED_KEY}`,
@@ -726,7 +726,7 @@ describe('testing move object', () => {
       payload: {
         sourceKey: 'authenticated/move-orig-2.png',
         destinationKey: 'authenticated/move-new-2.png',
-        bucketName: 'bucket2',
+        bucketId: 'bucket2',
       },
       headers: {
         authorization: `Bearer ${anonKey}`,
@@ -744,7 +744,7 @@ describe('testing move object', () => {
       payload: {
         sourceKey: 'authenticated/move-orig-3.png',
         destinationKey: 'authenticated/move-orig-new-3.png',
-        bucketName: 'bucket2',
+        bucketId: 'bucket2',
       },
     })
     expect(response.statusCode).toBe(400)
@@ -759,7 +759,7 @@ describe('testing move object', () => {
       payload: {
         sourceKey: 'authenticated/move-orig-3.png',
         destinationKey: 'authenticated/move-orig-new-3.png',
-        bucketName: 'notfound',
+        bucketId: 'notfound',
       },
       headers: {
         authorization: `Bearer ${process.env.AUTHENTICATED_KEY}`,
@@ -777,7 +777,7 @@ describe('testing move object', () => {
       payload: {
         sourceKey: 'authenticated/notfound',
         destinationKey: 'authenticated/move-orig-new-3.png',
-        bucketName: 'bucket2',
+        bucketId: 'bucket2',
       },
       headers: {
         authorization: `Bearer ${process.env.AUTHENTICATED_KEY}`,
@@ -795,7 +795,7 @@ describe('testing move object', () => {
       payload: {
         sourceKey: 'authenticated/move-orig-2.png',
         destinationKey: 'authenticated/move-orig-3.png',
-        bucketName: 'bucket2',
+        bucketId: 'bucket2',
       },
       headers: {
         authorization: `Bearer ${process.env.AUTHENTICATED_KEY}`,