Release 2025-01-23

.env.local.example

@@ -23,9 +23,6 @@ S3_UPLOAD_ROOTFOLDER=upload-localdev
 S3_UPLOAD_KEY=AAAAAAAAAAAAAAAAAAAA
 S3_UPLOAD_SECRET=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 
-# Get from https://felt.com/ => Settings
-FELT_TOKEN=felt_pat_AAAAAAAAAAAAAAAAAAAAAA
-
 # Admin mail address, mails are sent to
 [email protected]
 

.github/README.md

@@ -39,8 +39,6 @@
 |                          |                                  |                                         |
 | `ADMIN_EMAIL`            | `vars.ADMIN_EMAIL`               |                                         |
 |                          |                                  |                                         |
-| `FELT_TOKEN`             | `secrets.FELT_TOKEN`             |                                         |
-|                          |                                  |                                         |
 | `S3_UPLOAD_KEY`          | `secrets.S3_UPLOAD_KEY`          |                                         |
 | `S3_UPLOAD_SECRET`       | `secrets.S3_UPLOAD_SECRET`       |                                         |
 | `S3_UPLOAD_ROOTFOLDER`   | `.env`-variable                  | In `.env` as composite value            |

.github/workflows/setup-env.yml

@@ -56,8 +56,6 @@ jobs:
 
             ADMIN_EMAIL='${{ vars.ADMIN_EMAIL }}'
 
-            FELT_TOKEN='${{ secrets.FELT_TOKEN }}'
-
             S3_UPLOAD_KEY='${{ secrets.S3_UPLOAD_KEY }}'
             S3_UPLOAD_SECRET='${{ secrets.S3_UPLOAD_SECRET }}'
             S3_UPLOAD_ROOTFOLDER='upload-${{ inputs.ENVIRONMENT }}'

db/migrations/20250127155335_project_add_is_export_api/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Project" ADD COLUMN     "isExportApi" BOOLEAN NOT NULL DEFAULT false;

db/migrations/20250128130303_subsection_add_estimated_completion_date_and_status/migration.sql

@@ -0,0 +1,6 @@
+-- AlterTable
+ALTER TABLE "Subsection" ADD COLUMN     "estimatedCompletionDate" TIMESTAMP(3),
+ADD COLUMN     "subsubsectionStatusId" INTEGER;
+
+-- AddForeignKey
+ALTER TABLE "Subsection" ADD CONSTRAINT "Subsection_subsubsectionStatusId_fkey" FOREIGN KEY ("subsubsectionStatusId") REFERENCES "SubsubsectionStatus"("id") ON DELETE SET NULL ON UPDATE CASCADE;

db/migrations/20250130144729_project_rename_export_enabled/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `isExportApi` on the `Project` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Project" DROP COLUMN "isExportApi",
+ADD COLUMN     "exportEnabled" BOOLEAN NOT NULL DEFAULT false;

db/migrations/20250203085504_proejct_rename_column_placemark_url/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `felt_subsection_geometry_source_url` on the `Project` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Project" DROP COLUMN "felt_subsection_geometry_source_url",
+ADD COLUMN     "placemarkUrl" TEXT;

db/migrations/20250204141919_project_rename_column_estimated_completion_date_string/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `estimatedCompletionDate` on the `Subsection` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Subsection" DROP COLUMN "estimatedCompletionDate",
+ADD COLUMN     "estimatedCompletionDateString" TEXT;

db/migrations/20250211112830_project_drop_placemarkurl/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `placemarkUrl` on the `Project` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Project" DROP COLUMN "placemarkUrl";

db/schema.prisma

