Skip to content

Commit a05b4ee

Browse files
ShantKhatriShantKhatri
authored
Merge branch 'Dev-Card:main' into main
2 parents 4f26f5e + f819079 commit a05b4ee

23 files changed

Lines changed: 1683 additions & 547 deletions

File tree

‎.env.example‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,7 @@ MOBILE_REDIRECT_URI=devcard://oauth/callback
3232

3333
# ─── Server ───
3434
PORT=3000
35-
NODE_ENV=development
35+
NODE_ENV=development
36+
37+
# ─── Refresh Token Cleanup ───
38+
REFRESH_TOKEN_CLEANUP_INTERVAL_MS=86400000

‎.github/pull_request_template.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ Closes #
4343

4444
## Checklist
4545

46-
- [ ] My code follows the project's coding style (`pnpm -r run lint` passes).
47-
- [ ] TypeScript compiles without errors (`pnpm -r run typecheck`).
46+
- [ ] My code follows the project's coding style (`npm run lint` passes).
47+
- [ ] TypeScript compiles without errors (`npm run typecheck --workspaces --if-present`).
4848
- [ ] I have added or updated tests for the changes I made.
49-
- [ ] All tests pass locally (`pnpm -r run test`).
49+
- [ ] All tests pass locally (`npm run test --workspaces --if-present`).
5050
- [ ] I have updated documentation where necessary.
5151
- [ ] No new `console.log` or debug statements left in the code.
5252
- [ ] Breaking changes are documented in this PR description.

‎apps/backend/prisma/migrations/20260312125106_init/migration.sql‎

Lines changed: 0 additions & 99 deletions
This file was deleted.

‎apps/backend/prisma/migrations/20260312162249_analytics_models/migration.sql‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎apps/backend/prisma/migrations/20260617074743_refresh_token_cleanup_indexes/migration.sql‎

