FixMyBerlin · JohannaPeanut · Nov 2, 2023 · Oct 16, 2023 · Oct 16, 2023 · Oct 16, 2023
diff --git a/.env.local.example b/.env.local.example
@@ -19,3 +19,6 @@ S3_UPLOAD_BUCKET=trassenscout
 S3_UPLOAD_KEY=AAAAAAAAAAAAAAAAAAAA
 S3_UPLOAD_REGION=eu-central-1
 S3_UPLOAD_SECRET=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+
+# Get from https://felt.com/ => Settings
+ FELT_TOKEN=felt_pat_AAAAAAAAAAAAAAAAAAAAAA
diff --git a/.github/workflows/deploy-app-production.yml b/.github/workflows/deploy-app-production.yml
@@ -15,12 +15,13 @@ jobs:
     secrets:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      DATABASE_URL:  ${{ secrets.DATABASE_URL_PRODUCTION }}
+      DATABASE_URL: ${{ secrets.DATABASE_URL_PRODUCTION }}
       SESSION_SECRET_KEY: ${{ secrets.SESSION_SECRET_KEY_PRODUCTION }}
       NGINX_HTPASSWD: ${{ secrets.NGINX_HTPASSWD }}
       MAILJET_APIKEY_PUBLIC: ${{ secrets.MAILJET_APIKEY_PUBLIC }}
       MAILJET_APIKEY_PRIVATE: ${{ secrets.MAILJET_APIKEY_PRIVATE }}
       S3_UPLOAD_KEY: ${{ secrets.S3_UPLOAD_KEY }}
       S3_UPLOAD_SECRET: ${{ secrets.S3_UPLOAD_SECRET }}
+      FELT_TOKEN: ${{ secrets.FELT_TOKEN }}
       ASSETS_BUCKET_HOST: ${{ secrets.ASSETS_BUCKET_HOST }}
       ASSETS_BUCKET_PATH: ${{ secrets.ASSETS_BUCKET_PATH_PRODUCTION }}
diff --git a/.github/workflows/deploy-app-staging.yml b/.github/workflows/deploy-app-staging.yml
@@ -15,12 +15,13 @@ jobs:
     secrets:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      DATABASE_URL:  ${{ secrets.DATABASE_URL_STAGING }}
+      DATABASE_URL: ${{ secrets.DATABASE_URL_STAGING }}
       SESSION_SECRET_KEY: ${{ secrets.SESSION_SECRET_KEY_STAGING }}
       NGINX_HTPASSWD: ${{ secrets.NGINX_HTPASSWD }}
       MAILJET_APIKEY_PUBLIC: ${{ secrets.MAILJET_APIKEY_PUBLIC }}
       MAILJET_APIKEY_PRIVATE: ${{ secrets.MAILJET_APIKEY_PRIVATE }}
       S3_UPLOAD_KEY: ${{ secrets.S3_UPLOAD_KEY }}
+      FELT_TOKEN: ${{ secrets.FELT_TOKEN }}
       S3_UPLOAD_SECRET: ${{ secrets.S3_UPLOAD_SECRET }}
       ASSETS_BUCKET_HOST: ${{ secrets.ASSETS_BUCKET_HOST }}
       ASSETS_BUCKET_PATH: ${{ secrets.ASSETS_BUCKET_PATH_STAGING }}
diff --git a/.github/workflows/deploy-app-tinkering.yml b/.github/workflows/deploy-app-tinkering.yml
@@ -15,12 +15,13 @@ jobs:
     secrets:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      DATABASE_URL:  ${{ secrets.DATABASE_URL_TINKERING }}
+      DATABASE_URL: ${{ secrets.DATABASE_URL_TINKERING }}
       SESSION_SECRET_KEY: ${{ secrets.SESSION_SECRET_KEY_TINKERING }}
       NGINX_HTPASSWD: ${{ secrets.NGINX_HTPASSWD }}
       MAILJET_APIKEY_PUBLIC: ${{ secrets.MAILJET_APIKEY_PUBLIC }}
       MAILJET_APIKEY_PRIVATE: ${{ secrets.MAILJET_APIKEY_PRIVATE }}
       S3_UPLOAD_KEY: ${{ secrets.S3_UPLOAD_KEY }}
       S3_UPLOAD_SECRET: ${{ secrets.S3_UPLOAD_SECRET }}
