Merge branch '8.0.1' into 9.0

Author: himeshr

Makefile

@@ -38,3 +38,33 @@ start: boot_run
 
 debug:
 	./gradlew bootRun -Dagentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
+
+delete-etl-metadata:
+ifndef schemaName
+	@echo "Provde the schemaName variable"
+	exit 1
+endif
+ifndef dbUser
+	@echo "Provde the dbUser variable"
+	exit 1
+endif
+ifndef db
+	@echo "Provde the db variable"
+	exit 1
+endif
+	-psql -h localhost -Uopenchs $(db) -c "select delete_etl_metadata_for_schema('$(schemaName)', '$(dbUser)')"
+
+delete-etl-metadata-for-org:
+ifndef schemaName
+	@echo "Provde the schemaName variable"
+	exit 1
+endif
+ifndef dbUser
+	@echo "Provde the dbUser variable"
+	exit 1
+endif
+ifndef db
+	@echo "Provde the db variable"
+	exit 1
+endif
+	-psql -h localhost -Uopenchs $(db) -c "select delete_etl_metadata_for_org('$(schemaName)', '$(dbUser)')"

src/main/java/org/avniproject/etl/config/AmazonClientService.java

@@ -43,10 +43,15 @@ public AmazonClientService(@Value("${aws.access.key}") String accessKeyId,
     }
 
 
-    public URL generateMediaDownloadUrl(String url) {
+    public URL generateMediaDownloadUrl(String url) throws S3FileDoesNotExist {
         AmazonS3URI amazonS3URI = new AmazonS3URI(url);
         String objectKey = amazonS3URI.getKey();
 
+        boolean exists = s3Client.doesObjectExist(bucketName, objectKey);
+        if (!exists) {
+            throw new S3FileDoesNotExist("File does not exist in S3 bucket: " + url);
+        }
+
         GeneratePresignedUrlRequest generatePresignedUrlRequest =
                 new GeneratePresignedUrlRequest(bucketName, objectKey)
                         .withMethod(HttpMethod.GET)
@@ -60,5 +65,4 @@ private Date getExpireDate(long expireDuration) {
         expiration.setTime(expiration.getTime() + expireDuration);
         return expiration;
     }
-
 }

src/main/java/org/avniproject/etl/config/S3FileDoesNotExist.java

@@ -0,0 +1,7 @@
+package org.avniproject.etl.config;
+
+public class S3FileDoesNotExist extends Exception {
+    public S3FileDoesNotExist(String message) {
+        super(message);
+    }
+}

src/main/java/org/avniproject/etl/controller/MediaController.java

@@ -45,6 +45,7 @@ public ResponseEntity search(HttpServletRequest request,
                 modifiedRequest = new MediaSearchRequest();
             return ResponseEntity.ok(mediaService.search(modifiedRequest, new Page(page, size)));
         } catch (Exception exception) {
+            log.warn("Error processing request: ", exception);
             return ResponseEntity.badRequest().body(exception.getMessage());
         }
     }

src/main/java/org/avniproject/etl/repository/service/MediaTableRepositoryService.java

@@ -1,6 +1,8 @@
 package org.avniproject.etl.repository.service;
 
+import org.apache.log4j.Logger;
 import org.avniproject.etl.config.AmazonClientService;
+import org.avniproject.etl.config.S3FileDoesNotExist;
 import org.avniproject.etl.dto.ImageData;
 import org.avniproject.etl.dto.MediaDTO;
 import org.avniproject.etl.util.Utils;
@@ -30,9 +32,14 @@ public MediaDTO setMediaDto(ResultSet rs) {
 
             try {
                 signedImageUrl = amazonClientService.generateMediaDownloadUrl(imageUrl);
-                signedThumbnailUrl = amazonClientService.generateMediaDownloadUrl(thumbnailUrl);
+                try {
+                    signedThumbnailUrl = amazonClientService.generateMediaDownloadUrl(thumbnailUrl);
+                } catch (S3FileDoesNotExist ignored) {
+                }
             } catch (IllegalArgumentException illegalArgumentException) {
                 //Ignore and move on. Image will be null
+            } catch (S3FileDoesNotExist e) {
+                throw new RuntimeException(e);
             }
 
             String uuid = rs.getString("uuid");

src/test/java/org/avniproject/etl/repository/service/MediaTableRepositoryServiceTest.java

@@ -1,6 +1,7 @@
 package org.avniproject.etl.repository.service;
 
 import org.avniproject.etl.config.AmazonClientService;
+import org.avniproject.etl.config.S3FileDoesNotExist;
 import org.avniproject.etl.dto.MediaDTO;
 import org.junit.jupiter.api.Test;
 
@@ -15,7 +16,7 @@
 public class MediaTableRepositoryServiceTest {
 
     @Test
-    public void shouldReturnEmptySignedUrl() throws SQLException {
+    public void shouldReturnEmptySignedUrl() throws SQLException, S3FileDoesNotExist {
         AmazonClientService amazonClient = mock(AmazonClientService.class);
         when(amazonClient.generateMediaDownloadUrl(anyString())).thenThrow(new IllegalArgumentException());
         ResultSet resultSet = mock(ResultSet.class);