refactor

src/database.ts

@@ -12,10 +12,7 @@ import {
     EventAttendanceValidator,
 } from "./services/events/events-schema";
 import { RoleValidator, RoleSchema } from "./services/auth/auth-schema";
-import {
-    RegistrationSchema,
-    RegistrationValidator,
-} from "./services/registration/registration-schema";
+import { RegistrationSchema } from "./services/registration/registration-schema";
 import {
     SubscriptionSchemaValidator,
     SubscriptionSchema,
@@ -24,10 +21,7 @@ import {
     NotificationsSchema,
     NotificationsValidator,
 } from "./services/notifications/notifications-schema";
-import {
-    SpeakerSchema,
-    SpeakerValidator,
-} from "./services/speakers/speakers-schema";
+import { SpeakerSchema } from "./services/speakers/speakers-schema";
 import {
     SponsorAuthSchema,
     SponsorAuthValidator,
@@ -86,11 +80,7 @@ export const Database = {
         SubscriptionSchema,
         SubscriptionSchemaValidator
     ),
-    REGISTRATION: initializeModel(
-        "registration",
-        RegistrationSchema,
-        RegistrationValidator
-    ),
+    REGISTRATION: mongoose.model("registration", RegistrationSchema),
     NOTIFICATIONS: initializeModel(
         "notifications",
         NotificationsSchema,
@@ -101,7 +91,7 @@ export const Database = {
         SponsorAuthSchema,
         SponsorAuthValidator
     ),
-    SPEAKERS: initializeModel("speakers", SpeakerSchema, SpeakerValidator),
+    SPEAKERS: mongoose.model("speakers", SpeakerSchema),
     CORPORATE: initializeModel(
         "corporate",
         CorporateSchema,

src/services/speakers/speakers-router.ts

@@ -1,6 +1,6 @@
 import { Router } from "express";
 import { StatusCodes } from "http-status-codes";
-import { SpeakerValidator } from "./speakers-schema";
+import { SpeakerValidator } from "./speakers-validators";
 import { Database } from "../../database";
 import RoleChecker from "../../middleware/role-checker";
 import { Role } from "../auth/auth-models";

src/services/speakers/speakers-schema.ts

@@ -1,18 +1,6 @@
 import { Schema } from "mongoose";
-import { z } from "zod";
 import { v4 as uuidv4 } from "uuid";
 
-// Zod schema for speaker
-export const SpeakerValidator = z.object({
-    speakerId: z.coerce.string().default(() => uuidv4()),
-    name: z.string(),
-    title: z.string(),
-    bio: z.string(),
-    eventTitle: z.string(),
-    eventDescription: z.string(),
-    imgUrl: z.string(),
-});
-
 // Mongoose schema for speaker
 export const SpeakerSchema = new Schema({
     speakerId: {

src/services/speakers/speakers-validators.ts

@@ -0,0 +1,13 @@
+import { z } from "zod";
+import { v4 as uuidv4 } from "uuid";
+
+// Zod schema for speaker
+export const SpeakerValidator = z.object({
+    speakerId: z.coerce.string().default(() => uuidv4()),
+    name: z.string(),
+    title: z.string(),
+    bio: z.string(),
+    eventTitle: z.string(),
+    eventDescription: z.string(),
+    imgUrl: z.string(),
+});