search both dbs

swat-sccs · Apr 29, 2024 · dc1b3ef · dc1b3ef
1 parent d263a15
commit dc1b3ef
Show file tree

Hide file tree

Showing 6 changed files with 259 additions and 142 deletions.
diff --git a/app/actions.tsx b/app/actions.tsx
@@ -127,6 +127,10 @@ export async function submitData(prevState: {
             showProfile: formData.get("showProfile"),
         };
 
+        //@ts-ignore
+        const itsRecord: any[] = await queryDb(`SELECT GRAD_YEAR, DORM, DORM_ROOM \
+            FROM student_data WHERE USER_ID='${id}' `);
+
         await prisma.studentOverlay.upsert({
             where: {
                 uid: id,
@@ -146,6 +150,9 @@ export async function submitData(prevState: {
                 lastName: rawFormData.lastName,
                 pronouns: rawFormData.pronouns,
                 photoPath: photo_path,
+                dorm: itsRecord[0]["DORM"],
+                dormRoom: itsRecord[0]["DORM_ROOM"],
+                gradYear: itsRecord[0]["GRAD_YEAR"],
                 showProfile: rawFormData.showProfile === "on" ? true : false,
                 showDorm: rawFormData.showDorm === "on" ? true : false,
                 showPhoto: rawFormData.showPicture === "on" ? true : false,

diff --git a/app/settings/page.tsx b/app/settings/page.tsx
@@ -31,12 +31,12 @@ export default async function Settings() {
                 pronouns: user_data_prisma.pronouns,
                 id: user_data_prisma.uid,
                 photo_path: user_data_prisma.photoPath,
+                year: user_data_prisma.gradYear,
+                dorm: user_data_prisma.dorm,
+                room: user_data_prisma.dormRoom,
                 showDorm: user_data_prisma.showDorm,
                 showPicture: user_data_prisma.showPhoto,
                 showProfile: user_data_prisma.showProfile,
-                year: cygnet_user_data.year,
-                dorm: cygnet_user_data.dorm,
-                room: cygnet_user_data.room,
             };
         } else {
             user_data = {