fix: rename sortOrder to order

Author: supermomme

apps/api/prisma/migrations/20260311172026_faq_sort_order/migration.sql

@@ -1,5 +1,5 @@
 -- AlterTable
-ALTER TABLE "faq_categories" ADD COLUMN     "sortOrder" INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE "faq_categories" ADD COLUMN     "order" INTEGER NOT NULL DEFAULT 0;
 
 -- AlterTable
-ALTER TABLE "faqs" ADD COLUMN     "sortOrder" INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE "faqs" ADD COLUMN     "order" INTEGER NOT NULL DEFAULT 0;

apps/api/prisma/schema/Faq.prisma

@@ -1,7 +1,7 @@
 model FaqCategory {
-  id        String @id @default(uuid(7))
-  name      String
-  sortOrder Int    @default(0)
+  id    String @id @default(uuid(7))
+  name  String
+  order Int    @default(0)
 
   unterveranstaltungId String
   unterveranstaltung   Unterveranstaltung @relation(fields: [unterveranstaltungId], references: [id])
@@ -12,10 +12,10 @@ model FaqCategory {
 }
 
 model Faq {
-  id        String @id @default(uuid(7))
-  question  String
-  answer    String
-  sortOrder Int    @default(0)
+  id       String @id @default(uuid(7))
+  question String
+  answer   String
+  order    Int    @default(0)
 
   categoryId String
   category   FaqCategory @relation(fields: [categoryId], references: [id])

apps/api/src/services/faqs/faqCreateProcedure.ts

@@ -15,19 +15,19 @@ export const faqCreateProcedure = defineProtectedMutateProcedure({
     const [maxCategoryOrder, maxFaqOrder] = await Promise.all([
       prisma.faqCategory.aggregate({
         where: { unterveranstaltungId },
-        _max: { sortOrder: true },
+        _max: { order: true },
       }),
       prisma.faq.aggregate({
         where: { category: { unterveranstaltungId } },
-        _max: { sortOrder: true },
+        _max: { order: true },
       }),
     ])
 
     await prisma.faq.create({
       data: {
         question: faq.question,
         answer: faq.answer,
-        sortOrder: (maxFaqOrder._max.sortOrder ?? -1) + 1,
+        order: (maxFaqOrder._max.order ?? -1) + 1,
         unterveranstaltung: {
           connect: {
             id: unterveranstaltungId,
@@ -38,7 +38,7 @@ export const faqCreateProcedure = defineProtectedMutateProcedure({
             create: {
               name: faq.category,
               unterveranstaltungId,
-              sortOrder: (maxCategoryOrder._max.sortOrder ?? -1) + 1,
+              order: (maxCategoryOrder._max.order ?? -1) + 1,
             },
             where: {
               name_unterveranstaltungId: {

apps/api/src/services/faqs/faqListProcedure.ts

@@ -14,18 +14,18 @@ export async function listFaqs(unterveranstaltungId: string) {
       },
     },
     orderBy: {
-      sortOrder: 'asc',
+      order: 'asc',
     },
     select: {
       id: true,
       question: true,
       answer: true,
-      sortOrder: true,
+      order: true,
       category: {
         select: {
           id: true,
           name: true,
-          sortOrder: true,
+          order: true,
         },
       },
     },
@@ -36,13 +36,13 @@ export async function listFaqs(unterveranstaltungId: string) {
       ...v,
       category: v.category.name,
       categoryId: v.category.id,
-      categorySortOrder: v.category.sortOrder,
+      categoryOrder: v.category.order,
     })),
     ({ category }) => category
   )
 
   return Object.fromEntries(
-    Object.entries(groups).sort(([, a], [, b]) => (a[0]?.categorySortOrder ?? 0) - (b[0]?.categorySortOrder ?? 0))
+    Object.entries(groups).sort(([, a], [, b]) => (a[0]?.categoryOrder ?? 0) - (b[0]?.categoryOrder ?? 0))
   )
 }
 

apps/api/src/services/faqs/faqReorderProcedure.ts

@@ -13,14 +13,14 @@ export const faqReorderProcedure = defineProtectedMutateProcedure({
     faqOrder: z.array(
       z.strictObject({
         id: z.string().uuid(),
-        sortOrder: z.number().int().min(0),
+        order: z.number().int().min(0),
         categoryId: z.string().uuid(),
       })
     ),
     categoryOrder: z.array(
       z.strictObject({
         id: z.string().uuid(),
-        sortOrder: z.number().int().min(0),
+        order: z.number().int().min(0),
       })
     ),
   }),
@@ -78,16 +78,16 @@ export const faqReorderProcedure = defineProtectedMutateProcedure({
 
     /// Perform updates in a transaction
     await prisma.$transaction([
-      ...faqOrder.map(({ id, sortOrder, categoryId }) =>
+      ...faqOrder.map(({ id, order, categoryId }) =>
         prisma.faq.update({
           where: { id },
-          data: { sortOrder, categoryId },
+          data: { order, categoryId },
         })
       ),
-      ...categoryOrder.map(({ id, sortOrder }) =>
+      ...categoryOrder.map(({ id, order }) =>
         prisma.faqCategory.update({
           where: { id },
-          data: { sortOrder },
+          data: { order },
         })
       ),
     ])

apps/frontend/src/views/FAQs/FAQList.vue

@@ -46,11 +46,11 @@ function openFormModal(faq?: FAQ) {
 
 async function saveOrder() {
   const faqOrder = categories.value.flatMap((cat) =>
-    cat.faqs.map((faq, index) => ({ id: faq.id, sortOrder: index, categoryId: cat.categoryId }))
+    cat.faqs.map((faq, index) => ({ id: faq.id, order: index, categoryId: cat.categoryId }))
   )
   const categoryOrder = categories.value.map((cat, index) => ({
     id: cat.categoryId,
-    sortOrder: index,
+    order: index,
   }))
   await apiClient.faq.reorder.mutate({ faqOrder, categoryOrder })
   await execute()