From 7beaf5611f68ab4c2e3ab6bc102b4139b61354d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Bischoff?= Date: Mon, 4 Mar 2024 13:12:33 +0100 Subject: [PATCH 1/5] fix: fix conference creation and updating + refactor file names --- .../conferences/create-conference.form.tsx | 5 ++- .../conference.0/route-conference-archived.ts | 4 ++ .../conference.0/route-conference-created.ts | 11 ++++++ .../conference.0/route-conference-updated.ts | 10 +++++ src/app/conferences/page.tsx | 20 +++++----- src/app/me/tickets/ticket.component.tsx | 5 ++- ...ive.ts => conference-archive.procedure.ts} | 0 ...eate.ts => conference-create.procedure.ts} | 3 +- ...nce-get.ts => conference-get.procedure.ts} | 0 ...e-list.ts => conference-list.procedure.ts} | 0 ...date.ts => conference-update.procedure.ts} | 0 .../routers/conference/conference.router.ts | 10 ++--- ...archive.ts => ticket-archive.procedure.ts} | 0 ...eck-in.ts => ticket-check-in.procedure.ts} | 0 ...t-create.ts => ticket-create.procedure.ts} | 0 ...{ticket-get.ts => ticket-get.procedure.ts} | 0 .../routers/ticket/ticket-list.procedure.ts | 28 +++++++++++++ src/server/api/routers/ticket/ticket-list.ts | 39 ------------------- ...ts => ticket-transfer-accept.procedure.ts} | 0 ...ts => ticket-transfer-cancel.procedure.ts} | 0 ...ts => ticket-transfer-create.procedure.ts} | 0 .../api/routers/ticket/ticket.router.ts | 16 ++++---- 22 files changed, 86 insertions(+), 65 deletions(-) rename src/server/api/routers/conference/{conference-archive.ts => conference-archive.procedure.ts} (100%) rename src/server/api/routers/conference/{conference-create.ts => conference-create.procedure.ts} (92%) rename src/server/api/routers/conference/{conference-get.ts => conference-get.procedure.ts} (100%) rename src/server/api/routers/conference/{conference-list.ts => conference-list.procedure.ts} (100%) rename src/server/api/routers/conference/{conference-update.ts => conference-update.procedure.ts} (100%) rename src/server/api/routers/ticket/{ticket-archive.ts => ticket-archive.procedure.ts} (100%) rename src/server/api/routers/ticket/{ticket-check-in.ts => ticket-check-in.procedure.ts} (100%) rename src/server/api/routers/ticket/{ticket-create.ts => ticket-create.procedure.ts} (100%) rename src/server/api/routers/ticket/{ticket-get.ts => ticket-get.procedure.ts} (100%) create mode 100644 src/server/api/routers/ticket/ticket-list.procedure.ts delete mode 100644 src/server/api/routers/ticket/ticket-list.ts rename src/server/api/routers/ticket/{ticket-transfer-accept.ts => ticket-transfer-accept.procedure.ts} (100%) rename src/server/api/routers/ticket/{ticket-transfer-cancel.ts => ticket-transfer-cancel.procedure.ts} (100%) rename src/server/api/routers/ticket/{ticket-transfer-create.ts => ticket-transfer-create.procedure.ts} (100%) diff --git a/src/app/admin/conferences/create-conference.form.tsx b/src/app/admin/conferences/create-conference.form.tsx index b2b5c1b..a6469e9 100644 --- a/src/app/admin/conferences/create-conference.form.tsx +++ b/src/app/admin/conferences/create-conference.form.tsx @@ -59,6 +59,7 @@ export const CreateConferenceForm: FC = ({ ticketPrice: 0.0, startDate: new Date().toISOString(), endDate: new Date().toISOString(), + stripeId: "", }, }) @@ -165,6 +166,8 @@ export const CreateConferenceForm: FC = ({
( Currency @@ -187,8 +190,6 @@ export const CreateConferenceForm: FC = ({ )} - name={"ticketCurrency"} - control={form.control} />
diff --git a/src/app/api/transform/conference.0/route-conference-archived.ts b/src/app/api/transform/conference.0/route-conference-archived.ts index 91c9dc5..9cef959 100644 --- a/src/app/api/transform/conference.0/route-conference-archived.ts +++ b/src/app/api/transform/conference.0/route-conference-archived.ts @@ -3,6 +3,7 @@ import { eq } from "drizzle-orm" import { ConferenceEventArchivedPayload } from "@/contracts/events/conference" import { db } from "@/database" import { conferences } from "@/database/schemas" +import { archiveProduct } from "@/lib/stripe/product" export default async function conferenceArchived(payload: unknown) { console.log("Got archived event", payload) @@ -13,6 +14,9 @@ export default async function conferenceArchived(payload: unknown) { if (!exists) { return } + + await archiveProduct(exists.stripeId) + await db .update(conferences) .set({ diff --git a/src/app/api/transform/conference.0/route-conference-created.ts b/src/app/api/transform/conference.0/route-conference-created.ts index 20cf73b..11bb21d 100644 --- a/src/app/api/transform/conference.0/route-conference-created.ts +++ b/src/app/api/transform/conference.0/route-conference-created.ts @@ -3,6 +3,7 @@ import { eq } from "drizzle-orm" import { ConferenceEventCreatedPayload } from "@/contracts/events/conference" import { db } from "@/database" import { conferences } from "@/database/schemas" +import { createProduct } from "@/lib/stripe/product" export default async function conferenceCreated(payload: unknown) { console.log("Got created event", payload) @@ -13,5 +14,15 @@ export default async function conferenceCreated(payload: unknown) { if (exists) { return } + + await createProduct({ + id: parsedPayload.stripeId, + conferenceId: parsedPayload.id, + name: parsedPayload.name, + price: parsedPayload.ticketPrice, + currency: parsedPayload.ticketCurrency, + description: parsedPayload.ticketDescription, + }) + await db.insert(conferences).values(parsedPayload) } diff --git a/src/app/api/transform/conference.0/route-conference-updated.ts b/src/app/api/transform/conference.0/route-conference-updated.ts index 9f23617..6b382e1 100644 --- a/src/app/api/transform/conference.0/route-conference-updated.ts +++ b/src/app/api/transform/conference.0/route-conference-updated.ts @@ -3,6 +3,7 @@ import { eq } from "drizzle-orm" import { ConferenceEventUpdatedPayload } from "@/contracts/events/conference" import { db } from "@/database" import { conferences } from "@/database/schemas" +import { updateProduct } from "@/lib/stripe/product" export default async function conferenceUpdated(payload: unknown) { console.log("Got updated event", payload) @@ -13,6 +14,15 @@ export default async function conferenceUpdated(payload: unknown) { if (!exists) { return } + + await updateProduct({ + id: exists.stripeId, + name: parsedPayload.name, + description: parsedPayload.ticketDescription, + price: parsedPayload.ticketPrice, + currency: parsedPayload.ticketCurrency, + }) + await db .update(conferences) .set(parsedPayload) diff --git a/src/app/conferences/page.tsx b/src/app/conferences/page.tsx index 10829d5..6c96524 100644 --- a/src/app/conferences/page.tsx +++ b/src/app/conferences/page.tsx @@ -37,7 +37,12 @@ export default function ConferencesPage() { const { data: conferences, isLoading } = api.conference.list.useQuery() return (
-
Conferences
+
+ Conferences + + Admin + +
{isLoading || !conferences ? ( ) : ( @@ -53,7 +58,9 @@ interface ConferencesListProps { conferences: RouterOutput["conference"]["list"] } function ConferencesList({ conferences }: ConferencesListProps) { - return conferences.map((conference) => ) + return conferences.map((conference) => ( + + )) } const CheckoutResponse = z.object({ @@ -120,13 +127,8 @@ function Conference({ conference }: ConferenceProps) { }, [ticketQuantity, conference.id]) return ( -
-
- {conference.name} - - Admin - -
+
+
{conference.name}
{conference.description}
{dayjs(conference.startDate).format("MMMM D, YYYY")} diff --git a/src/app/me/tickets/ticket.component.tsx b/src/app/me/tickets/ticket.component.tsx index 514dc72..b45ead2 100644 --- a/src/app/me/tickets/ticket.component.tsx +++ b/src/app/me/tickets/ticket.component.tsx @@ -32,6 +32,9 @@ export function Ticket({ ticket, refetch }: TicketProps) { const [loading, setLoading] = useState(false) const [ticketDialogOpened, setTicketDialogOpened] = useState(false) const { Canvas } = useQRCode() + const { data: conference } = api.conference.get.useQuery({ + id: ticket.conferenceId, + }) const apiArchiveTicket = api.ticket.archive.useMutation() const archiveTicket = useCallback(async () => { @@ -93,7 +96,7 @@ export function Ticket({ ticket, refetch }: TicketProps) { />
-
Tonik 2024
+
{conference?.name}
Ticket State: {ticket.state}
diff --git a/src/server/api/routers/conference/conference-archive.ts b/src/server/api/routers/conference/conference-archive.procedure.ts similarity index 100% rename from src/server/api/routers/conference/conference-archive.ts rename to src/server/api/routers/conference/conference-archive.procedure.ts diff --git a/src/server/api/routers/conference/conference-create.ts b/src/server/api/routers/conference/conference-create.procedure.ts similarity index 92% rename from src/server/api/routers/conference/conference-create.ts rename to src/server/api/routers/conference/conference-create.procedure.ts index 7832eba..cd468bf 100644 --- a/src/server/api/routers/conference/conference-create.ts +++ b/src/server/api/routers/conference/conference-create.procedure.ts @@ -28,8 +28,9 @@ export const createConferenceRouter = protectedProcedure } const id = shortUuid.generate() + const stripeId = shortUuid.generate() - await sendConferenceCreatedEvent({ id, ...input }) + await sendConferenceCreatedEvent({ ...input, stripeId, id }) try { await waitForPredicate( () => diff --git a/src/server/api/routers/conference/conference-get.ts b/src/server/api/routers/conference/conference-get.procedure.ts similarity index 100% rename from src/server/api/routers/conference/conference-get.ts rename to src/server/api/routers/conference/conference-get.procedure.ts diff --git a/src/server/api/routers/conference/conference-list.ts b/src/server/api/routers/conference/conference-list.procedure.ts similarity index 100% rename from src/server/api/routers/conference/conference-list.ts rename to src/server/api/routers/conference/conference-list.procedure.ts diff --git a/src/server/api/routers/conference/conference-update.ts b/src/server/api/routers/conference/conference-update.procedure.ts similarity index 100% rename from src/server/api/routers/conference/conference-update.ts rename to src/server/api/routers/conference/conference-update.procedure.ts diff --git a/src/server/api/routers/conference/conference.router.ts b/src/server/api/routers/conference/conference.router.ts index cb817d9..dd7166b 100644 --- a/src/server/api/routers/conference/conference.router.ts +++ b/src/server/api/routers/conference/conference.router.ts @@ -1,8 +1,8 @@ -import { archiveConferenceRouter } from "@/server/api/routers/conference/conference-archive" -import { createConferenceRouter } from "@/server/api/routers/conference/conference-create" -import { getConferenceRouter } from "@/server/api/routers/conference/conference-get" -import { getConferencesRouter } from "@/server/api/routers/conference/conference-list" -import { updateConferenceRouter } from "@/server/api/routers/conference/conference-update" +import { archiveConferenceRouter } from "@/server/api/routers/conference/conference-archive.procedure" +import { createConferenceRouter } from "@/server/api/routers/conference/conference-create.procedure" +import { getConferenceRouter } from "@/server/api/routers/conference/conference-get.procedure" +import { getConferencesRouter } from "@/server/api/routers/conference/conference-list.procedure" +import { updateConferenceRouter } from "@/server/api/routers/conference/conference-update.procedure" import { createTRPCRouter } from "@/server/api/trpc" export const conferenceRouter = createTRPCRouter({ diff --git a/src/server/api/routers/ticket/ticket-archive.ts b/src/server/api/routers/ticket/ticket-archive.procedure.ts similarity index 100% rename from src/server/api/routers/ticket/ticket-archive.ts rename to src/server/api/routers/ticket/ticket-archive.procedure.ts diff --git a/src/server/api/routers/ticket/ticket-check-in.ts b/src/server/api/routers/ticket/ticket-check-in.procedure.ts similarity index 100% rename from src/server/api/routers/ticket/ticket-check-in.ts rename to src/server/api/routers/ticket/ticket-check-in.procedure.ts diff --git a/src/server/api/routers/ticket/ticket-create.ts b/src/server/api/routers/ticket/ticket-create.procedure.ts similarity index 100% rename from src/server/api/routers/ticket/ticket-create.ts rename to src/server/api/routers/ticket/ticket-create.procedure.ts diff --git a/src/server/api/routers/ticket/ticket-get.ts b/src/server/api/routers/ticket/ticket-get.procedure.ts similarity index 100% rename from src/server/api/routers/ticket/ticket-get.ts rename to src/server/api/routers/ticket/ticket-get.procedure.ts diff --git a/src/server/api/routers/ticket/ticket-list.procedure.ts b/src/server/api/routers/ticket/ticket-list.procedure.ts new file mode 100644 index 0000000..5b8b428 --- /dev/null +++ b/src/server/api/routers/ticket/ticket-list.procedure.ts @@ -0,0 +1,28 @@ +import { and, eq } from "drizzle-orm" +import { z } from "zod" + +import { db } from "@/database" +import { tickets, ticketTransfers } from "@/database/schemas" +import { protectedProcedure } from "@/server/api/trpc" + +export const getTicketsRouter = protectedProcedure.query(({ ctx }) => { + const userId = ctx.user.id + return db + .select({ + id: tickets.id, + userId: tickets.userId, + conferenceId: tickets.conferenceId, + state: tickets.state, + transferId: ticketTransfers.id, + }) + .from(tickets) + .leftJoin( + ticketTransfers, + and( + eq(tickets.id, ticketTransfers.ticketId), + eq(ticketTransfers.state, "open"), + ), + ) + .where(eq(tickets.userId, userId)) + .execute() +}) diff --git a/src/server/api/routers/ticket/ticket-list.ts b/src/server/api/routers/ticket/ticket-list.ts deleted file mode 100644 index 5b9353f..0000000 --- a/src/server/api/routers/ticket/ticket-list.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { and, eq } from "drizzle-orm" -import { z } from "zod" - -import { db } from "@/database" -import { tickets, ticketTransfers } from "@/database/schemas" -import { protectedProcedure } from "@/server/api/trpc" - -const GetTicketListInput = z.object({ - conferenceId: z.string(), -}) - -export const getTicketsRouter = protectedProcedure - .input(GetTicketListInput) - .query(({ ctx, input }) => { - const userId = ctx.user.id - return db - .select({ - id: tickets.id, - userId: tickets.userId, - conferenceId: tickets.conferenceId, - state: tickets.state, - transferId: ticketTransfers.id, - }) - .from(tickets) - .leftJoin( - ticketTransfers, - and( - eq(tickets.id, ticketTransfers.ticketId), - eq(ticketTransfers.state, "open"), - ), - ) - .where( - and( - eq(tickets.userId, userId), - eq(tickets.conferenceId, input.conferenceId), - ), - ) - .execute() - }) diff --git a/src/server/api/routers/ticket/ticket-transfer-accept.ts b/src/server/api/routers/ticket/ticket-transfer-accept.procedure.ts similarity index 100% rename from src/server/api/routers/ticket/ticket-transfer-accept.ts rename to src/server/api/routers/ticket/ticket-transfer-accept.procedure.ts diff --git a/src/server/api/routers/ticket/ticket-transfer-cancel.ts b/src/server/api/routers/ticket/ticket-transfer-cancel.procedure.ts similarity index 100% rename from src/server/api/routers/ticket/ticket-transfer-cancel.ts rename to src/server/api/routers/ticket/ticket-transfer-cancel.procedure.ts diff --git a/src/server/api/routers/ticket/ticket-transfer-create.ts b/src/server/api/routers/ticket/ticket-transfer-create.procedure.ts similarity index 100% rename from src/server/api/routers/ticket/ticket-transfer-create.ts rename to src/server/api/routers/ticket/ticket-transfer-create.procedure.ts diff --git a/src/server/api/routers/ticket/ticket.router.ts b/src/server/api/routers/ticket/ticket.router.ts index 3b9e0de..48e518c 100644 --- a/src/server/api/routers/ticket/ticket.router.ts +++ b/src/server/api/routers/ticket/ticket.router.ts @@ -1,11 +1,11 @@ -import { archiveTicketRouter } from "@/server/api/routers/ticket/ticket-archive" -import { checkInTicketRouter } from "@/server/api/routers/ticket/ticket-check-in" -import { createTicketRouter } from "@/server/api/routers/ticket/ticket-create" -import { getTicketRouter } from "@/server/api/routers/ticket/ticket-get" -import { getTicketsRouter } from "@/server/api/routers/ticket/ticket-list" -import { acceptTicketTransferRouter } from "@/server/api/routers/ticket/ticket-transfer-accept" -import { cancelTicketTransferRouter } from "@/server/api/routers/ticket/ticket-transfer-cancel" -import { createTicketTransferRouter } from "@/server/api/routers/ticket/ticket-transfer-create" +import { archiveTicketRouter } from "@/server/api/routers/ticket/ticket-archive.procedure" +import { checkInTicketRouter } from "@/server/api/routers/ticket/ticket-check-in.procedure" +import { createTicketRouter } from "@/server/api/routers/ticket/ticket-create.procedure" +import { getTicketRouter } from "@/server/api/routers/ticket/ticket-get.procedure" +import { getTicketsRouter } from "@/server/api/routers/ticket/ticket-list.procedure" +import { acceptTicketTransferRouter } from "@/server/api/routers/ticket/ticket-transfer-accept.procedure" +import { cancelTicketTransferRouter } from "@/server/api/routers/ticket/ticket-transfer-cancel.procedure" +import { createTicketTransferRouter } from "@/server/api/routers/ticket/ticket-transfer-create.procedure" import { createTRPCRouter } from "@/server/api/trpc" export default createTRPCRouter({ From c31b7f8c82526373794b459869c0f2a08c78c1de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Bischoff?= Date: Mon, 4 Mar 2024 13:13:05 +0100 Subject: [PATCH 2/5] chore: lint --- src/server/api/routers/ticket/ticket-list.procedure.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/server/api/routers/ticket/ticket-list.procedure.ts b/src/server/api/routers/ticket/ticket-list.procedure.ts index 5b8b428..eaf33d7 100644 --- a/src/server/api/routers/ticket/ticket-list.procedure.ts +++ b/src/server/api/routers/ticket/ticket-list.procedure.ts @@ -1,5 +1,4 @@ import { and, eq } from "drizzle-orm" -import { z } from "zod" import { db } from "@/database" import { tickets, ticketTransfers } from "@/database/schemas" From 780efb5468d5c26517d648139928003b06a98d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Bischoff?= Date: Mon, 4 Mar 2024 13:24:59 +0100 Subject: [PATCH 3/5] fix: ticket page --- src/app/me/tickets/page.tsx | 13 +------------ src/components/nav.tsx | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/app/me/tickets/page.tsx b/src/app/me/tickets/page.tsx index 62d6c61..a20b992 100644 --- a/src/app/me/tickets/page.tsx +++ b/src/app/me/tickets/page.tsx @@ -18,8 +18,6 @@ import { Input } from "@/components/ui/input" import { api } from "@/trpc/react" export default function Tickets() { - const [conferenceId, setConferenceId] = useState() - const { data: conferences } = api.conference.list.useQuery() const router = useRouter() const pathname = usePathname() const searchParams = useSearchParams() @@ -27,10 +25,7 @@ export default function Tickets() { const [ticketRedeemDialogOpened, setTicketRedeemDialogOpened] = useState(false) const [transferId, setTransferId] = useState("") - const { data: tickets, refetch } = api.ticket.list.useQuery( - { conferenceId: conferenceId! }, - { enabled: !!conferenceId }, - ) + const { data: tickets, refetch } = api.ticket.list.useQuery() useEffect(() => { const success = searchParams.get("success") @@ -42,12 +37,6 @@ export default function Tickets() { router.replace(pathname) }, []) - useEffect(() => { - if (conferences) { - setConferenceId(conferences[0]?.id) - } - }, [conferences]) - const apiAcceptTicketTransfer = api.ticket.acceptTransfer.useMutation() const acceptTicketTransfer = useCallback(async () => { if (!transferId) { diff --git a/src/components/nav.tsx b/src/components/nav.tsx index 9173322..96c4fe8 100644 --- a/src/components/nav.tsx +++ b/src/components/nav.tsx @@ -65,7 +65,7 @@ export function Nav({ isSidebarOpen, setIsSidebarOpen, links }: NavProps) { setIsSidebarOpen(false) } }}> - {" "} + {" "} {/* Increased icon size and right margin */} {link.title} {link.label && ( From e389f962147ffc17141b413df054a3201746f4ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Bischoff?= Date: Mon, 4 Mar 2024 13:41:50 +0100 Subject: [PATCH 4/5] fix: pg pool --- src/database/index.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/database/index.ts b/src/database/index.ts index 65e159c..412deaa 100644 --- a/src/database/index.ts +++ b/src/database/index.ts @@ -4,7 +4,7 @@ import { Pool } from "pg" import * as schemas from "@/database/schemas" import { registerService } from "@/lib/register-service" -const client = registerService( +const pool = registerService( "pgpool", () => new Pool({ @@ -12,8 +12,6 @@ const client = registerService( }), ) -client.connect().catch((err: unknown) => console.error(err)) - -export const db = drizzle(client, { +export const db = drizzle(pool, { schema: schemas, }) From 3a113157324b4fc4bad761fb90eb8abc2b6872f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Bischoff?= Date: Mon, 4 Mar 2024 14:19:25 +0100 Subject: [PATCH 5/5] chore: renames --- .../conference-archive.procedure.ts | 2 +- .../conference/conference-create.procedure.ts | 2 +- .../conference/conference-get.procedure.ts | 2 +- .../conference/conference-list.procedure.ts | 2 +- .../conference/conference-update.procedure.ts | 2 +- .../routers/conference/conference.router.ts | 20 ++++++------ .../ticket/ticket-archive.procedure.ts | 2 +- .../ticket/ticket-check-in.procedure.ts | 2 +- .../routers/ticket/ticket-create.procedure.ts | 2 +- .../routers/ticket/ticket-get.procedure.ts | 2 +- .../routers/ticket/ticket-list.procedure.ts | 2 +- .../ticket-transfer-accept.procedure.ts | 2 +- .../ticket-transfer-cancel.procedure.ts | 2 +- .../ticket-transfer-create.procedure.ts | 2 +- .../api/routers/ticket/ticket.router.ts | 32 +++++++++---------- 15 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/server/api/routers/conference/conference-archive.procedure.ts b/src/server/api/routers/conference/conference-archive.procedure.ts index 291babf..ecf36e2 100644 --- a/src/server/api/routers/conference/conference-archive.procedure.ts +++ b/src/server/api/routers/conference/conference-archive.procedure.ts @@ -13,7 +13,7 @@ const ArchiveConferenceInputDto = z.object({ export type ArchiveConferenceInput = z.infer -export const archiveConferenceRouter = protectedProcedure +export const archiveConferenceProcedure = protectedProcedure .input(ArchiveConferenceInputDto) .mutation(async ({ input }) => { await sendConferenceArchivedEvent({ id: input.id }) diff --git a/src/server/api/routers/conference/conference-create.procedure.ts b/src/server/api/routers/conference/conference-create.procedure.ts index cd468bf..fa3efa4 100644 --- a/src/server/api/routers/conference/conference-create.procedure.ts +++ b/src/server/api/routers/conference/conference-create.procedure.ts @@ -11,7 +11,7 @@ import { conferences } from "@/database/schemas" import waitForPredicate from "@/lib/wait-for-predicate" import { protectedProcedure } from "@/server/api/trpc" -export const createConferenceRouter = protectedProcedure +export const createConferenceProcedure = protectedProcedure .input(CreateConferenceInputDto) .mutation(async ({ input }) => { // TODO: make sure user has correct permissions diff --git a/src/server/api/routers/conference/conference-get.procedure.ts b/src/server/api/routers/conference/conference-get.procedure.ts index 7388236..7bd3efb 100644 --- a/src/server/api/routers/conference/conference-get.procedure.ts +++ b/src/server/api/routers/conference/conference-get.procedure.ts @@ -9,7 +9,7 @@ const GetConferenceInput = z.object({ id: z.string(), }) -export const getConferenceRouter = protectedProcedure +export const getConferenceProcedure = protectedProcedure .input(GetConferenceInput) .query(({ input }) => { return db.query.conferences.findFirst({ diff --git a/src/server/api/routers/conference/conference-list.procedure.ts b/src/server/api/routers/conference/conference-list.procedure.ts index 28fa708..5cc3982 100644 --- a/src/server/api/routers/conference/conference-list.procedure.ts +++ b/src/server/api/routers/conference/conference-list.procedure.ts @@ -4,7 +4,7 @@ import { db } from "@/database" import { conferences } from "@/database/schemas" import { protectedProcedure } from "@/server/api/trpc" -export const getConferencesRouter = protectedProcedure.query(async () => { +export const getConferencesProcedure = protectedProcedure.query(async () => { return ( (await db .select({ diff --git a/src/server/api/routers/conference/conference-update.procedure.ts b/src/server/api/routers/conference/conference-update.procedure.ts index a459cb1..ab2f48f 100644 --- a/src/server/api/routers/conference/conference-update.procedure.ts +++ b/src/server/api/routers/conference/conference-update.procedure.ts @@ -7,7 +7,7 @@ import { conferences } from "@/database/schemas" import waitForPredicate from "@/lib/wait-for-predicate" import { protectedProcedure } from "@/server/api/trpc" -export const updateConferenceRouter = protectedProcedure +export const updateConferenceProcedure = protectedProcedure .input(UpdateConferenceInputDto) .mutation(async ({ input }) => { if ( diff --git a/src/server/api/routers/conference/conference.router.ts b/src/server/api/routers/conference/conference.router.ts index dd7166b..50c27aa 100644 --- a/src/server/api/routers/conference/conference.router.ts +++ b/src/server/api/routers/conference/conference.router.ts @@ -1,14 +1,14 @@ -import { archiveConferenceRouter } from "@/server/api/routers/conference/conference-archive.procedure" -import { createConferenceRouter } from "@/server/api/routers/conference/conference-create.procedure" -import { getConferenceRouter } from "@/server/api/routers/conference/conference-get.procedure" -import { getConferencesRouter } from "@/server/api/routers/conference/conference-list.procedure" -import { updateConferenceRouter } from "@/server/api/routers/conference/conference-update.procedure" +import { archiveConferenceProcedure } from "@/server/api/routers/conference/conference-archive.procedure" +import { createConferenceProcedure } from "@/server/api/routers/conference/conference-create.procedure" +import { getConferenceProcedure } from "@/server/api/routers/conference/conference-get.procedure" +import { getConferencesProcedure } from "@/server/api/routers/conference/conference-list.procedure" +import { updateConferenceProcedure } from "@/server/api/routers/conference/conference-update.procedure" import { createTRPCRouter } from "@/server/api/trpc" export const conferenceRouter = createTRPCRouter({ - get: getConferenceRouter, - list: getConferencesRouter, - create: createConferenceRouter, - update: updateConferenceRouter, - archive: archiveConferenceRouter, + get: getConferenceProcedure, + list: getConferencesProcedure, + create: createConferenceProcedure, + update: updateConferenceProcedure, + archive: archiveConferenceProcedure, }) diff --git a/src/server/api/routers/ticket/ticket-archive.procedure.ts b/src/server/api/routers/ticket/ticket-archive.procedure.ts index a986d10..3872999 100644 --- a/src/server/api/routers/ticket/ticket-archive.procedure.ts +++ b/src/server/api/routers/ticket/ticket-archive.procedure.ts @@ -11,7 +11,7 @@ const ArchiveTicketInput = z.object({ id: z.string(), }) -export const archiveTicketRouter = protectedProcedure +export const archiveTicketProcedure = protectedProcedure .input(ArchiveTicketInput) .mutation(async ({ input }) => { // TODO: Check if user is allowed to archive ticket diff --git a/src/server/api/routers/ticket/ticket-check-in.procedure.ts b/src/server/api/routers/ticket/ticket-check-in.procedure.ts index bc8c166..66f0a50 100644 --- a/src/server/api/routers/ticket/ticket-check-in.procedure.ts +++ b/src/server/api/routers/ticket/ticket-check-in.procedure.ts @@ -11,7 +11,7 @@ const CheckInTicketInput = z.object({ id: z.string(), }) -export const checkInTicketRouter = protectedProcedure +export const checkInTicketProcedure = protectedProcedure .input(CheckInTicketInput) .mutation(async ({ input }) => { await sendTicketUpdatedEvent({ id: input.id, state: "checked-in" }) diff --git a/src/server/api/routers/ticket/ticket-create.procedure.ts b/src/server/api/routers/ticket/ticket-create.procedure.ts index 609cda8..b7d725c 100644 --- a/src/server/api/routers/ticket/ticket-create.procedure.ts +++ b/src/server/api/routers/ticket/ticket-create.procedure.ts @@ -13,7 +13,7 @@ const CreateTicketInput = z.object({ quantity: z.number(), }) -export const createTicketRouter = protectedProcedure +export const createTicketProcedure = protectedProcedure .input(CreateTicketInput) .mutation(async ({ ctx, input }) => { // TODO: Check if user is allowed to create ticket diff --git a/src/server/api/routers/ticket/ticket-get.procedure.ts b/src/server/api/routers/ticket/ticket-get.procedure.ts index 922475e..edaa94c 100644 --- a/src/server/api/routers/ticket/ticket-get.procedure.ts +++ b/src/server/api/routers/ticket/ticket-get.procedure.ts @@ -9,7 +9,7 @@ const GetTicketByIdInput = z.object({ id: z.string(), }) -export const getTicketRouter = protectedProcedure +export const getTicketProcedure = protectedProcedure .input(GetTicketByIdInput) .query(async ({ input }) => { const results = await db diff --git a/src/server/api/routers/ticket/ticket-list.procedure.ts b/src/server/api/routers/ticket/ticket-list.procedure.ts index eaf33d7..33086d3 100644 --- a/src/server/api/routers/ticket/ticket-list.procedure.ts +++ b/src/server/api/routers/ticket/ticket-list.procedure.ts @@ -4,7 +4,7 @@ import { db } from "@/database" import { tickets, ticketTransfers } from "@/database/schemas" import { protectedProcedure } from "@/server/api/trpc" -export const getTicketsRouter = protectedProcedure.query(({ ctx }) => { +export const getTicketsProcedure = protectedProcedure.query(({ ctx }) => { const userId = ctx.user.id return db .select({ diff --git a/src/server/api/routers/ticket/ticket-transfer-accept.procedure.ts b/src/server/api/routers/ticket/ticket-transfer-accept.procedure.ts index 649a91d..e138d52 100644 --- a/src/server/api/routers/ticket/ticket-transfer-accept.procedure.ts +++ b/src/server/api/routers/ticket/ticket-transfer-accept.procedure.ts @@ -14,7 +14,7 @@ const AcceptTicketTransferInput = z.object({ transferId: z.string(), }) -export const acceptTicketTransferRouter = protectedProcedure +export const acceptTicketTransferProcedure = protectedProcedure .input(AcceptTicketTransferInput) .mutation(async ({ ctx, input }) => { const userId = ctx.user.id diff --git a/src/server/api/routers/ticket/ticket-transfer-cancel.procedure.ts b/src/server/api/routers/ticket/ticket-transfer-cancel.procedure.ts index 09735f2..8e6b991 100644 --- a/src/server/api/routers/ticket/ticket-transfer-cancel.procedure.ts +++ b/src/server/api/routers/ticket/ticket-transfer-cancel.procedure.ts @@ -11,7 +11,7 @@ const CancelTicketTransferInput = z.object({ transferId: z.string(), }) -export const cancelTicketTransferRouter = protectedProcedure +export const cancelTicketTransferProcedure = protectedProcedure .input(CancelTicketTransferInput) .mutation(async ({ input }) => { const ticketTransfer = await db.query.ticketTransfers.findFirst({ diff --git a/src/server/api/routers/ticket/ticket-transfer-create.procedure.ts b/src/server/api/routers/ticket/ticket-transfer-create.procedure.ts index 25bd457..c30855b 100644 --- a/src/server/api/routers/ticket/ticket-transfer-create.procedure.ts +++ b/src/server/api/routers/ticket/ticket-transfer-create.procedure.ts @@ -15,7 +15,7 @@ const CreateTicketTransferInput = z.object({ ticketId: z.string(), }) -export const createTicketTransferRouter = protectedProcedure +export const createTicketTransferProcedure = protectedProcedure .input(CreateTicketTransferInput) .mutation(async ({ ctx, input }) => { const userId = ctx.user.id diff --git a/src/server/api/routers/ticket/ticket.router.ts b/src/server/api/routers/ticket/ticket.router.ts index 48e518c..a9189ea 100644 --- a/src/server/api/routers/ticket/ticket.router.ts +++ b/src/server/api/routers/ticket/ticket.router.ts @@ -1,20 +1,20 @@ -import { archiveTicketRouter } from "@/server/api/routers/ticket/ticket-archive.procedure" -import { checkInTicketRouter } from "@/server/api/routers/ticket/ticket-check-in.procedure" -import { createTicketRouter } from "@/server/api/routers/ticket/ticket-create.procedure" -import { getTicketRouter } from "@/server/api/routers/ticket/ticket-get.procedure" -import { getTicketsRouter } from "@/server/api/routers/ticket/ticket-list.procedure" -import { acceptTicketTransferRouter } from "@/server/api/routers/ticket/ticket-transfer-accept.procedure" -import { cancelTicketTransferRouter } from "@/server/api/routers/ticket/ticket-transfer-cancel.procedure" -import { createTicketTransferRouter } from "@/server/api/routers/ticket/ticket-transfer-create.procedure" +import { archiveTicketProcedure } from "@/server/api/routers/ticket/ticket-archive.procedure" +import { checkInTicketProcedure } from "@/server/api/routers/ticket/ticket-check-in.procedure" +import { createTicketProcedure } from "@/server/api/routers/ticket/ticket-create.procedure" +import { getTicketProcedure } from "@/server/api/routers/ticket/ticket-get.procedure" +import { getTicketsProcedure } from "@/server/api/routers/ticket/ticket-list.procedure" +import { acceptTicketTransferProcedure } from "@/server/api/routers/ticket/ticket-transfer-accept.procedure" +import { cancelTicketTransferProcedure } from "@/server/api/routers/ticket/ticket-transfer-cancel.procedure" +import { createTicketTransferProcedure } from "@/server/api/routers/ticket/ticket-transfer-create.procedure" import { createTRPCRouter } from "@/server/api/trpc" export default createTRPCRouter({ - get: getTicketRouter, - list: getTicketsRouter, - create: createTicketRouter, - checkIn: checkInTicketRouter, - archive: archiveTicketRouter, - createTransfer: createTicketTransferRouter, - cancelTransfer: cancelTicketTransferRouter, - acceptTransfer: acceptTicketTransferRouter, + get: getTicketProcedure, + list: getTicketsProcedure, + create: createTicketProcedure, + checkIn: checkInTicketProcedure, + archive: archiveTicketProcedure, + createTransfer: createTicketTransferProcedure, + cancelTransfer: cancelTicketTransferProcedure, + acceptTransfer: acceptTicketTransferProcedure, })