Merge remote-tracking branch 'origin/8.0.1' into 9.0

Author: himeshr

avni-server-api/src/main/java/org/avni/server/dao/EntityApprovalStatusRepository.java

@@ -3,6 +3,7 @@
 import org.avni.server.dao.sync.SyncEntityName;
 import org.avni.server.domain.*;
 import org.avni.server.framework.security.UserContextHolder;
+import org.avni.server.web.request.EntitySyncStatusContract;
 import org.joda.time.DateTime;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -36,7 +37,7 @@ Page<EntityApprovalStatus> findByLastModifiedDateTimeIsBetweenOrderByLastModifie
     default Page<EntityApprovalStatus> findEntityApprovalStatuses(EntityApprovalStatusSearchParams searchParams, Pageable pageable) {
 
         Specification specification = lastModifiedBetween(
-            CHSEntity.toDate(searchParams.getLastModifiedDateTime() != null ? searchParams.getLastModifiedDateTime() : new DateTime("1900-01-01T00:00:00.000Z")),
+            CHSEntity.toDate(searchParams.getLastModifiedDateTime() != null ? searchParams.getLastModifiedDateTime() : EntitySyncStatusContract.REALLY_OLD_DATE),
             CHSEntity.toDate(searchParams.getNow() != null ? searchParams.getNow() : new DateTime()));
 
         if (searchParams.getEntityType() != null) {

avni-server-api/src/main/java/org/avni/server/web/MediaController.java

@@ -13,6 +13,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -25,6 +27,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.awt.*;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
@@ -179,4 +182,14 @@ private boolean isInvalidDimension(File tempSourceFile, AvniFiles.ImageType imag
         Dimension dimension = AvniFiles.getImageDimension(tempSourceFile, imageType);
         return dimension.getHeight() > 75 || dimension.getWidth() > 75;
     }
+
+    @GetMapping("/web/media/downloadStream")
+    public ResponseEntity<InputStreamResource> downloadFile(@RequestParam String s3Url, @RequestParam String fileName) throws IOException {
+        InputStreamResource resource = new InputStreamResource(s3Service.getObjectContentFromUrl(s3Url));
+
+        return ResponseEntity.ok()
+                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + fileName)
+                .contentType(MediaType.parseMediaType("application/octet-stream"))
+                .body(resource);
+    }
 }

avni-server-api/src/main/java/org/avni/server/web/api/LocationApiController.java

@@ -4,6 +4,8 @@
 import org.avni.server.dao.LocationRepository;
 import org.avni.server.domain.AddressLevel;
 import org.avni.server.service.ConceptService;
+import org.avni.server.util.DateTimeUtil;
+import org.avni.server.web.request.EntitySyncStatusContract;
 import org.avni.server.web.response.LocationApiResponse;
 import org.avni.server.web.response.ResponsePage;
 import org.joda.time.DateTime;
@@ -32,9 +34,12 @@ public LocationApiController(LocationRepository locationRepository, ConceptRepos
 
     @RequestMapping(value = "/api/locations", method = RequestMethod.GET)
     @PreAuthorize(value = "hasAnyAuthority('user')")
-    public ResponsePage getLocations(@RequestParam(value = "lastModifiedDateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) DateTime lastModifiedDateTime,
+    public ResponsePage getLocations(@RequestParam(value = "lastModifiedDateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) DateTime lastModifiedDateTime,
                                     @RequestParam(value = "now", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) DateTime now,
                                     Pageable pageable) {
+        if (lastModifiedDateTime == null) {
+            lastModifiedDateTime = EntitySyncStatusContract.REALLY_OLD_DATE;
+        }
         Page<AddressLevel> addresses = locationRepository.findByLastModifiedDateTimeIsBetweenOrderByLastModifiedDateTimeAscIdAsc(lastModifiedDateTime, now, pageable);
         ArrayList<LocationApiResponse> locationApiResponses = new ArrayList<>();
         addresses.forEach(addressLevel -> {

avni-server-api/src/main/java/org/avni/server/web/request/EntitySyncStatusContract.java

@@ -9,7 +9,7 @@
 import java.util.UUID;
 
 public class EntitySyncStatusContract {
-    private static final DateTime REALLY_OLD_DATE = new DateTime("1900-01-01T00:00:00.000Z");
+    public static final DateTime REALLY_OLD_DATE = new DateTime("1900-01-01T00:00:00.000Z");
     private String uuid;
     private String entityName;
     private DateTime loadedSince;