Team and staff schema and routes

src/app.ts

@@ -21,6 +21,7 @@ import versionRouter from "./services/version/version-router";
 import userRouter from "./services/user/user-router";
 import sponsorRouter from "./services/sponsor/sponsor-router";
 import statisticRouter from "./services/statistic/statistic-router";
+import teamRouter from "./services/team/team-router";
 
 // import { InitializeConfigReader } from "./middleware/config-reader";
 import { ErrorHandler } from "./middleware/error-handler";
@@ -80,6 +81,7 @@ app.use("/shop/", shopRouter);
 app.use("/sponsor/", sponsorRouter);
 app.use("/staff/", staffRouter);
 app.use("/statistic/", statisticRouter);
+app.use("/team/", teamRouter);
 app.use("/version/", versionRouter);
 app.use("/user/", userRouter);
 

src/common/models.ts

@@ -15,11 +15,12 @@ import {
 import { ShopHistory, ShopItem, ShopOrder } from "../services/shop/shop-schemas";
 import { UserAttendance, UserFollowing, UserInfo } from "../services/user/user-schemas";
 import { AnyParamConstructor, IModelOptions } from "@typegoose/typegoose/lib/types";
-import { StaffShift } from "../services/staff/staff-schemas";
+import { StaffShift, StaffInfo } from "../services/staff/staff-schemas";
 import { NotificationMappings, NotificationMessages } from "../services/notification/notification-schemas";
 import { PuzzleItem, PuzzleAnswer } from "../services/puzzle/puzzle-schemas";
 import { Sponsor } from "../services/sponsor/sponsor-schemas";
 import { StatisticLog } from "../services/statistic/statistic-schemas";
+import { Team } from "../services/team/team-schemas";
 import Config from "./config";
 import { RuntimeConfigModel } from "./runtimeConfig";
 
@@ -39,6 +40,7 @@ export enum Group {
     SPONSOR = "sponsor",
     STAFF = "staff",
     STATISTIC = "statistic",
+    TEAM = "team",
     USER = "user",
 }
 
@@ -102,6 +104,11 @@ enum SponsorCollection {
 
 enum StaffCollection {
     SHIFT = "shift",
+    INFO = "info",
+}
+
+enum TeamCollection {
+    TEAMS = "teams",
 }
 
 enum StatisticCollection {
@@ -204,10 +211,14 @@ export default class Models {
 
     // Staff
     static StaffShift: Model<StaffShift> = getModel(StaffShift, Group.STAFF, StaffCollection.SHIFT);
+    static StaffInfo: Model<StaffInfo> = getModel(StaffInfo, Group.STAFF, StaffCollection.INFO);
 
     // Statistic
     static StatisticLog: Model<StatisticLog> = getModel(StatisticLog, Group.STATISTIC, StatisticCollection.LOGS);
 
+    // Team
+    static Team: Model<Team> = getModel(Team, Group.TEAM, TeamCollection.TEAMS);
+
     // User
     static UserInfo: Model<UserInfo> = getModel(UserInfo, Group.USER, UserCollection.INFO);
     static UserAttendance: Model<UserAttendance> = getModel(UserAttendance, Group.USER, UserCollection.ATTENDANCE);

src/services/auth/auth-router.ts

@@ -262,7 +262,13 @@ authRouter.get(
 
         const userInfo = await getUserInfoWithRole(role);
 
-        res.status(StatusCode.SuccessOK).send({ userInfo });
+        res.status(StatusCode.SuccessOK).send({
+            userInfo: userInfo.map((user) => ({
+                name: user.name,
+                userId: user.userId,
+                email: user.email,
+            })),
+        });
     },
 );
 

src/services/event/event-schemas.ts

@@ -2,7 +2,6 @@ import { modelOptions, prop } from "@typegoose/typegoose";
 import { CreateErrorAndSchema, EventIdSchema } from "../../common/schemas";
 import { z } from "zod";
 import { UserIdSchema } from "../../common/schemas";
-import { UserInfoSchema } from "../user/user-schemas";
 
 export enum EventType {
     MEAL = "MEAL",
@@ -225,7 +224,13 @@ export const EventAttendeesSchema = z
 export const EventAttendeesInfoSchema = z
     .object({
         eventId: EventIdSchema,
-        attendeesInfo: z.array(UserInfoSchema),
+        attendeesInfo: z.array(
+            z.object({
+                userId: UserIdSchema,
+                name: z.string(),
+                email: z.string(),
+            }),
+        ),
     })
     .openapi("EventAttendeesInfo");