Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

🧹 Remove legacy user preferences (#1035)

Luke Vella44a0d953551c
diff --git a/packages/backend/trpc/routers/index.ts b/packages/backend/trpc/routers/index.ts
index 690e77f21..fe664aaaf 100644
--- a/packages/backend/trpc/routers/index.ts
+++ b/packages/backend/trpc/routers/index.ts
@@ -2,14 +2,12 @@ import { mergeRouters, router } from "../trpc";
import { auth } from "./auth";
import { polls } from "./polls";
import { user } from "./user";
-import { userPreferences } from "./user-preferences";
export const appRouter = mergeRouters(
router({
auth,
polls,
user,
- userPreferences,
}),
);
diff --git a/packages/backend/trpc/routers/user-preferences.ts b/packages/backend/trpc/routers/user-preferences.ts
deleted file mode 100644
index 527d471d4..000000000
--- a/packages/backend/trpc/routers/user-preferences.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { prisma } from "@rallly/database";
-import z from "zod";
-
-import { publicProcedure, router } from "../trpc";
-
-export const userPreferences = router({
- get: publicProcedure.query(async ({ ctx }) => {
- if (ctx.user.isGuest) {
- return null;
- } else {
- return await prisma.userPreferences.findUnique({
- where: {
- userId: ctx.user.id,
- },
- select: {
- timeZone: true,
- weekStart: true,
- timeFormat: true,
- },
- });
- }
- }),
- update: publicProcedure
- .input(
- z.object({
- timeZone: z.string().optional(),
- weekStart: z.number().min(0).max(6).optional(),
- timeFormat: z.enum(["hours12", "hours24"]).optional(),
- }),
- )
- .mutation(async ({ input, ctx }) => {
- if (ctx.user.isGuest === false) {
- await prisma.userPreferences.upsert({
- where: {
- userId: ctx.user.id,
- },
- create: {
- userId: ctx.user.id,
- ...input,
- },
- update: {
- ...input,
- },
- });
- }
- }),
- delete: publicProcedure.mutation(async ({ ctx }) => {
- if (ctx.user.isGuest) {
- // delete guest preferences
- } else {
- await prisma.userPreferences.delete({
- where: {
- userId: ctx.user.id,
- },
- });
- }
- }),
-});
diff --git a/packages/database/prisma/migrations/20240224011353_remove_legacy_user_preferences/migration.sql b/packages/database/prisma/migrations/20240224011353_remove_legacy_user_preferences/migration.sql
new file mode 100644
index 000000000..37dd672a5
--- /dev/null
+++ b/packages/database/prisma/migrations/20240224011353_remove_legacy_user_preferences/migration.sql
@@ -0,0 +1,2 @@
+-- DropTable
+DROP TABLE "user_preferences";
diff --git a/packages/database/prisma/schema.prisma b/packages/database/prisma/schema.prisma
index ada8e6ba3..50adcc389 100644
--- a/packages/database/prisma/schema.prisma
+++ b/packages/database/prisma/schema.prisma
@@ -99,17 +99,6 @@ model Subscription {
@@map("subscriptions")
}
-// @deprecated
-model UserPreferences {
- userId String @id @map("user_id")
- timeZone String? @map("time_zone")
- weekStart Int? @map("week_start")
- timeFormat TimeFormat? @map("time_format")
- createdAt DateTime @default(now()) @map("created_at")
-
- @@map("user_preferences")
-}
-
enum ParticipantVisibility {
full
scoresOnly