@@ -124,19 +124,19 @@ model Token {
 // }
 
 model Project {
-  id                                  Int      @id @default(autoincrement())
-  createdAt                           DateTime @default(now())
-  updatedAt                           DateTime @updatedAt
+  id              Int      @id @default(autoincrement())
+  createdAt       DateTime @default(now())
+  updatedAt       DateTime @updatedAt
   //
-  slug                                String   @unique // shortTitle and URL Slug
-  subTitle                            String?
-  description                         String?
-  logoSrc                             String?
-  partnerLogoSrcs                     String[]
-  felt_subsection_geometry_source_url String?
+  slug            String   @unique // shortTitle and URL Slug
+  subTitle        String?
+  description     String?
+  logoSrc         String?
+  partnerLogoSrcs String[]
+  exportEnabled   Boolean  @default(false)
   //
-  manager                             User?    @relation(fields: [managerId], references: [id])
-  managerId                           Int?
+  manager         User?    @relation(fields: [managerId], references: [id])
+  managerId       Int?
 
   surveyResponseTopics  SurveyResponseTopic[]
   subsections           Subsection[]
@@ -238,28 +238,33 @@ model Operator {
 }
 
 model Subsection {
-  id                 Int               @id @default(autoincrement())
-  createdAt          DateTime          @default(now())
-  updatedAt          DateTime          @updatedAt
-  //
-  slug               String // shortTitle and URL Slug
-  start              String
-  end                String
-  order              Int               @default(autoincrement())
-  geometry           Json
-  labelPos           LabelPositionEnum @default(top)
-  description        String?
-  lengthKm           Float // Kilometer
-  priority           PriorityEnum      @default(OPEN) // Priorität
-  //
-  project            Project           @relation(fields: [projectId], references: [id])
-  projectId          Int
-  manager            User?             @relation(fields: [managerId], references: [id])
-  managerId          Int?
-  operator           Operator?         @relation(fields: [operatorId], references: [id])
-  operatorId         Int?
-  networkHierarchy   NetworkHierarchy? @relation(fields: [networkHierarchyId], references: [id])
-  networkHierarchyId Int?
+  id                            Int               @id @default(autoincrement())
+  createdAt                     DateTime          @default(now())
+  updatedAt                     DateTime          @updatedAt
+  //
+  slug                          String // shortTitle and URL Slug
+  start                         String
+  end                           String
+  order                         Int               @default(autoincrement())
+  geometry                      Json
+  labelPos                      LabelPositionEnum @default(top)
+  description                   String?
+  lengthKm                      Float // Kilometer
+  priority                      PriorityEnum      @default(OPEN) // Priorität
+  estimatedCompletionDateString String? // Jahresquartal der geplanten Fertigstellung als string Form "1-2023"
+
+  //
+  project               Project              @relation(fields: [projectId], references: [id])
+  projectId             Int
+  manager               User?                @relation(fields: [managerId], references: [id])
+  managerId             Int?
+  operator              Operator?            @relation(fields: [operatorId], references: [id])
+  operatorId            Int?
+  networkHierarchy      NetworkHierarchy?    @relation(fields: [networkHierarchyId], references: [id])
+  networkHierarchyId    Int?
+  SubsubsectionStatus   SubsubsectionStatus? @relation(fields: [subsubsectionStatusId], references: [id])
+  subsubsectionStatusId Int?
+  //
 
   subsubsections   Subsubsection[]
   stakeholdernotes Stakeholdernote[]
@@ -390,6 +395,7 @@ model SubsubsectionStatus {
   project        Project         @relation(fields: [projectId], references: [id])
   projectId      Int
   subsubsections Subsubsection[]
+  Subsection     Subsection[]
 
   @@unique([projectId, slug])
 }

db/seeds/projects.ts

@@ -10,35 +10,35 @@ const seedProjects = async () => {
 Sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr.`,
       managerId: null,
       logoSrc: "rsv8-logo.png",
-      felt_subsection_geometry_source_url: null,
       partnerLogoSrcs: ["rsv8-logo.png", "test.png"],
+      exportEnabled: false,
     },
     {
       slug: "rs3000",
       subTitle: "Radschnellverbindung 3000",
       description: null,
       managerId: null,
       logoSrc: null,
-      felt_subsection_geometry_source_url: null,
       partnerLogoSrcs: [],
+      exportEnabled: false,
     },
     {
       slug: "rs0v1",
       subTitle: "Radschnellverbindung No Section",
       description: null,
       managerId: null,
       logoSrc: null,
-      felt_subsection_geometry_source_url: null,
       partnerLogoSrcs: [],
+      exportEnabled: false,
     },
     {
       slug: "rs0v2",
       subTitle: "Radschnellverbindung No Subsection",
       description: null,
       managerId: null,
       logoSrc: null,
-      felt_subsection_geometry_source_url: null,
       partnerLogoSrcs: [],
+      exportEnabled: false,
     },
   ]
 

docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 services:
   db:
-    image: postgres:14-alpine
+    image: postgres:16-alpine
     environment:
       POSTGRES_PASSWORD: password
       LANG: en_US.UTF-8