Merge pull request BinaryStudioAcademy#284 from mV22110702/fix/th-283…

…-fix-env-for-s3 th-283: Fixed .env.example
mV22110702 · Sep 18, 2023 · 0fe77e4 · 0fe77e4
2 parents aed4e30 + 1d57a8b
commit 0fe77e4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/backend/.env.example b/backend/.env.example
@@ -18,6 +18,7 @@ AWS_ACCESS_KEY_ID=YOUR_KEY
 AWS_SECRET_ACCESS_KEY=YOUR_SECRET_KEY
 S3_REGION=REGION
 BUCKET_NAME=BUCKET
+SIGNED_URL_EXPIRES_IN_SECONDS=NUMBER
 
 #
 # SENDGRID

diff --git a/backend/src/libs/packages/config/config.package.ts b/backend/src/libs/packages/config/config.package.ts
@@ -93,10 +93,10 @@ class Config implements IConfig {
             env: 'S3_REGION',
             default: null,
           },
-          SIGNED_URL_EXPIRES_IN: {
+          SIGNED_URL_EXPIRES_IN_SECONDS: {
             doc: 'Number of seconds a signed URL expires in',
             format: String,
-            env: 'SIGNED_URL_EXPIRES_IN',
+            env: 'SIGNED_URL_EXPIRES_IN_SECONDS',
             default: null,
           },
         },

diff --git a/backend/src/libs/packages/config/libs/types/environment-schema.type.ts b/backend/src/libs/packages/config/libs/types/environment-schema.type.ts
@@ -12,7 +12,7 @@ type EnvironmentSchema = {
     S3: {
       BUCKET_NAME: string;
       REGION: string;
-      SIGNED_URL_EXPIRES_IN: number;
+      SIGNED_URL_EXPIRES_IN_SECONDS: number;
     };
   };
   JWT: {

diff --git a/backend/src/libs/packages/s3-client-service/s3-client-service.package.ts b/backend/src/libs/packages/s3-client-service/s3-client-service.package.ts
@@ -35,7 +35,7 @@ class S3ClientService {
       },
     });
     this.bucketName = config.ENV.AWS.S3.BUCKET_NAME;
-    this.signedUrlExpiresIn = config.ENV.AWS.S3.SIGNED_URL_EXPIRES_IN;
+    this.signedUrlExpiresIn = config.ENV.AWS.S3.SIGNED_URL_EXPIRES_IN_SECONDS;
     this.logger = logger;
   }
 

diff --git a/readme.md b/readme.md
@@ -115,6 +115,7 @@ erDiagram
     files {
       id serial PK "not null"
       key varchar "not null, unique"
+      name varchar "not null"
       content_type varchar "not null"
       created_at timestamp "not null"
       updated_at timestamp "not null"