Release 2025-03-10 (#143)

FixMyBerlin · Mar 10, 2025 · ccce565 · ccce565
2 parents 11f5fcd + 1fd0bef
commit ccce565
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/.env.local.example b/.env.local.example
@@ -35,7 +35,7 @@ MAILJET_APIKEY_PRIVATE='' # Only on the server
 SESSION_SECRET_KEY=secret
 
 NEXT_PUBLIC_APP_ENV=development # 'staging', 'production'
-# NEXT_PUBLIC_APP_ORIGIN=http://127.0.0.1:5000 # 5000 for `npm run start` 'https://staging,trassenscout.de', 'https://trassenscout.de'
+# NEXT_PUBLIC_APP_ORIGIN=http://127.0.0.1:5000 # 5000 for `npm run start` 'https://staging.trassenscout.de', 'https://trassenscout.de'
 
 # for development: test the survey starting with another state
 NEXT_PUBLIC_PUBLIC_SURVEY_START_STAGE=START
diff --git a/db/migrations/20250310081339_invite_fix_uniquness/migration.sql b/db/migrations/20250310081339_invite_fix_uniquness/migration.sql
@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[email,projectId]` on the table `Invite` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- DropIndex
+DROP INDEX "Invite_email_key";
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Invite_email_projectId_key" ON "Invite"("email", "projectId");
diff --git a/db/schema.prisma b/db/schema.prisma
@@ -69,13 +69,15 @@ model Invite {
   token     String             @unique
   status    InviteStatusEnum   @default(PENDING)
   //
-  email     String             @unique
+  email     String
   role      MembershipRoleEnum @default(VIEWER)
   //
   projectId Int
   project   Project            @relation(fields: [projectId], references: [id])
   inviterId Int
   inviter   User               @relation(fields: [inviterId], references: [id])
+
+  @@unique([email, projectId])
 }
 
 enum InviteStatusEnum {

diff --git a/src/app/admin/projects/[projectSlug]/subsections/_components/SubsectionPlacemarkImport.tsx b/src/app/admin/projects/[projectSlug]/subsections/_components/SubsectionPlacemarkImport.tsx
@@ -2,8 +2,8 @@
 import { SuperAdminBox } from "@/src/core/components/AdminBox"
 import { blueButtonStyles, Link, selectLinkStyle } from "@/src/core/components/links"
 import { ButtonWrapper } from "@/src/core/components/links/ButtonWrapper"
+import { getPrdOrStgDomain } from "@/src/core/components/links/getDomain"
 import { useProjectSlug } from "@/src/core/routes/useProjectSlug"
-import { isProduction } from "@/src/core/utils"
 import getProject from "@/src/server/projects/queries/getProject"
 import updateSubsectionsWithPlacemark from "@/src/server/subsections/mutations/updateSubsectionsWithPlacemark"
 import getSubsections from "@/src/server/subsections/queries/getSubsections"
@@ -44,7 +44,11 @@ export const SubsectionPlacemarkImport = ({ project }: Props) => {
     }
   }
 
-  const placemarkPlayUrl = `https://play.placemark.io/?load=https://${!isProduction ? "staging." : ""}trassenscout.de/api/projects/${projectSlug}.json`
+  const placemarkPlayUrl = new URL("https://play.placemark.io")
+  placemarkPlayUrl.searchParams.append(
+    "load",
+    `${getPrdOrStgDomain()}/api/projects/${projectSlug}.json`,
+  )
 
   const handleUploadChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
     const files = event.target.files as FileList
@@ -157,7 +161,7 @@ export const SubsectionPlacemarkImport = ({ project }: Props) => {
       </div>
 
       {project.exportEnabled ? (
-        <Link button="blue" blank href={placemarkPlayUrl}>
+        <Link button="blue" blank href={placemarkPlayUrl.toString()}>
           Geometrien in Placemark Play öffnen
         </Link>
       ) : (

diff --git a/src/core/components/forms/errorMessageTranslations.ts b/src/core/components/forms/errorMessageTranslations.ts
@@ -2,10 +2,10 @@ type TranslatedMessages = { [key: string]: string }
 
 export const errorMessageTranslations: TranslatedMessages = {
   // INVITATION
-  "PrismaClientKnownRequestError: Invalid `prisma.invite.create()` invocation:Unique constraint failed on the fields: (`email`)":
+  "PrismaClientKnownRequestError: Invalid `prisma.invite.create()` invocation:Unique constraint failed on the fields: (`email`,`projectId`)":
     "Diese E-Mail-Adresse ist bereits eingeladen.",
   // SIGNUP
-  "PrismaClientKnownRequestError: Invalid `prisma.user.create()` invocation:Unique constraint failed on the fields: (`email`)":
+  "PrismaClientKnownRequestError: Invalid `prisma.user.create()` invocation:Unique constraint failed on the fields: (`email`,`projectId`)":
     "Diese E-Mail-Adresse ist bereits registriert.",
   // CONTACT
   "PrismaClientKnownRequestError: Invalid `prisma.contact.create()` invocation:Unique constraint failed on the fields: (`projectId`,`email`)":