Skip to content

Commit afe126b

Browse files
authored
Merge pull request #3897 from Northeastern-Electric-Racing/#3896-guest-page-schema-changes
#3896 added term_definition and sponsor logoImageId to schema
2 parents c805630 + 5b34360 commit afe126b

4 files changed

Lines changed: 58 additions & 2 deletions

File tree

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
-- AlterTable
2+
ALTER TABLE "Sponsor" ADD COLUMN "logoImageId" TEXT;
3+
4+
-- CreateTable
5+
CREATE TABLE "Guest_Definition" (
6+
"definitionId" TEXT NOT NULL,
7+
"term" TEXT NOT NULL,
8+
"description" TEXT NOT NULL,
9+
"order" INTEGER NOT NULL,
10+
"buttonText" TEXT,
11+
"buttonLink" TEXT,
12+
"icon" TEXT,
13+
"dateCreated" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
14+
"dateDeleted" TIMESTAMP(3),
15+
"userDeletedId" TEXT,
16+
"userCreatedId" TEXT NOT NULL,
17+
"organizationId" TEXT NOT NULL,
18+
19+
CONSTRAINT "Guest_Definition_pkey" PRIMARY KEY ("definitionId")
20+
);
21+
22+
-- CreateIndex
23+
CREATE INDEX "Guest_Definition_organizationId_idx" ON "Guest_Definition"("organizationId");
24+
25+
-- AddForeignKey
26+
ALTER TABLE "Guest_Definition" ADD CONSTRAINT "Guest_Definition_userDeletedId_fkey" FOREIGN KEY ("userDeletedId") REFERENCES "User"("userId") ON DELETE SET NULL ON UPDATE CASCADE;
27+
28+
-- AddForeignKey
29+
ALTER TABLE "Guest_Definition" ADD CONSTRAINT "Guest_Definition_userCreatedId_fkey" FOREIGN KEY ("userCreatedId") REFERENCES "User"("userId") ON DELETE RESTRICT ON UPDATE CASCADE;
30+
31+
-- AddForeignKey
32+
ALTER TABLE "Guest_Definition" ADD CONSTRAINT "Guest_Definition_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("organizationId") ON DELETE RESTRICT ON UPDATE CASCADE;

src/backend/src/prisma/schema.prisma

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@ model User {
266266
deletedSponsorTiers Sponsor_Tier[]
267267
financeDelegateForOrganizations Organization[] @relation(name: "financeDelegates")
268268
assignedReimbursementRequests Reimbursement_Request[] @relation(name: "reimbursementRequestAssignee")
269+
deletedGuestDefinitions Guest_Definition[] @relation(name: "guestDefinitionDeleter")
270+
createdGuestDefinitions Guest_Definition[] @relation(name: "guestDefinitionCreator")
269271
}
270272

271273
model Role {
@@ -797,6 +799,7 @@ model Sponsor {
797799
taxExempt Boolean
798800
sponsorNotes String?
799801
sponsorTasks Sponsor_Task[]
802+
logoImageId String?
800803
801804
@@unique([name, organizationId], name: "uniqueSponsor")
802805
@@index([sponsorTierId])
@@ -1219,6 +1222,7 @@ model Organization {
12191222
sponsorTiers Sponsor_Tier[]
12201223
indexCodes Index_Code[]
12211224
financeDelegates User[] @relation(name: "financeDelegates")
1225+
guestDefinitions Guest_Definition[]
12221226
}
12231227

12241228
model FrequentlyAskedQuestion {
@@ -1556,3 +1560,23 @@ model Reimbursement_Request_Comment {
15561560
15571561
@@index([reimbursementRequestId])
15581562
}
1563+
1564+
model Guest_Definition {
1565+
definitionId String @id @default(uuid())
1566+
term String
1567+
description String
1568+
order Int
1569+
buttonText String?
1570+
buttonLink String?
1571+
icon String?
1572+
dateCreated DateTime @default(now())
1573+
dateDeleted DateTime?
1574+
userDeleted User? @relation(fields: [userDeletedId], references: [userId], name: "guestDefinitionDeleter")
1575+
userDeletedId String?
1576+
userCreated User @relation(fields: [userCreatedId], references: [userId], name: "guestDefinitionCreator")
1577+
userCreatedId String
1578+
organization Organization @relation(fields: [organizationId], references: [organizationId])
1579+
organizationId String
1580+
1581+
@@index([organizationId])
1582+
}

src/backend/tests/unit/team-type.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ describe('Team Type Tests', () => {
5959
organization
6060
);
6161

62-
expect(result).toEqual({
62+
expect(result).toMatchObject({
6363
name: 'teamType3',
6464
iconName: 'YouTubeIcon',
6565
organizationId: orgId,

src/backend/tests/unmocked/team-type.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ describe('Team Type Tests', () => {
7777
organization
7878
);
7979

80-
expect(result).toEqual({
80+
expect(result).toMatchObject({
8181
name: 'teamType3',
8282
iconName: 'YouTubeIcon',
8383
description: '',

0 commit comments

Comments
 (0)