Skip to content

Commit 4d9daf9

Browse files
authored
Merge branch 'develop' into #1982-AlexPark-Credits
2 parents 5940cff + 941a608 commit 4d9daf9

59 files changed

Lines changed: 850 additions & 216 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/backend/src/controllers/projects.controllers.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,17 @@ export default class ProjectsController {
243243
}
244244
}
245245

246+
static async deleteUnit(req: Request, res: Response, next: NextFunction) {
247+
try {
248+
const user: User = await getCurrentUser(res);
249+
const { unitName } = req.params;
250+
const deletedUnit = await ProjectsService.deleteUnit(user, unitName);
251+
res.status(200).json(deletedUnit);
252+
} catch (error: unknown) {
253+
next(error);
254+
}
255+
}
256+
246257
static async getAllManufacturers(req: Request, res: Response, next: NextFunction) {
247258
try {
248259
const user = await getCurrentUser(res);
@@ -381,4 +392,16 @@ export default class ProjectsController {
381392
next(error);
382393
}
383394
}
395+
396+
static async editLinkType(req: Request, res: Response, next: NextFunction) {
397+
try {
398+
const { linkTypeId } = req.params;
399+
const { iconName, required } = req.body;
400+
const submitter = await getCurrentUser(res);
401+
const linkTypeUpdated = await ProjectsService.editLinkType(linkTypeId, iconName, required, submitter);
402+
res.status(200).json(linkTypeUpdated);
403+
} catch (error: unknown) {
404+
next(error);
405+
}
406+
}
384407
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- AlterTable
2+
ALTER TABLE "Material" ALTER COLUMN "quantity" SET DATA TYPE DECIMAL(65,30);
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-- AlterTable
2+
ALTER TABLE "Expense_Type" ADD COLUMN "dateDeleted" TIMESTAMP(3);
3+
4+
-- AlterTable
5+
ALTER TABLE "Vendor" ADD COLUMN "dateDeleted" TIMESTAMP(3);
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- AlterEnum
2+
ALTER TYPE "Work_Package_Stage" ADD VALUE 'TESTING';
Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
-- CreateEnum
2+
CREATE TYPE "Design_Review_Status" AS ENUM ('UNCONFIRMED', 'CONFIRMED', 'SCHEDULED', 'DONE');
3+
4+
-- CreateTable
5+
CREATE TABLE "TeamType" (
6+
"teamTypeId" TEXT NOT NULL,
7+
"name" TEXT NOT NULL,
8+
9+
CONSTRAINT "TeamType_pkey" PRIMARY KEY ("teamTypeId")
10+
);
11+
12+
-- CreateTable
13+
CREATE TABLE "Design_Review" (
14+
"designReviewId" TEXT NOT NULL,
15+
"dateScheduled" DATE NOT NULL,
16+
"meetingTimes" INTEGER[],
17+
"dateCreated" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
18+
"userCreatedId" INTEGER NOT NULL,
19+
"status" "Design_Review_Status" NOT NULL,
20+
"teamTypeId" TEXT NOT NULL,
21+
"location" TEXT,
22+
"isOnline" BOOLEAN NOT NULL,
23+
"isInPerson" BOOLEAN NOT NULL,
24+
"zoomLink" TEXT,
25+
"dateDeleted" TIMESTAMP(3),
26+
"userDeletedId" INTEGER,
27+
"docTemplateLink" TEXT,
28+
"wbsElementId" INTEGER NOT NULL,
29+
30+
CONSTRAINT "Design_Review_pkey" PRIMARY KEY ("designReviewId")
31+
);
32+
33+
-- CreateTable
34+
CREATE TABLE "Schedule_Settings" (
35+
"drScheduleSettingsId" TEXT NOT NULL,
36+
"personalGmail" TEXT NOT NULL,
37+
"personalZoomLink" TEXT NOT NULL,
38+
"availability" INTEGER[],
39+
"userId" INTEGER NOT NULL,
40+
41+
CONSTRAINT "Schedule_Settings_pkey" PRIMARY KEY ("drScheduleSettingsId")
42+
);
43+
44+
-- CreateTable
45+
CREATE TABLE "Meeting" (
46+
"meetingId" TEXT NOT NULL,
47+
"title" TEXT NOT NULL,
48+
"meetingTimes" INTEGER[],
49+
"teamId" TEXT NOT NULL,
50+
51+
CONSTRAINT "Meeting_pkey" PRIMARY KEY ("meetingId")
52+
);
53+
54+
-- CreateTable
55+
CREATE TABLE "_requiredAttendee" (
56+
"A" TEXT NOT NULL,
57+
"B" INTEGER NOT NULL
58+
);
59+
60+
-- CreateTable
61+
CREATE TABLE "_optionalAttendee" (
62+
"A" TEXT NOT NULL,
63+
"B" INTEGER NOT NULL
64+
);
65+
66+
-- CreateTable
67+
CREATE TABLE "_confirmedAttendee" (
68+
"A" TEXT NOT NULL,
69+
"B" INTEGER NOT NULL
70+
);
71+
72+
-- CreateTable
73+
CREATE TABLE "_deniedAttendee" (
74+
"A" TEXT NOT NULL,
75+
"B" INTEGER NOT NULL
76+
);
77+
78+
-- CreateTable
79+
CREATE TABLE "_userAttended" (
80+
"A" TEXT NOT NULL,
81+
"B" INTEGER NOT NULL
82+
);
83+
84+
-- CreateIndex
85+
CREATE UNIQUE INDEX "TeamType_name_key" ON "TeamType"("name");
86+
87+
-- CreateIndex
88+
CREATE UNIQUE INDEX "Schedule_Settings_userId_key" ON "Schedule_Settings"("userId");
89+
90+
-- CreateIndex
91+
CREATE UNIQUE INDEX "_requiredAttendee_AB_unique" ON "_requiredAttendee"("A", "B");
92+
93+
-- CreateIndex
94+
CREATE INDEX "_requiredAttendee_B_index" ON "_requiredAttendee"("B");
95+
96+
-- CreateIndex
97+
CREATE UNIQUE INDEX "_optionalAttendee_AB_unique" ON "_optionalAttendee"("A", "B");
98+
99+
-- CreateIndex
100+
CREATE INDEX "_optionalAttendee_B_index" ON "_optionalAttendee"("B");
101+
102+
-- CreateIndex
103+
CREATE UNIQUE INDEX "_confirmedAttendee_AB_unique" ON "_confirmedAttendee"("A", "B");
104+
105+
-- CreateIndex
106+
CREATE INDEX "_confirmedAttendee_B_index" ON "_confirmedAttendee"("B");
107+
108+
-- CreateIndex
109+
CREATE UNIQUE INDEX "_deniedAttendee_AB_unique" ON "_deniedAttendee"("A", "B");
110+
111+
-- CreateIndex
112+
CREATE INDEX "_deniedAttendee_B_index" ON "_deniedAttendee"("B");
113+
114+
-- CreateIndex
115+
CREATE UNIQUE INDEX "_userAttended_AB_unique" ON "_userAttended"("A", "B");
116+
117+
-- CreateIndex
118+
CREATE INDEX "_userAttended_B_index" ON "_userAttended"("B");
119+
120+
-- AddForeignKey
121+
ALTER TABLE "Design_Review" ADD CONSTRAINT "Design_Review_userCreatedId_fkey" FOREIGN KEY ("userCreatedId") REFERENCES "User"("userId") ON DELETE RESTRICT ON UPDATE CASCADE;
122+
123+
-- AddForeignKey
124+
ALTER TABLE "Design_Review" ADD CONSTRAINT "Design_Review_teamTypeId_fkey" FOREIGN KEY ("teamTypeId") REFERENCES "TeamType"("teamTypeId") ON DELETE RESTRICT ON UPDATE CASCADE;
125+
126+
-- AddForeignKey
127+
ALTER TABLE "Design_Review" ADD CONSTRAINT "Design_Review_userDeletedId_fkey" FOREIGN KEY ("userDeletedId") REFERENCES "User"("userId") ON DELETE SET NULL ON UPDATE CASCADE;
128+
129+
-- AddForeignKey
130+
ALTER TABLE "Design_Review" ADD CONSTRAINT "Design_Review_wbsElementId_fkey" FOREIGN KEY ("wbsElementId") REFERENCES "WBS_Element"("wbsElementId") ON DELETE RESTRICT ON UPDATE CASCADE;
131+
132+
-- AddForeignKey
133+
ALTER TABLE "Schedule_Settings" ADD CONSTRAINT "Schedule_Settings_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("userId") ON DELETE RESTRICT ON UPDATE CASCADE;
134+
135+
-- AddForeignKey
136+
ALTER TABLE "Meeting" ADD CONSTRAINT "Meeting_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team"("teamId") ON DELETE RESTRICT ON UPDATE CASCADE;
137+
138+
-- AddForeignKey
139+
ALTER TABLE "_requiredAttendee" ADD CONSTRAINT "_requiredAttendee_A_fkey" FOREIGN KEY ("A") REFERENCES "Design_Review"("designReviewId") ON DELETE CASCADE ON UPDATE CASCADE;
140+
141+
-- AddForeignKey
142+
ALTER TABLE "_requiredAttendee" ADD CONSTRAINT "_requiredAttendee_B_fkey" FOREIGN KEY ("B") REFERENCES "User"("userId") ON DELETE CASCADE ON UPDATE CASCADE;
143+
144+
-- AddForeignKey
145+
ALTER TABLE "_optionalAttendee" ADD CONSTRAINT "_optionalAttendee_A_fkey" FOREIGN KEY ("A") REFERENCES "Design_Review"("designReviewId") ON DELETE CASCADE ON UPDATE CASCADE;
146+
147+
-- AddForeignKey
148+
ALTER TABLE "_optionalAttendee" ADD CONSTRAINT "_optionalAttendee_B_fkey" FOREIGN KEY ("B") REFERENCES "User"("userId") ON DELETE CASCADE ON UPDATE CASCADE;
149+
150+
-- AddForeignKey
151+
ALTER TABLE "_confirmedAttendee" ADD CONSTRAINT "_confirmedAttendee_A_fkey" FOREIGN KEY ("A") REFERENCES "Design_Review"("designReviewId") ON DELETE CASCADE ON UPDATE CASCADE;
152+
153+
-- AddForeignKey
154+
ALTER TABLE "_confirmedAttendee" ADD CONSTRAINT "_confirmedAttendee_B_fkey" FOREIGN KEY ("B") REFERENCES "User"("userId") ON DELETE CASCADE ON UPDATE CASCADE;
155+
156+
-- AddForeignKey
157+
ALTER TABLE "_deniedAttendee" ADD CONSTRAINT "_deniedAttendee_A_fkey" FOREIGN KEY ("A") REFERENCES "Design_Review"("designReviewId") ON DELETE CASCADE ON UPDATE CASCADE;
158+
159+
-- AddForeignKey
160+
ALTER TABLE "_deniedAttendee" ADD CONSTRAINT "_deniedAttendee_B_fkey" FOREIGN KEY ("B") REFERENCES "User"("userId") ON DELETE CASCADE ON UPDATE CASCADE;
161+
162+
-- AddForeignKey
163+
ALTER TABLE "_userAttended" ADD CONSTRAINT "_userAttended_A_fkey" FOREIGN KEY ("A") REFERENCES "Design_Review"("designReviewId") ON DELETE CASCADE ON UPDATE CASCADE;
164+
165+
-- AddForeignKey
166+
ALTER TABLE "_userAttended" ADD CONSTRAINT "_userAttended_B_fkey" FOREIGN KEY ("B") REFERENCES "User"("userId") ON DELETE CASCADE ON UPDATE CASCADE;

0 commit comments

Comments
 (0)