Merge pull request #68 from skni-kod/feature/#67-add-healthcheck-in-d…

…ocker-compose-file added healthcheck in docker-compose
skni-kod · Feb 21, 2024 · df1c7fd · df1c7fd
2 parents 8b317bb + cd3eec0
commit df1c7fd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 12 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@
 services:
   api:
     image: skitskni/api:latest
-    depends_on: 
+    depends_on:
       - db
     ports:
       - '5000:80'
@@ -22,6 +22,11 @@ services:
       - postgres-data:/var/lib/postgresql/data
     depends_on:
       - minio
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   minio:
     image: minio/minio:latest

diff --git a/skit.Infrastructure/Integrations/FileStorage/Services/S3StorageService.cs b/skit.Infrastructure/Integrations/FileStorage/Services/S3StorageService.cs
@@ -27,18 +27,17 @@ public S3StorageService(S3Config s3Config)
     public async Task<string> UploadFileAsync(IFormFile file, CancellationToken cancellationToken)
     {
         var uniqueFileName = $"{Guid.NewGuid()}_{file.FileName}";
-
-        await using var stream = file.OpenReadStream();
-        var request = new PutObjectRequest
-        {
-            BucketName = _s3Config.BucketName,
-            Key = uniqueFileName,
-            InputStream = stream,
-            ContentType = file.ContentType
-        };
+
         try
         {
-            await _s3Client.PutObjectAsync(request, cancellationToken);
+            await using var stream = file.OpenReadStream();
+            await _s3Client.PutObjectAsync(new PutObjectRequest()
+            {
+                BucketName = _s3Config.BucketName,
+                Key = uniqueFileName,
+                InputStream = stream,
+                ContentType = file.ContentType
+            }, cancellationToken);
         }
         catch (AmazonS3Exception e)
         {
@@ -50,7 +49,16 @@ public async Task<string> UploadFileAsync(IFormFile file, CancellationToken canc
                 };
                 await _s3Client.PutBucketAsync(putBucketRequest, cancellationToken);
 
-                await _s3Client.PutObjectAsync(request, cancellationToken);
+                await using var stream = file.OpenReadStream();
+                await _s3Client.PutObjectAsync(new PutObjectRequest()
+                {
+                    BucketName = _s3Config.BucketName,
+                    Key = uniqueFileName,
+                    InputStream = stream,
+                    ContentType = file.ContentType
+                }, cancellationToken);
+
+                return uniqueFileName;
             }
 
             throw new S3UploadException(e.ErrorCode);