raster-foundry · pcaisse · Sep 1, 2021 · Aug 16, 2021 · Aug 20, 2021 · Aug 20, 2021
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Indexed all foreign key references to users [#5611](https://github.com/raster-foundry/raster-foundry/pull/5611)
 - Use original filename for COG [#5613](https://github.com/raster-foundry/raster-foundry/pull/5613)
 - Extended backsplash healthcheck timeout to 10 seconds, which is longer than the ALB healthcheck timeout [#5616](https://github.com/raster-foundry/raster-foundry/pull/5616)
+- Make export configurable with asset types [#5619](https://github.com/raster-foundry/raster-foundry/pull/5619)
 
 ### Fixed
 - Updated some setup steps and Auth0 interaction for more convenient external user use [#5612](https://github.com/raster-foundry/raster-foundry/pull/5612)

diff --git a/app-backend/api/src/main/scala/stac/Routes.scala b/app-backend/api/src/main/scala/stac/Routes.scala
@@ -72,122 +72,137 @@ trait StacRoutes
     }
   }
 
-  def listStacExports: Route = authenticate { user =>
-    authorizeScope(ScopedAction(Domain.StacExports, Action.Read, None), user) {
-      (withPagination & stacExportQueryParameters) {
-        (page: PageRequest, params: StacExportQueryParameters) =>
-          complete {
-            StacExportDao
-              .list(page, params, user)
-              .map(
-                p =>
-                  PaginatedResponse[StacExport.WithSignedDownload](
-                    p.count,
-                    p.hasPrevious,
-                    p.hasNext,
-                    p.page,
-                    p.pageSize,
-                    p.results.map(signExportUrl(_))
-                )
-              )
-              .transact(xa)
-              .unsafeToFuture
-          }
-      }
-    }
-  }
-
-  def createStacExport: Route = authenticate { user =>
-    authorizeScope(ScopedAction(Domain.StacExports, Action.Create, None), user) {
-      entity(as[StacExport.Create]) { newStacExport =>
-        newStacExport match {
-          case StacExport
-                .AnnotationProjectExport(_, _, _, annotationProjectId) =>
-            authorizeAsync {
-              AnnotationProjectDao
-                .authorized(
-                  user,
-                  ObjectType.AnnotationProject,
-                  annotationProjectId,
-                  ActionType.View
-                )
-                .map(_.toBoolean)
+  def listStacExports: Route =
+    authenticate { user =>
+      authorizeScope(
+        ScopedAction(Domain.StacExports, Action.Read, None),
+        user
+      ) {
+        (withPagination & stacExportQueryParameters) {
+          (page: PageRequest, params: StacExportQueryParameters) =>
+            complete {
+              StacExportDao
+                .list(page, params, user)
+                .map(
+                  p =>
+                    PaginatedResponse[StacExport.WithSignedDownload](
+                      p.count,
+                      p.hasPrevious,
+                      p.hasNext,
+                      p.page,
+                      p.pageSize,
+                      p.results.map(signExportUrl(_))
+                  ))
                 .transact(xa)
                 .unsafeToFuture
             }
-          case StacExport.CampaignExport(_, _, _, campaignId) =>
-            authorizeAsync {
-              CampaignDao
-                .authorized(
-                  user,
-                  ObjectType.Campaign,
-                  campaignId,
-                  ActionType.View
-                )
-                .map(_.toBoolean)
+        }
+      }
+    }
+
+  def createStacExport: Route =
+    authenticate { user =>
+      authorizeScope(
+        ScopedAction(Domain.StacExports, Action.Create, None),
+        user
+      ) {
+        entity(as[StacExport.Create]) { newStacExport =>
+          newStacExport match {
+            case StacExport
+                  .AnnotationProjectExport(_, _, _, annotationProjectId) =>
+              authorizeAsync {
+                AnnotationProjectDao
+                  .authorized(
+                    user,
+                    ObjectType.AnnotationProject,
+                    annotationProjectId,
+                    ActionType.View
+                  )
+                  .map(_.toBoolean)
+                  .transact(xa)
+                  .unsafeToFuture
+              }
+            case StacExport.CampaignExport(_, _, _, _, campaignId) =>
+              authorizeAsync {
+                CampaignDao
+                  .authorized(
+                    user,
+                    ObjectType.Campaign,
+                    campaignId,
+                    ActionType.View
+                  )
+                  .map(_.toBoolean)
+                  .transact(xa)
+                  .unsafeToFuture
+              }
+          }
+          {
+            onSuccess(
+              StacExportDao
+                .create(newStacExport, user)
                 .transact(xa)
                 .unsafeToFuture
+            ) { stacExport =>
+              kickoffStacExport(stacExport.id)
+              complete((StatusCodes.Created, stacExport))
             }
-        }
-        {
-          onSuccess(
-            StacExportDao
-              .create(newStacExport, user)
-              .transact(xa)
-              .unsafeToFuture
-          ) { stacExport =>
-            kickoffStacExport(stacExport.id)
-            complete((StatusCodes.Created, stacExport))
           }
         }
       }
     }
-  }
 
-  def getStacExport(id: UUID): Route = authenticate { user =>
-    authorizeScope(ScopedAction(Domain.StacExports, Action.Read, None), user) {
-      authorizeAsync {
-        StacExportDao
-          .isOwnerOrSuperUser(user, id)
-          .transact(xa)
-          .unsafeToFuture
-      } {
-        rejectEmptyResponse {
-          complete {
-            StacExportDao
-              .getById(id)
-              .map {
-                case Some(export) =>
-                  Some(
-                    signExportUrl(export)
-                  )
-                case _ => None
-              }
-              .transact(xa)
-              .unsafeToFuture
+  def getStacExport(id: UUID): Route =
+    authenticate { user =>
+      authorizeScope(
+        ScopedAction(Domain.StacExports, Action.Read, None),
+        user
+      ) {
+        authorizeAsync {
+          StacExportDao
+            .isOwnerOrSuperUser(user, id)
+            .transact(xa)
+            .unsafeToFuture
+        } {
+          rejectEmptyResponse {
+            complete {
+              StacExportDao
+                .getById(id)
+                .map {
+                  case Some(export) =>
+                    Some(
+                      signExportUrl(export)
+                    )
+                  case _ => None
+                }
+                .transact(xa)
+                .unsafeToFuture
+            }
           }
         }
       }
     }
-  }
 
-  def deleteStacExport(id: UUID): Route = authenticate { user =>
-    authorizeScope(ScopedAction(Domain.StacExports, Action.Delete, None), user) {
-      authorizeAsync {
-        StacExportDao
-          .isOwnerOrSuperUser(user, id)
-          .transact(xa)
-          .unsafeToFuture
-      } {
-        onSuccess(
+  def deleteStacExport(id: UUID): Route =
+    authenticate { user =>
+      authorizeScope(
+        ScopedAction(Domain.StacExports, Action.Delete, None),
+        user
+      ) {
+        authorizeAsync {
           StacExportDao
-            .delete(id)
+            .isOwnerOrSuperUser(user, id)
             .transact(xa)
             .unsafeToFuture
-        ) { count: Int =>
-          complete((StatusCodes.NoContent, s"$count stac export deleted"))
+        } {
+          onSuccess(
+            StacExportDao
+              .delete(id)
+              .transact(xa)
+              .unsafeToFuture
+          ) { count: Int =>
+            complete((StatusCodes.NoContent, s"$count stac export deleted"))
+          }
         }
       }
     }
-  }
 }
diff --git a/app-backend/batch/src/main/scala/stacExport/DatabaseIO.scala b/app-backend/batch/src/main/scala/stacExport/DatabaseIO.scala
diff --git a/app-backend/batch/src/main/scala/stacExport/ExportData.scala b/app-backend/batch/src/main/scala/stacExport/ExportData.scala