From 9f3e460da85fd7df8d38aef60f5ebc0554925271 Mon Sep 17 00:00:00 2001 From: sama-004 <70210929+Sama-004@users.noreply.github.com> Date: Wed, 18 Sep 2024 14:35:09 +0530 Subject: [PATCH] fix: removed ts ingore from route.ts --- bun.lockb | Bin 329919 -> 329919 bytes db/db.ts | 4 ++ package.json | 3 +- src/app/api/room/[roomId]/leave/route.ts | 1 - .../api/room/[roomId]/notifications/route.ts | 12 ---- src/app/api/room/[roomId]/route.ts | 1 - src/app/api/room/create/route.ts | 67 +++++++++--------- src/app/api/room/invite/[invitecode]/route.ts | 55 +++++++------- src/app/api/room/join/route.ts | 55 +++++++------- src/app/api/room/joined/route.ts | 1 - src/app/api/verify/route.ts | 1 - tsconfig.json | 2 +- 12 files changed, 97 insertions(+), 105 deletions(-) diff --git a/bun.lockb b/bun.lockb index 75053a92500ae81a6726ba6671836ff6c31c58ab..68dfbffeb73d483d10accaf9c8f8e3a4c5df2a17 100755 GIT binary patch delta 430 zcmdl#QDpx_k%kt=DNHW)>7fj8Ai%_w0OB+=F)-*rMQ?U{iqlZ69&8PbEx}_)JxzUw b$6~0x{AfYleu0q*h?#+yW%~t2*7s}xJ}o?^ delta 430 zcmdl#QDpx_k%kt=DNHW)_6ZDd@PLu248&n#Wnj>TirzeJnngpgdayM#wgitI^)&Sz c9*d#&@}mWH`vpcOAZ7+)mhBf9S>Lk(0P[0] +>[0]; + if (process.env.NODE_ENV !== 'production') globalThis.prismaGlobal = prisma; diff --git a/package.json b/package.json index 526334c..1125fdb 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "build": "next build", "vercel-build": "npx prisma generate && next build", "start": "next start", - "lint": "next lint" + "lint": "next lint", + "type-check":"tsc --noEmit --watch" }, "dependencies": { "@next-auth/prisma-adapter": "^1.0.7", diff --git a/src/app/api/room/[roomId]/leave/route.ts b/src/app/api/room/[roomId]/leave/route.ts index 9b236fa..809b034 100644 --- a/src/app/api/room/[roomId]/leave/route.ts +++ b/src/app/api/room/[roomId]/leave/route.ts @@ -1,4 +1,3 @@ -// @ts-nocheck import { getServerSession } from 'next-auth'; import { authOptions } from '../../../../../../lib/auth'; import prisma from '../../../../../../db/db'; diff --git a/src/app/api/room/[roomId]/notifications/route.ts b/src/app/api/room/[roomId]/notifications/route.ts index 3593968..ff1a721 100644 --- a/src/app/api/room/[roomId]/notifications/route.ts +++ b/src/app/api/room/[roomId]/notifications/route.ts @@ -1,4 +1,3 @@ -// @ts-nocheck import prisma from '../../../../../../db/db'; import { NextResponse } from 'next/server'; @@ -12,17 +11,6 @@ export async function GET( const room = await prisma.room.findUnique({ where: { id: roomId }, include: { notifications: { orderBy: { createdAt: 'desc' } } }, - // include: { - // notifications: { - // select: { - // id: true, - // message: true, - // createdAt: true, - // color: true, - // }, - // orderBy: { createdAt: "desc" }, - // }, - // }, }); if (!room) { diff --git a/src/app/api/room/[roomId]/route.ts b/src/app/api/room/[roomId]/route.ts index a71a070..1aa54de 100644 --- a/src/app/api/room/[roomId]/route.ts +++ b/src/app/api/room/[roomId]/route.ts @@ -1,4 +1,3 @@ -// @ts-nocheck import { NextResponse } from 'next/server'; import { authOptions } from '../../../../../lib/auth'; import { getServerSession } from 'next-auth'; diff --git a/src/app/api/room/create/route.ts b/src/app/api/room/create/route.ts index a13a7f7..b74decb 100644 --- a/src/app/api/room/create/route.ts +++ b/src/app/api/room/create/route.ts @@ -1,6 +1,5 @@ -// @ts-nocheck import { NextResponse } from 'next/server'; -import prisma from '../../../../../db/db'; +import prisma, { PrismaTransactionalClient } from '../../../../../db/db'; import { getServerSession } from 'next-auth'; import { authOptions } from '../../../../../lib/auth'; import { GenerateRoomCode } from '../../../../../lib/roomCode'; @@ -21,42 +20,44 @@ export async function POST(req: Request, res: Response) { const roomCode: string = await GenerateRoomCode(); - const newRoom = await prisma.$transaction(async (prisma) => { - const newRoom = await prisma.room.create({ - data: { - name: roomName, - code: roomCode, - creator: { - connect: { id: session.user.id }, - }, - participants: { - create: { - user: { - connect: { id: session.user.id }, + const newRoom = await prisma.$transaction( + async (prisma: PrismaTransactionalClient) => { + const newRoom = await prisma.room.create({ + data: { + name: roomName, + code: roomCode, + creator: { + connect: { id: session.user.id }, + }, + participants: { + create: { + user: { + connect: { id: session.user.id }, + }, }, }, }, - }, - include: { - creator: true, - participants: { - include: { - user: true, + include: { + creator: true, + participants: { + include: { + user: true, + }, }, }, - }, - }); - await prisma.notification.create({ - data: { - roomId: newRoom.id, - message: `${ - session.user.leetCodeUsername || 'A new user' - } created the room ${roomName}`, - color: 'blue', - }, - }); - return newRoom; - }); + }); + await prisma.notification.create({ + data: { + roomId: newRoom.id, + message: `${ + session.user.leetCodeUsername || 'A new user' + } created the room ${roomName}`, + color: 'blue', + }, + }); + return newRoom; + }, + ); return NextResponse.json(newRoom, { status: 200 }); } catch (err) { diff --git a/src/app/api/room/invite/[invitecode]/route.ts b/src/app/api/room/invite/[invitecode]/route.ts index e8da8de..03916f5 100644 --- a/src/app/api/room/invite/[invitecode]/route.ts +++ b/src/app/api/room/invite/[invitecode]/route.ts @@ -1,8 +1,7 @@ -// @ts-nocheck import { getServerSession } from 'next-auth'; import { authOptions } from '../../../../../../lib/auth'; import { NextResponse } from 'next/server'; -import prisma from '../../../../../../db/db'; +import prisma, { PrismaTransactionalClient } from '../../../../../../db/db'; export async function GET( req: Request, @@ -49,37 +48,39 @@ export async function GET( ); } - const updatedRoom = await prisma.$transaction(async (prisma) => { - const updatedRoom = await prisma.room.update({ - where: { id: room.id }, - data: { - participants: { - create: { - userId: session.user.id, + const updatedRoom = await prisma.$transaction( + async (prisma: PrismaTransactionalClient) => { + const updatedRoom = await prisma.room.update({ + where: { id: room.id }, + data: { + participants: { + create: { + userId: session.user.id, + }, }, }, - }, - include: { - participants: { - include: { - user: true, + include: { + participants: { + include: { + user: true, + }, }, }, - }, - }); + }); - await prisma.notification.create({ - data: { - roomId: room.id, - message: `${ - session.user.leetCodeUsername || 'A new user' - } joined the room`, - color: 'join', - }, - }); + await prisma.notification.create({ + data: { + roomId: room.id, + message: `${ + session.user.leetCodeUsername || 'A new user' + } joined the room`, + color: 'join', + }, + }); - return updatedRoom; - }); + return updatedRoom; + }, + ); return NextResponse.json( { message: 'Room joined successfully', roomId: room.id, success: true }, diff --git a/src/app/api/room/join/route.ts b/src/app/api/room/join/route.ts index ec9b6e5..635e738 100644 --- a/src/app/api/room/join/route.ts +++ b/src/app/api/room/join/route.ts @@ -1,8 +1,7 @@ -// @ts-nocheck import { NextResponse } from 'next/server'; import { authOptions } from '../../../../../lib/auth'; import { getServerSession } from 'next-auth'; -import prisma from '../../../../../db/db'; +import prisma, { PrismaTransactionalClient } from '../../../../../db/db'; export async function POST(req: Request, res: Response) { const session = await getServerSession(authOptions); @@ -38,36 +37,38 @@ export async function POST(req: Request, res: Response) { ); } - const updatedRoom = await prisma.$transaction(async (prisma) => { - const updatedRoom = await prisma.room.update({ - where: { id: room.id }, - data: { - participants: { - create: { - userId: session.user.id, + const updatedRoom = await prisma.$transaction( + async (prisma: PrismaTransactionalClient) => { + const updatedRoom = await prisma.room.update({ + where: { id: room.id }, + data: { + participants: { + create: { + userId: session.user.id, + }, }, }, - }, - include: { - participants: { - include: { - user: true, + include: { + participants: { + include: { + user: true, + }, }, }, - }, - }); + }); - await prisma.notification.create({ - data: { - roomId: room.id, - color: 'join', - message: `${ - session.user.leetCodeUsername || 'A new user' - } joined the room`, - }, - }); - return updatedRoom; - }); + await prisma.notification.create({ + data: { + roomId: room.id, + color: 'join', + message: `${ + session.user.leetCodeUsername || 'A new user' + } joined the room`, + }, + }); + return updatedRoom; + }, + ); return NextResponse.json(updatedRoom, { status: 200 }); } catch (err) { diff --git a/src/app/api/room/joined/route.ts b/src/app/api/room/joined/route.ts index ce46f91..52be450 100644 --- a/src/app/api/room/joined/route.ts +++ b/src/app/api/room/joined/route.ts @@ -1,4 +1,3 @@ -// @ts-nocheck import { getServerSession } from 'next-auth'; import { authOptions } from '../../../../../lib/auth'; import { NextResponse } from 'next/server'; diff --git a/src/app/api/verify/route.ts b/src/app/api/verify/route.ts index 2cde1cd..39e24ee 100644 --- a/src/app/api/verify/route.ts +++ b/src/app/api/verify/route.ts @@ -1,4 +1,3 @@ -// @ts-nocheck import axios from 'axios'; import prisma from '../../../../db/db'; import { NextResponse } from 'next/server'; diff --git a/tsconfig.json b/tsconfig.json index 7b28589..9bb90ae 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,7 +7,7 @@ "noEmit": true, "esModuleInterop": true, "module": "esnext", - "moduleResolution": "bundler", + "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, "jsx": "preserve",