+      FELT_TOKEN: ${{ secrets.FELT_TOKEN }}
       ASSETS_BUCKET_HOST: ${{ secrets.ASSETS_BUCKET_HOST }}
       ASSETS_BUCKET_PATH: ${{ secrets.ASSETS_BUCKET_PATH_TINKERING }}
diff --git a/.github/workflows/deploy-app.yml b/.github/workflows/deploy-app.yml
@@ -36,6 +36,8 @@ on:
         required: true
       S3_UPLOAD_SECRET:
         required: true
+      FELT_TOKEN:
+        required: true
       ASSETS_BUCKET_HOST:
         required: true
       ASSETS_BUCKET_PATH:
@@ -45,7 +47,6 @@ jobs:
   build-push-deploy-docker-images:
     runs-on: ubuntu-latest
     steps:
-
       - uses: actions/checkout@v3
 
       - name: Upgrade AWS CLI version and setup lightsailctl
@@ -115,6 +116,7 @@ jobs:
           S3_UPLOAD_BUCKET: ${{ inputs.S3_UPLOAD_BUCKET }}
           S3_UPLOAD_REGION: ${{ inputs.S3_UPLOAD_REGION }}
           S3_UPLOAD_ROOTFOLDER: ${{ inputs.S3_UPLOAD_ROOTFOLDER }}
+          FELT_TOKEN: ${{ secrets.FELT_TOKEN }}
           ASSETS_BUCKET_HOST: ${{ secrets.ASSETS_BUCKET_HOST }}
           ASSETS_BUCKET_PATH: ${{ secrets.ASSETS_BUCKET_PATH }}
 

diff --git a/.github/workflows/deployment-config.yml.tpl b/.github/workflows/deployment-config.yml.tpl
@@ -21,6 +21,7 @@ containers:
       S3_UPLOAD_BUCKET: ${S3_UPLOAD_BUCKET}
       S3_UPLOAD_REGION: ${S3_UPLOAD_REGION}
       S3_UPLOAD_ROOTFOLDER: ${S3_UPLOAD_ROOTFOLDER}
+      FELT_TOKEN: ${FELT_TOKEN}
     image: public.ecr.aws/n0p8j4k5/trassenscout/app:${GITHUB_SHA}
     ports:
       "3000": HTTP

