From 86282fbe077c7ac356d847cac05dcd1c9f53b99a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Prie=C3=9Fnitz?= <pascal.priessnitz@synqtec.de>
Date: Wed, 3 Dec 2025 18:11:44 +0100
Subject: [PATCH] [deploy] fix register schema sortOrder

---
 prisma/schema.prisma            | 12 ++++++------
 src/database/schema.prisma      | 12 ++++++------
 src/services/registerService.ts | 18 ++++++++++--------
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index aaa1dff..6d9e1c5 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -177,12 +177,12 @@ model RegisterForm {
 }
 
 model RegisterFormField {
-  id        String   @id @default(cuid())
-  formId    String
-  label     String
-  type      String
-  required  Boolean  @default(false)
-  "order"   Int      @default(0)
+  id         String   @id @default(cuid())
+  formId     String
+  label      String
+  type       String
+  required   Boolean  @default(false)
+  sortOrder  Int      @default(0)
 
   form      RegisterForm @relation(fields: [formId], references: [id], onDelete: Cascade)
 }
diff --git a/src/database/schema.prisma b/src/database/schema.prisma
index 42acc39..1cb3c87 100644
--- a/src/database/schema.prisma
+++ b/src/database/schema.prisma
@@ -179,12 +179,12 @@ model RegisterForm {
 }
 
 model RegisterFormField {
-  id        String   @id @default(cuid())
-  formId    String
-  label     String
-  type      String
-  required  Boolean  @default(false)
-  "order"   Int      @default(0)
+  id         String   @id @default(cuid())
+  formId     String
+  label      String
+  type       String
+  required   Boolean  @default(false)
+  sortOrder  Int      @default(0)
 
   form      RegisterForm @relation(fields: [formId], references: [id], onDelete: Cascade)
 }
diff --git a/src/services/registerService.ts b/src/services/registerService.ts
index c2f1cd0..452c92e 100644
--- a/src/services/registerService.ts
+++ b/src/services/registerService.ts
@@ -23,7 +23,7 @@ export class RegisterService {
   }
 
   public async listForms(guildId: string) {
-    return prisma.registerForm.findMany({ where: { guildId }, include: { fields: { orderBy: { order: 'asc' } } }, orderBy: { createdAt: 'desc' } });
+    return prisma.registerForm.findMany({ where: { guildId }, include: { fields: { orderBy: { sortOrder: 'asc' } } }, orderBy: { createdAt: 'desc' } });
   }
 
   public async saveForm(form: {
@@ -55,10 +55,10 @@ export class RegisterService {
           label: f.label,
           type: f.type,
           required: f.required ?? false,
-          order: f.order ?? idx
+          sortOrder: f.order ?? idx
         }))
       });
-      return prisma.registerForm.findUnique({ where: { id: form.id }, include: { fields: { orderBy: { order: 'asc' } } } });
+      return prisma.registerForm.findUnique({ where: { id: form.id }, include: { fields: { orderBy: { sortOrder: 'asc' } } } });
     }
     const created = await prisma.registerForm.create({
       data: {
@@ -73,11 +73,11 @@ export class RegisterService {
             label: f.label,
             type: f.type,
             required: f.required ?? false,
-            order: f.order ?? idx
+            sortOrder: f.order ?? idx
           }))
         }
       },
-      include: { fields: { orderBy: { order: 'asc' } } }
+      include: { fields: { orderBy: { sortOrder: 'asc' } } }
     });
     return created;
   }
@@ -113,7 +113,7 @@ export class RegisterService {
   public async handleButton(interaction: ButtonInteraction) {
     if (interaction.customId.startsWith('register:form:')) {
       const formId = interaction.customId.split(':')[2];
-      const form = await prisma.registerForm.findFirst({ where: { id: formId }, include: { fields: { orderBy: { order: 'asc' } } } });
+      const form = await prisma.registerForm.findFirst({ where: { id: formId }, include: { fields: { orderBy: { sortOrder: 'asc' } } } });
       if (!form) return interaction.reply({ content: 'Formular nicht gefunden.', ephemeral: true });
       const modal = new ModalBuilder().setTitle(form.name).setCustomId(`register:submit:${form.id}`);
       const components: any[] = [];
@@ -164,7 +164,7 @@ export class RegisterService {
     const formId = interaction.customId.split(':')[2];
     const form = await prisma.registerForm.findFirst({
       where: { id: formId },
-      include: { fields: { orderBy: { order: 'asc' } } }
+      include: { fields: { orderBy: { sortOrder: 'asc' } } }
     });
     if (!form) {
       await interaction.reply({ content: 'Formular nicht gefunden.', ephemeral: true });
@@ -200,7 +200,7 @@ export class RegisterService {
     const channel = await guild.channels.fetch(channelId).catch(() => null);
     if (!channel || !channel.isTextBased()) return;
     const member = await guild.members.fetch(userId).catch(() => null);
-    const fields = await prisma.registerFormField.findMany({ where: { formId: form.id }, orderBy: { order: 'asc' } });
+    const fields = await prisma.registerFormField.findMany({ where: { formId: form.id }, orderBy: { sortOrder: 'asc' } });
     const answers = await prisma.registerApplicationAnswer.findMany({ where: { applicationId: app.id } });
     const embed = new EmbedBuilder()
       .setTitle(`Registrierung: ${form.name}`)
@@ -254,3 +254,5 @@ export class RegisterService {
     });
   }
 }
+
+