feat: groupSchema

hack4impact-calpoly · Feb 16, 2024 · e553a80 · e553a80
1 parent c0b31b8
commit e553a80
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 30 deletions.
diff --git a/.env.example b/.env.example
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/components/Calendar.tsx b/src/app/components/Calendar.tsx
@@ -60,7 +60,7 @@ export default function Calendar(props: { events: FCEvent[]; admin: Boolean }) {
   return (
     <div>
       <div className={style.wrapper}>
-        <CreateEditEvent create={false} showModal={showModal} setShowModal={setShowModal}></CreateEditEvent>
+        <CreateEditEvent create={true} showModal={showModal} setShowModal={setShowModal}></CreateEditEvent>
         <FullCalendar
           customButtons={buttonType}
           plugins={[

diff --git a/src/app/components/ExpandedViewComponent.tsx b/src/app/components/ExpandedViewComponent.tsx
@@ -90,9 +90,7 @@ const EventExpandedView: React.FC<EventExpandedViewProps> = ({ eventDetails }) =
             <Text>
               <strong>{eventDetails.location}</strong>
             </Text>
-            <Text mb={8}>
-              <strong>{eventDetails.groupsAllowed}/{eventDetails.groupsAllowed} Participants</strong>
-            </Text>
+
             <Text mb={12}>
               {eventDetails.description}
             </Text>

diff --git a/src/database/eventSchema.ts b/src/database/eventSchema.ts
@@ -9,7 +9,7 @@ export type IEvent = {
     startTime: Date;
     endTime: Date;
     volunteerEvent: boolean;
-    groupsAllowed: number[];
+    groupsAllowed: Schema.Types.ObjectId[];
     attendeeIds: Schema.Types.ObjectId[];
 };
 
@@ -23,7 +23,7 @@ const eventSchema = new Schema<IEvent>({
     startTime: { type: Date, required: true },
     endTime: { type: Date, required: true },
     volunteerEvent: { type: Boolean, required: true },
-    groupsAllowed: { type: [Number], required: false },
+    groupsAllowed: { type: [Schema.Types.ObjectId], required: false },
     attendeeIds: { type: [Schema.Types.ObjectId], required: true, default: [] },
 });
 

diff --git a/src/database/groupSchema.ts b/src/database/groupSchema.ts
@@ -0,0 +1,13 @@
+import mongoose, { Mongoose, Schema } from "mongoose";
+
+export type IGroup = {
+    group_name: string;
+    groupees: Schema.Types.ObjectId[];
+};
+
+const Group = new Schema<IGroup>({
+    group_name: { type: String, required: true },
+    groupees: { type: [Schema.Types.ObjectId], required: true, default: [] },
+});
+
+export default mongoose.models["groups"] || mongoose.model("groups", Group);
diff --git a/src/database/userSchema.ts b/src/database/userSchema.ts
@@ -33,7 +33,7 @@ export type IUser = {
     role: "user" | "supervisor" | "admin";
     eventsAttended: [Schema.Types.ObjectId];
     digitalWaiver: Schema.Types.ObjectId | null;
-    groupId: number | null;
+    groupId: Schema.Types.ObjectId | null;
 };
 
 const UserSchema = new Schema<IUser>({
@@ -54,7 +54,7 @@ const UserSchema = new Schema<IUser>({
         required: true,
         default: [],
     },
-    groupId: { type: Number, required: false },
+    groupId: { type: Schema.Types.ObjectId, required: false },
     digitalWaiver: { type: Schema.Types.ObjectId, required: false },
 });