diff --git a/...ations/20231018102729_project_add_field_felt_subsection_geometry_source_url/migration.sql b/...ations/20231018102729_project_add_field_felt_subsection_geometry_source_url/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Project" ADD COLUMN     "felt_subsection_geometry_source_url" TEXT;
diff --git a/db/migrations/20231023092359_subsubsection_add_tarffic_load_fields/migration.sql b/db/migrations/20231023092359_subsubsection_add_tarffic_load_fields/migration.sql
@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE "Subsubsection" ADD COLUMN     "maxSpeed" INTEGER,
+ADD COLUMN     "trafficLoad" INTEGER,
+ADD COLUMN     "trafficLoadDate" TIMESTAMP(3);
diff --git a/db/migrations/20231023130239_subsubsection_add_fields_cost_estimation/migration.sql b/db/migrations/20231023130239_subsubsection_add_fields_cost_estimation/migration.sql
@@ -0,0 +1,12 @@
+-- AlterTable
+ALTER TABLE "Subsubsection" ADD COLUMN     "constructionCosts" INTEGER,
+ADD COLUMN     "contributionsThirdParties" INTEGER,
+ADD COLUMN     "deliveryCosts" INTEGER,
+ADD COLUMN     "expensesOfficialOrders" INTEGER,
+ADD COLUMN     "expensesTechnicalVerification" INTEGER,
+ADD COLUMN     "grantsOtherFunding" INTEGER,
+ADD COLUMN     "landAcquisitionCosts" INTEGER,
+ADD COLUMN     "nonEligibleExpenses" INTEGER,
+ADD COLUMN     "ownFunds" INTEGER,
+ADD COLUMN     "planningCosts" INTEGER,
+ADD COLUMN     "revenuesEconomicIncome" INTEGER;
diff --git a/db/migrations/20231023154729_project_add_subsubsectionstatus/migration.sql b/db/migrations/20231023154729_project_add_subsubsectionstatus/migration.sql
@@ -0,0 +1,23 @@
+-- AlterTable
+ALTER TABLE "Subsubsection" ADD COLUMN     "subsubsectionStatusId" INTEGER;
+
+-- CreateTable
+CREATE TABLE "SubsubsectionStatus" (
+    "id" SERIAL NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "slug" TEXT NOT NULL,
+    "title" TEXT NOT NULL,
+    "projectId" INTEGER NOT NULL,
+
+    CONSTRAINT "SubsubsectionStatus_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "SubsubsectionStatus_projectId_slug_key" ON "SubsubsectionStatus"("projectId", "slug");
+
+-- AddForeignKey
+ALTER TABLE "Subsubsection" ADD CONSTRAINT "Subsubsection_subsubsectionStatusId_fkey" FOREIGN KEY ("subsubsectionStatusId") REFERENCES "SubsubsectionStatus"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "SubsubsectionStatus" ADD CONSTRAINT "SubsubsectionStatus_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/migrations/20231026151058_subsubsection_make_number_fields_float/migration.sql b/db/migrations/20231026151058_subsubsection_make_number_fields_float/migration.sql
@@ -0,0 +1,13 @@
+-- AlterTable
+ALTER TABLE "Subsubsection" ALTER COLUMN "maxSpeed" SET DATA TYPE DOUBLE PRECISION,
+ALTER COLUMN "constructionCosts" SET DATA TYPE DOUBLE PRECISION,
+ALTER COLUMN "contributionsThirdParties" SET DATA TYPE DOUBLE PRECISION,
+ALTER COLUMN "deliveryCosts" SET DATA TYPE DOUBLE PRECISION,
+ALTER COLUMN "expensesOfficialOrders" SET DATA TYPE DOUBLE PRECISION,
+ALTER COLUMN "expensesTechnicalVerification" SET DATA TYPE DOUBLE PRECISION,
+ALTER COLUMN "grantsOtherFunding" SET DATA TYPE DOUBLE PRECISION,
+ALTER COLUMN "landAcquisitionCosts" SET DATA TYPE DOUBLE PRECISION,
+ALTER COLUMN "nonEligibleExpenses" SET DATA TYPE DOUBLE PRECISION,
+ALTER COLUMN "ownFunds" SET DATA TYPE DOUBLE PRECISION,
+ALTER COLUMN "planningCosts" SET DATA TYPE DOUBLE PRECISION,
+ALTER COLUMN "revenuesEconomicIncome" SET DATA TYPE DOUBLE PRECISION;
diff --git a/db/schema.prisma b/db/schema.prisma
@@ -97,18 +97,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[]
+  slug                                String   @unique // shortTitle and URL Slug
+  subTitle                            String?
+  description                         String?
+  logoSrc                             String?
+  partnerLogoSrcs                     String[]
+  felt_subsection_geometry_source_url String?
   //
-  manager         User?    @relation(fields: [managerId], references: [id])
-  managerId       Int?
+  manager                             User?    @relation(fields: [managerId], references: [id])
+  managerId                           Int?
 
   surveyResponseTopics SurveyResponseTopic[]
   subsections          Subsection[]
@@ -119,6 +120,7 @@ model Project {
   Operator             Operator[]
   Survey               Survey[]
   qualityLevels        QualityLevel[]
+  SubsubsectionStatus  SubsubsectionStatus[]
 }
 
 model Membership {
@@ -222,32 +224,51 @@ model Subsection {
 }
 
 model Subsubsection {
-  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 // shortTitle and URL Slug
-  subTitle       String?
-  type           SubsubsectionTypeEnum @default(ROUTE) // Führungform
-  geometry       Json
-  labelPos       LabelPositionEnum     @default(top)
-  task           String // Maßnahmentyp
-  length         Float? // Kilometer
-  width          Float? // Meter
-  costEstimate   Float? // Euro
-  description    String? // Anmerkungen
-  mapillaryKey   String?
+  slug         String // shortTitle and URL Slug
+  subTitle     String?
+  type         SubsubsectionTypeEnum @default(ROUTE) // Führungform
+  geometry     Json
+  labelPos     LabelPositionEnum     @default(top)
+  task         String // Maßnahmentyp
+  length       Float? // Kilometer
+  width        Float? // Meter
+  costEstimate Float? // Euro
+  description  String? // Anmerkungen
+  mapillaryKey String?
+
+  maxSpeed        Float? // Maximalgeschwindigkeit
+  trafficLoad     Int? // Verkehrsbelastung
+  trafficLoadDate DateTime? // Datum der Verkehrsbelastung
+
+  planningCosts                 Float? //  Planungskosten
+  deliveryCosts                 Float? //  Lieferkosten
+  constructionCosts             Float? //  Baukosten
+  landAcquisitionCosts          Float? //  Grunderwerbskosten
+  expensesOfficialOrders        Float? //  Ausgaben aufgrund behördlicher Anordnungen
+  expensesTechnicalVerification Float? //  Ausgaben für den fachtechnischen Nachweis usw.
+  nonEligibleExpenses           Float? //  Nicht zuwendungsfähige Ausgaben
+  revenuesEconomicIncome        Float? //  Erlöse und wirtschafltiche Einnahmen
+  contributionsThirdParties     Float? //  Beiträge Dritter
+  grantsOtherFunding            Float? //  Zuwendungen aus anderen Förderprogrammen
+  ownFunds                      Float? //  Einsatz Eigenmittel
+
   //
-  qualityLevel   QualityLevel?         @relation(fields: [qualityLevelId], references: [id])
-  qualityLevelId Int?
+  qualityLevel          QualityLevel?        @relation(fields: [qualityLevelId], references: [id])
+  qualityLevelId        Int?
   //
-  manager        User?                 @relation(fields: [managerId], references: [id])
-  managerId      Int?
+  manager               User?                @relation(fields: [managerId], references: [id])
+  managerId             Int?
   //
-  subsection     Subsection            @relation(fields: [subsectionId], references: [id])
-  subsectionId   Int
+  subsection            Subsection           @relation(fields: [subsectionId], references: [id])
+  subsectionId          Int
   //
-  uploads        Upload[]
+  uploads               Upload[]
+  SubsubsectionStatus   SubsubsectionStatus? @relation(fields: [subsubsectionStatusId], references: [id])
+  subsubsectionStatusId Int?
 
   @@unique([subsectionId, slug])
 }
@@ -272,6 +293,21 @@ model QualityLevel {
   @@unique([projectId, slug])
 }
 
+model SubsubsectionStatus {
+  id            Int             @id @default(autoincrement())
+  createdAt     DateTime        @default(now())
+  updatedAt     DateTime        @updatedAt
+  //
+  slug          String // shortTitle and URL Slug
+  title         String
+  //
+  project       Project         @relation(fields: [projectId], references: [id])
+  projectId     Int
+  Subsubsection Subsubsection[]
+
+  @@unique([projectId, slug])
+}
+
 model Stakeholdernote {
   id           Int                       @id @default(autoincrement())
   createdAt    DateTime                  @default(now())

diff --git a/db/seeds.ts b/db/seeds.ts
@@ -1,14 +1,15 @@
 import seedCalendarEntries from "./seeds/calenderEntries"
 import seedContacts from "./seeds/contacts"
-import seedUploads from "./seeds/uploads"
 import seedMemberships from "./seeds/memberships"
 import seedOperators from "./seeds/operators"
 import seedProjects from "./seeds/projects"
 import seedQualityLevels from "./seeds/qualityLevels"
 import seedStakeholdernotes from "./seeds/stakeholdernotes"
 import seedSubsections from "./seeds/subsections"
+import seedSubsubsectionStatus from "./seeds/subsubsectionStatus"
 import seedSurveyResponseTopics from "./seeds/surveyresponsetopics"
 import seedSurveys from "./seeds/surveys"
+import seedUploads from "./seeds/uploads"
 import seedUsers from "./seeds/users"
 
 /*
@@ -27,6 +28,7 @@ const seed = async () => {
   await seedUploads()
   await seedSurveys()
   await seedSurveyResponseTopics()
+  await seedSubsubsectionStatus()
 }
 
 export default seed
diff --git a/db/seeds/projects.ts b/db/seeds/projects.ts
@@ -10,6 +10,7 @@ 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"],
     },
     {
@@ -18,6 +19,7 @@ Sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
       description: null,
       managerId: null,
       logoSrc: null,
+      felt_subsection_geometry_source_url: null,
       partnerLogoSrcs: [],
     },
     {
@@ -26,6 +28,7 @@ Sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
       description: null,
       managerId: null,
       logoSrc: null,
+      felt_subsection_geometry_source_url: null,
       partnerLogoSrcs: [],
     },
     {
@@ -34,6 +37,7 @@ Sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
       description: null,
       managerId: null,
       logoSrc: null,
+      felt_subsection_geometry_source_url: null,
       partnerLogoSrcs: [],
     },
   ]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- AlterTable
		ALTER TABLE "Project" ADD COLUMN "felt_subsection_geometry_source_url" TEXT;