Skip to content

Commit

Permalink
attendees to attendee
Browse files Browse the repository at this point in the history
  • Loading branch information
riyap committed Jun 22, 2024
1 parent ab95eef commit ac7e5ae
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import morgan from "morgan";
import bodyParser from "body-parser";
import errorHandler from "./middleware/error-handler";

import attendeeRouter from "./services/attendees/attendee-router";
import attendeeRouter from "./services/attendee/attendee-router";
import authRouter from "./services/auth/auth-router";
import eventsRouter from "./services/events/events-router";
import notificationsRouter from "./services/notifications/notifications-router";
Expand All @@ -34,7 +34,7 @@ app.use("/", morgan("dev"));
app.use("/", bodyParser.json());

// API routes
app.use("/attendees", attendeeRouter);
app.use("/attendee", attendeeRouter);
app.use("/auth", authRouter);
app.use("/events", eventsRouter);
app.use("/notifications", notificationsRouter);
Expand Down
6 changes: 3 additions & 3 deletions src/database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import mongoose, { Schema, Document } from "mongoose";
import {
AttendeeSchema,
AttendeeValidator,
} from "./services/attendees/attendee-schema";
} from "./services/attendee/attendee-schema";
import {
AttendeeAttendanceSchema,
AttendeeAttendanceValidator,
} from "./services/attendees/attendee-schema";
} from "./services/attendee/attendee-schema";
import {
EventSchema,
privateEventValidator,
Expand Down Expand Up @@ -68,7 +68,7 @@ export const Database = {
EventAttendanceSchema,
EventAttendanceValidator
),
ATTENDEES: initializeModel("attendees", AttendeeSchema, AttendeeValidator),
ATTENDEE: initializeModel("attendee", AttendeeSchema, AttendeeValidator),
ATTENDEE_ATTENDANCE: initializeModel(
"attendee_attendance",
AttendeeAttendanceSchema,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Database } from "../../database";
import RoleChecker from "../../middleware/role-checker";
import { Role } from "../auth/auth-models";
import dotenv from "dotenv";
import { generateQrHash } from "./attendees-utils";
import { generateQrHash } from "./attendee-utils";

dotenv.config();

Expand All @@ -15,7 +15,7 @@ const attendeeRouter = Router();
attendeeRouter.post("/", async (req, res, next) => {
try {
const attendeeData = AttendeeValidator.parse(req.body);
const attendee = new Database.ATTENDEES(attendeeData);
const attendee = new Database.ATTENDEE(attendeeData);
await attendee.save();

return res.status(StatusCodes.CREATED).json(attendeeData);
Expand Down Expand Up @@ -51,7 +51,7 @@ attendeeRouter.get(
const userId = payload.userId;

// Check if the user exists in the database
const user = await Database.ATTENDEES.findOne({ userId });
const user = await Database.ATTENDEE.findOne({ userId });

if (!user) {
return res
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/services/events/events-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export async function checkInUser(eventId: string, userId: string) {
// Check if the event and attendee exist
const [event, attendee] = await Promise.all([
Database.EVENTS.findOne({ eventId }),
Database.ATTENDEES.findOne({ userId }),
Database.ATTENDEE.findOne({ userId }),
]);

console.log(event);
Expand Down
4 changes: 2 additions & 2 deletions src/services/registration/registration-router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { RegistrationValidator } from "./registration-schema";
import { Database } from "../../database";
import RoleChecker from "../../middleware/role-checker";
import { Role } from "../auth/auth-models";
import { AttendeeValidator } from "../attendees/attendee-schema";
import { AttendeeValidator } from "../attendee/attendee-schema";
import { registrationExists } from "./registration-utils";

const registrationRouter = Router();
Expand Down Expand Up @@ -78,7 +78,7 @@ registrationRouter.post("/submit", RoleChecker([]), async (req, res, next) => {

const attendeeData = AttendeeValidator.parse(registrationData);

await Database.ATTENDEES.findOneAndUpdate(
await Database.ATTENDEE.findOneAndUpdate(
{ userId: payload.userId },
attendeeData,
{ upsert: true, setDefaultsOnInsert: true }
Expand Down
18 changes: 9 additions & 9 deletions src/services/stats/stats-router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ statsRouter.get(
RoleChecker([Role.enum.STAFF], false),
async (req, res, next) => {
try {
const attendees = await Database.ATTENDEES.find({
const attendees = await Database.ATTENDEE.find({
events: { $ne: [] },
});

Expand All @@ -35,7 +35,7 @@ statsRouter.get(
.status(StatusCodes.BAD_REQUEST)
.json({ error: "MissingPriceParameter" });
}
const attendees = await Database.ATTENDEES.find({
const attendees = await Database.ATTENDEE.find({
points: { $gte: price },
});

Expand All @@ -52,7 +52,7 @@ statsRouter.get(
RoleChecker([Role.enum.STAFF], false),
async (req, res, next) => {
try {
const attendees = await Database.ATTENDEES.find({
const attendees = await Database.ATTENDEE.find({
hasCheckedIn: true,
});

Expand Down Expand Up @@ -102,23 +102,23 @@ statsRouter.get(
async (req, res, next) => {
try {
const results = await Promise.allSettled([
Database.ATTENDEES.countDocuments({
Database.ATTENDEE.countDocuments({
allergies: { $size: 0 },
dietaryRestrictions: { $size: 0 },
}),
Database.ATTENDEES.countDocuments({
Database.ATTENDEE.countDocuments({
allergies: { $size: 0 },
dietaryRestrictions: { $ne: [] },
}),
Database.ATTENDEES.countDocuments({
Database.ATTENDEE.countDocuments({
allergies: { $ne: [] },
dietaryRestrictions: { $size: 0 },
}),
Database.ATTENDEES.countDocuments({
Database.ATTENDEE.countDocuments({
allergies: { $ne: [] },
dietaryRestrictions: { $ne: [] },
}),
Database.ATTENDEES.aggregate([
Database.ATTENDEE.aggregate([
{
$unwind: "$allergies",
},
Expand All @@ -129,7 +129,7 @@ statsRouter.get(
},
},
]),
Database.ATTENDEES.aggregate([
Database.ATTENDEE.aggregate([
{
$unwind: "$dietaryRestrictions",
},
Expand Down

0 comments on commit ac7e5ae

Please sign in to comment.