Lines changed: 168 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
/*
2+
Warnings:
3+
4+
- You are about to drop the column `provider` on the `users` table. All the data in the column will be lost.
5+
- You are about to drop the column `provider_id` on the `users` table. All the data in the column will be lost.
6+
- A unique constraint covering the columns `[phone_number]` on the table `users` will be added. If there are existing duplicate values, this will fail.
7+
8+
*/
9+
-- CreateEnum
10+
CREATE TYPE "Role" AS ENUM ('SUPERADMIN', 'ADMIN', 'USER');
11+
12+
-- CreateEnum
13+
CREATE TYPE "TeamRole" AS ENUM ('OWNER', 'ADMIN', 'MEMBER');
14+
15+
-- DropIndex
16+
DROP INDEX "users_provider_provider_id_key";
17+
18+
-- AlterTable
19+
ALTER TABLE "users" DROP COLUMN "provider",
20+
DROP COLUMN "provider_id",
21+
ADD COLUMN "authRole" "Role" NOT NULL DEFAULT 'USER',
22+
ADD COLUMN "email_verified" BOOLEAN NOT NULL DEFAULT false,
23+
ADD COLUMN "isActive" BOOLEAN NOT NULL DEFAULT false,
24+
ADD COLUMN "last_sign_in_at" TIMESTAMP(3),
25+
ADD COLUMN "phone_number" TEXT;
26+
27+
-- CreateTable
28+
CREATE TABLE "user_identities" (
29+
"id" TEXT NOT NULL,
30+
"user_id" TEXT NOT NULL,
31+
"provider" TEXT NOT NULL,
32+
"provider_id" TEXT NOT NULL,
33+
"created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
34+
35+
CONSTRAINT "user_identities_pkey" PRIMARY KEY ("id")
36+
);
37+
38+
-- CreateTable
39+
CREATE TABLE "refresh_tokens" (
40+
"id" TEXT NOT NULL,
41+
"user_id" TEXT NOT NULL,
42+
"token_hash" TEXT NOT NULL,
43+
"family" TEXT NOT NULL,
44+
"expires_at" TIMESTAMP(3) NOT NULL,
45+
"revoked_at" TIMESTAMP(3),
46+
"created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
47+
"user_agent" TEXT,
48+
"ip" TEXT,
49+
50+
CONSTRAINT "refresh_tokens_pkey" PRIMARY KEY ("id")
51+
);
52+
53+
-- CreateTable
54+
CREATE TABLE "Event" (
55+
"id" TEXT NOT NULL,
56+
"name" TEXT NOT NULL,
57+
"slug" TEXT NOT NULL,
58+
"location" TEXT NOT NULL,
59+
"description" TEXT,
60+
"organizerId" TEXT NOT NULL,
61+
"startDate" TIMESTAMP(3) NOT NULL,
62+
"endDate" TIMESTAMP(3) NOT NULL,
63+
"isPublic" BOOLEAN NOT NULL DEFAULT true,
64+
"created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
65+
66+
CONSTRAINT "Event_pkey" PRIMARY KEY ("id")
67+
);
68+
69+
-- CreateTable
70+
CREATE TABLE "EventAttendee" (
71+
"id" TEXT NOT NULL,
72+
"userId" TEXT NOT NULL,
73+
"eventId" TEXT NOT NULL,
74+
"joinedAt" TIMESTAMP(3) NOT NULL,
75+
76+
CONSTRAINT "EventAttendee_pkey" PRIMARY KEY ("id")
77+
);
78+
79+
-- CreateTable
80+
CREATE TABLE "teams" (
81+
"id" TEXT NOT NULL,
82+
"name" TEXT NOT NULL,
83+
"slug" TEXT NOT NULL,
84+
"description" TEXT,
85+
"avatarUrl" TEXT,
86+
"ownerId" TEXT NOT NULL,
87+
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
88+
"updatedAt" TIMESTAMP(3) NOT NULL,
89+
90+
CONSTRAINT "teams_pkey" PRIMARY KEY ("id")
91+
);
92+
93+
-- CreateTable
94+
CREATE TABLE "team_members" (
95+
"id" TEXT NOT NULL,
96+
"teamId" TEXT NOT NULL,
97+
"userId" TEXT NOT NULL,
98+
"role" "TeamRole" NOT NULL,
99+
"joinedAt" TIMESTAMP(3) NOT NULL,
100+
101+
CONSTRAINT "team_members_pkey" PRIMARY KEY ("id")
102+
);
103+
104+
-- CreateIndex
105+
CREATE INDEX "user_identities_user_id_idx" ON "user_identities"("user_id");
106+
107+
-- CreateIndex
108+
CREATE UNIQUE INDEX "user_identities_provider_provider_id_key" ON "user_identities"("provider", "provider_id");
109+
110+
-- CreateIndex
111+
CREATE UNIQUE INDEX "refresh_tokens_token_hash_key" ON "refresh_tokens"("token_hash");
112+
113+
-- CreateIndex
114+
CREATE INDEX "refresh_tokens_user_id_idx" ON "refresh_tokens"("user_id");
115+
116+
-- CreateIndex
117+
CREATE INDEX "refresh_tokens_family_idx" ON "refresh_tokens"("family");
118+
119+
-- CreateIndex
120+
CREATE INDEX "refresh_tokens_expires_at_idx" ON "refresh_tokens"("expires_at");
121+
122+
-- CreateIndex
123+
CREATE INDEX "refresh_tokens_revoked_at_idx" ON "refresh_tokens"("revoked_at");
124+
125+
-- CreateIndex
126+
CREATE UNIQUE INDEX "Event_slug_key" ON "Event"("slug");
127+
128+
-- CreateIndex
129+
CREATE UNIQUE INDEX "EventAttendee_userId_eventId_key" ON "EventAttendee"("userId", "eventId");
130+
131+
-- CreateIndex
132+
CREATE UNIQUE INDEX "teams_slug_key" ON "teams"("slug");
133+
134+
-- CreateIndex
135+
CREATE INDEX "teams_slug_idx" ON "teams"("slug");
136+
137+
-- CreateIndex
138+
CREATE INDEX "team_members_userId_idx" ON "team_members"("userId");
139+
140+
-- CreateIndex
141+
CREATE UNIQUE INDEX "team_members_userId_teamId_key" ON "team_members"("userId", "teamId");
142+
143+
-- CreateIndex
144+
CREATE UNIQUE INDEX "users_phone_number_key" ON "users"("phone_number");
145+
146+
-- AddForeignKey
147+
ALTER TABLE "user_identities" ADD CONSTRAINT "user_identities_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
148+
149+
-- AddForeignKey
150+
ALTER TABLE "refresh_tokens" ADD CONSTRAINT "refresh_tokens_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
151+
152+
-- AddForeignKey
153+
ALTER TABLE "Event" ADD CONSTRAINT "Event_organizerId_fkey" FOREIGN KEY ("organizerId") REFERENCES "users"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
154+
155+
-- AddForeignKey
156+
ALTER TABLE "EventAttendee" ADD CONSTRAINT "EventAttendee_eventId_fkey" FOREIGN KEY ("eventId") REFERENCES "Event"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
157+
158+
-- AddForeignKey
159+
ALTER TABLE "EventAttendee" ADD CONSTRAINT "EventAttendee_userId_fkey" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
160+
161+
-- AddForeignKey
162+
ALTER TABLE "teams" ADD CONSTRAINT "teams_ownerId_fkey" FOREIGN KEY ("ownerId") REFERENCES "users"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
163+
164+
-- AddForeignKey
165+
ALTER TABLE "team_members" ADD CONSTRAINT "team_members_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "teams"("id") ON DELETE CASCADE ON UPDATE CASCADE;
166+
167+
-- AddForeignKey
168+
ALTER TABLE "team_members" ADD CONSTRAINT "team_members_userId_fkey" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

0 commit comments

Comments
 (0)