From 400fb45e34442baee6fd0a7a241d9ee7ae6ea64e Mon Sep 17 00:00:00 2001 From: vighnesh153 Date: Sat, 9 Nov 2024 15:30:32 +0530 Subject: [PATCH] fix: refactoring and bug fixes --- tools-nodejs/api-vighnesh153/package-lock.json | 16 ++++++++-------- tools-nodejs/api-vighnesh153/package.json | 4 ++-- .../src/common/dynamo_db_table_metadata.ts | 15 +++------------ .../src/createUploadPresignedUrl/controller.ts | 3 ++- .../src/googleAuthCallback/controller.test.ts | 4 ++-- 5 files changed, 17 insertions(+), 25 deletions(-) diff --git a/tools-nodejs/api-vighnesh153/package-lock.json b/tools-nodejs/api-vighnesh153/package-lock.json index ef41bf4e..a281dbd2 100644 --- a/tools-nodejs/api-vighnesh153/package-lock.json +++ b/tools-nodejs/api-vighnesh153/package-lock.json @@ -21,8 +21,8 @@ "@types/aws-lambda": "^8.10.145", "@types/cookie": "^0.6.0", "@types/node": "*", - "@vighnesh153/tools": "npm:@jsr/vighnesh153__tools@^0.1.12", - "@vighnesh153/tools-server": "npm:@jsr/vighnesh153__tools-server@^0.1.4", + "@vighnesh153/tools": "npm:@jsr/vighnesh153__tools@^0.1.13", + "@vighnesh153/tools-server": "npm:@jsr/vighnesh153__tools-server@^0.1.5", "@vighnesh153/tsconfig": "0.4.8", "cookie": "^1.0.1", "sst": "^3.2.70", @@ -2810,9 +2810,9 @@ }, "node_modules/@vighnesh153/tools": { "name": "@jsr/vighnesh153__tools", - "version": "0.1.12", - "resolved": "https://npm.jsr.io/~/11/@jsr/vighnesh153__tools/0.1.12.tgz", - "integrity": "sha512-isNw0e8w+DTOPdu0aB4eQJJkyCucHat4vboZ3g+KEFK/rfZRK2D4ZnXVQA9pn+XOqxx8sVu6qjUNnWSaI2WKnA==", + "version": "0.1.13", + "resolved": "https://npm.jsr.io/~/11/@jsr/vighnesh153__tools/0.1.13.tgz", + "integrity": "sha512-xtTobMG9c2gGen3ReQZjy70imemTTKVodLX+KeCpzwUNvsOsD7mc6aGlnLIm7ZTyfj/FvWvZasOTjuQHJUf2hQ==", "dev": true, "dependencies": { "@jsr/kitsonk__xhr": "^0.5.0", @@ -2823,9 +2823,9 @@ }, "node_modules/@vighnesh153/tools-server": { "name": "@jsr/vighnesh153__tools-server", - "version": "0.1.4", - "resolved": "https://npm.jsr.io/~/11/@jsr/vighnesh153__tools-server/0.1.4.tgz", - "integrity": "sha512-1NYtLoVbK/qWhwYozlHg4tILKn8WM6KLbkeSRJ4ylERKae08CVKtzW+HfsA3ym5oLCyDYv4bjDv6bCbyjy0I/w==", + "version": "0.1.5", + "resolved": "https://npm.jsr.io/~/11/@jsr/vighnesh153__tools-server/0.1.5.tgz", + "integrity": "sha512-73IiBjsj8t9yiR6OB/CEmNJpRifYlKksHHMkjvbdR1unpdFN/msye4VkbigKg/AxNBilswO9ml9TTU/tHbCTXQ==", "dev": true, "dependencies": { "@aws-sdk/client-dynamodb": "^3.682.0", diff --git a/tools-nodejs/api-vighnesh153/package.json b/tools-nodejs/api-vighnesh153/package.json index b5a4bdb1..ce0aab9f 100644 --- a/tools-nodejs/api-vighnesh153/package.json +++ b/tools-nodejs/api-vighnesh153/package.json @@ -35,8 +35,8 @@ "@types/aws-lambda": "^8.10.145", "@types/cookie": "^0.6.0", "@types/node": "*", - "@vighnesh153/tools": "npm:@jsr/vighnesh153__tools@^0.1.12", - "@vighnesh153/tools-server": "npm:@jsr/vighnesh153__tools-server@^0.1.4", + "@vighnesh153/tools": "npm:@jsr/vighnesh153__tools@^0.1.13", + "@vighnesh153/tools-server": "npm:@jsr/vighnesh153__tools-server@^0.1.5", "@vighnesh153/tsconfig": "0.4.8", "cookie": "^1.0.1", "sst": "^3.2.70", diff --git a/tools-nodejs/api-vighnesh153/src/common/dynamo_db_table_metadata.ts b/tools-nodejs/api-vighnesh153/src/common/dynamo_db_table_metadata.ts index fb49fcd5..0114102e 100644 --- a/tools-nodejs/api-vighnesh153/src/common/dynamo_db_table_metadata.ts +++ b/tools-nodejs/api-vighnesh153/src/common/dynamo_db_table_metadata.ts @@ -1,7 +1,4 @@ -import type { - DynamoTypeMap, - TableMetadata, -} from "@vighnesh153/tools-server/aws_dynamodb"; +import type { DynamoTypeMap } from "@vighnesh153/tools-server/aws_dynamodb"; export const userInfoFields = /* @__PURE__ */ { userId: "string", @@ -11,10 +8,6 @@ export const userInfoFields = /* @__PURE__ */ { createdAtMillis: "number", } satisfies Record; -export const UserInfoTableMetadata = /* @__PURE__ */ { - fields: userInfoFields, -} satisfies Partial; - export const filesMetadataFields = /* @__PURE__ */ { fileId: "string", filePath: "string", @@ -22,8 +15,6 @@ export const filesMetadataFields = /* @__PURE__ */ { fileSizeInBytes: "number", createdAtMillis: "number", createdBy: "string", + // whether the file is uploaded at this filePath + isUploaded: "boolean", } satisfies Record; - -export const FilesMetadataTableMetadata = /* @__PURE__ */ { - fields: filesMetadataFields, -} satisfies Partial; diff --git a/tools-nodejs/api-vighnesh153/src/createUploadPresignedUrl/controller.ts b/tools-nodejs/api-vighnesh153/src/createUploadPresignedUrl/controller.ts index 2558c890..33edb6cf 100644 --- a/tools-nodejs/api-vighnesh153/src/createUploadPresignedUrl/controller.ts +++ b/tools-nodejs/api-vighnesh153/src/createUploadPresignedUrl/controller.ts @@ -158,7 +158,7 @@ export async function controller({ const fileExtension = file.fileExtension.length > 0 ? `.${file.fileExtension}` : ""; - const filePath = `/${mediaType}/id${fileExtension}`; + const filePath = `/${mediaType}/${id}${fileExtension}`; return { clientSideId: file.clientSideId, fileId: id, @@ -226,6 +226,7 @@ export async function controller({ createdBy: metadata.createdBy, createdAtMillis: metadata.createdAtMillis, fileSizeInBytes: metadata.fileSizeInBytes, + isUploaded: false, })), }); diff --git a/tools-nodejs/api-vighnesh153/src/googleAuthCallback/controller.test.ts b/tools-nodejs/api-vighnesh153/src/googleAuthCallback/controller.test.ts index 7cf8f191..09b36ea9 100644 --- a/tools-nodejs/api-vighnesh153/src/googleAuthCallback/controller.test.ts +++ b/tools-nodejs/api-vighnesh153/src/googleAuthCallback/controller.test.ts @@ -12,12 +12,12 @@ import { FakeDynamoDBTable } from "@vighnesh153/tools-server/aws_dynamodb"; import { controller } from "./controller.ts"; import { FakeUserInfoDecoder } from "../common/user_info_decoder.ts"; -import { UserInfoTableMetadata } from "../common/dynamo_db_table_metadata.ts"; +import { userInfoFields } from "../common/dynamo_db_table_metadata.ts"; import { FakeCookieSerializer } from "../common/cookie_serializer.ts"; let fakeUserInfoDecoder: FakeUserInfoDecoder; let fakeUserInfoTable: FakeDynamoDBTable<{ - fields: (typeof UserInfoTableMetadata)["fields"]; + fields: typeof userInfoFields; tableName: "fake-user-info"; }>; let fakeCookieSerializer: FakeCookieSerializer;