StaticDatasets: adapt upload for storing geojsons

FixMyBerlin · Jun 5, 2024 · 361cc84 · 361cc84
1 parent 7a239bd
commit 361cc84
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 22 deletions.
diff --git a/db/migrations/20240523105650_adapt_upload_for_storing_geojsons/migration.sql b/db/migrations/20240523105650_adapt_upload_for_storing_geojsons/migration.sql
@@ -0,0 +1,12 @@
+-- CreateEnum
+CREATE TYPE "UploadCreatedByEnum" AS ENUM ('USER', 'SCRIPT');
+
+-- CreateEnum
+CREATE TYPE "UploadTypeEnum" AS ENUM ('GEOJSON', 'PMTILES');
+
+-- AlterTable
+ALTER TABLE "Upload"
+  RENAME COLUMN "pmtilesUrl" TO "url";
+ALTER TABLE "Upload"
+  ADD COLUMN "createdBy" "UploadCreatedByEnum" NOT NULL DEFAULT 'SCRIPT',
+  ADD COLUMN "type"      "UploadTypeEnum"      NOT NULL DEFAULT 'PMTILES';
diff --git a/db/schema.prisma b/db/schema.prisma
@@ -131,14 +131,26 @@ model Membership {
 }
 
 model Upload {
-  id         Int      @id @default(autoincrement())
-  createdAt  DateTime @default(now())
-  updatedAt  DateTime @updatedAt
+  id        Int                 @id @default(autoincrement())
+  createdAt DateTime            @default(now())
+  createdBy UploadCreatedByEnum @default(SCRIPT)
+  updatedAt DateTime            @updatedAt
   //
-  slug       String   @unique
-  pmtilesUrl String
-  configs    Json
-  public     Boolean  @default(false)
+  slug      String              @unique
+  type      UploadTypeEnum      @default(PMTILES)
+  url       String
+  configs   Json
+  public    Boolean             @default(false)
   //
-  regions    Region[]
+  regions   Region[]
+}
+
+enum UploadCreatedByEnum {
+  USER
+  SCRIPT
+}
+
+enum UploadTypeEnum {
+  GEOJSON
+  PMTILES
 }
diff --git a/db/seeds/pmtiles.ts b/db/seeds/pmtiles.ts
@@ -16,7 +16,7 @@ const seedUploads = async () => {
   const seedUploadsNudafa: Prisma.UploadUncheckedCreateInput[] = [
     {
       slug: 'nudafa-combined',
-      pmtilesUrl:
+      url:
         'https://atlas-private.s3.eu-central-1.amazonaws.com/test-data/nudafa-combined.pmtiles',
       configs: [
         {
@@ -39,7 +39,7 @@ const seedUploads = async () => {
   const seedUploadsBibi: Prisma.UploadUncheckedCreateInput[] = [
     {
       slug: 'two-configs',
-      pmtilesUrl:
+      url:
         'https://atlas-private.s3.eu-central-1.amazonaws.com/test-data/nudafa-combined.pmtiles',
       configs: [
         {

diff --git a/scripts/StaticDatasets/api.ts b/scripts/StaticDatasets/api.ts
@@ -33,7 +33,7 @@ export const getRegions = async (): Promise<{ id: number; slug: string }[]> => {
 
 type UploadData = {
   uploadSlug: string
-  pmtilesUrl: string
+  url: string
   regionSlugs: string[]
   isPublic: boolean
   configs: Record<string, any>[]

diff --git a/scripts/StaticDatasets/updateStaticDatasets.ts b/scripts/StaticDatasets/updateStaticDatasets.ts
@@ -181,7 +181,7 @@ for (const { datasetFolderPath, regionFolder, datasetFolder } of datasetFileFold
     })
     await createUpload({
       uploadSlug,
-      pmtilesUrl,
+      url: pmtilesUrl,
       regionSlugs,
       isPublic: metaData.public,
       configs: mergedConfigs,

diff --git a/src/app/admin/uploads/[slug]/page.tsx b/src/app/admin/uploads/[slug]/page.tsx
@@ -57,15 +57,26 @@ export default function AdminUploadPage() {
       </p>
 
       <p>
-        Vorschau für Devs (<code>_API_KEY_</code> aus <code>.env</code>/Bitwarden für{' '}
-        <code>{process.env.NEXT_PUBLIC_APP_ENV}</code>)
-        <textarea value={previewUrl.toString()} className="w-full text-sm" />
+        Datentyp: <code>{upload.type}</code>
       </p>
+
+      {upload.type === 'GEOJSON' ? (
+        <p>
+          <b>TODO: add link to geojson viewer</b>
+        </p>
+      ) : (
+        <p>
+          Vorschau für Devs (<code>_API_KEY_</code> aus <code>.env</code>/Bitwarden für{' '}
+          <code>{process.env.NEXT_PUBLIC_APP_ENV}</code>)
+          <textarea value={previewUrl.toString()} className="w-full text-sm" />
+        </p>
+      )}
+
       <p>
-        Öffentliche URL <code>{getStaticDatasetUrl(upload.slug)}</code>
+        Öffentliche URL: <code>{getStaticDatasetUrl(upload.slug)}</code>
       </p>
       <p>
-        Interne URL auf S3 <code>{upload.pmtilesUrl}</code>
+        Interne URL: <code>{upload.url}</code>
       </p>
 
       {configs.map((config) => {

diff --git a/src/app/api/uploads/[slug]/route.ts b/src/app/api/uploads/[slug]/route.ts
@@ -32,7 +32,7 @@ export async function GET(request: Request, { params }: { params: { slug: string
     }
   }
 
-  const { hostname, pathname } = new URL(upload!.pmtilesUrl)
+  const { hostname, pathname } = new URL(upload!.url)
   const accessKeyId = process.env.S3_KEY!
   const secretAccessKey = process.env.S3_SECRET!
   const region = process.env.S3_REGION!

diff --git a/src/app/api/uploads/create/route.ts b/src/app/api/uploads/create/route.ts
@@ -5,7 +5,7 @@ import { parseData, checkApiKey } from '../../_util/checkApiKey'
 const Schema = z.object({
   apiKey: z.string().nullish(),
   uploadSlug: z.string(),
-  pmtilesUrl: z.string(),
+  url: z.string(),
   regionSlugs: z.array(z.string()),
   isPublic: z.boolean(),
   configs: z.array(z.record(z.string(), z.any())),
@@ -19,15 +19,15 @@ export async function POST(request: Request) {
   const check = checkApiKey(data)
   if (!check.ok) return check.errorResponse
 
-  const { uploadSlug, pmtilesUrl, regionSlugs, isPublic, configs } = data
+  const { uploadSlug, url, regionSlugs, isPublic, configs } = data
 
   await db.upload.deleteMany({ where: { slug: uploadSlug } })
 
   try {
     await db.upload.create({
       data: {
         slug: uploadSlug,
-        pmtilesUrl,
+        url,
         regions: { connect: regionSlugs.map((slug) => ({ slug })) },
         public: isPublic,
         configs,

diff --git a/src/uploads/schema.ts b/src/uploads/schema.ts
@@ -4,7 +4,7 @@ import { RegionSchema } from '../regions/schemas'
 export const UploadSchema = z.object({
   id: z.number(),
   slug: z.string(),
-  pmtilesUrl: z.string().url(),
+  url: z.string().url(),
   public: z.boolean(),
 })