From aa98282401c97007a363f83b6a7b2ad132e3b95b Mon Sep 17 00:00:00 2001
From: Jacob Chang <jacobchang124@gmail.com>
Date: Mon, 5 Aug 2024 21:50:26 -0700
Subject: [PATCH] refactor

---
 src/database.ts                              | 11 ++---------
 src/services/speakers/speakers-router.ts     |  2 +-
 src/services/speakers/speakers-schema.ts     | 12 ------------
 src/services/speakers/speakers-validators.ts | 13 +++++++++++++
 4 files changed, 16 insertions(+), 22 deletions(-)
 create mode 100644 src/services/speakers/speakers-validators.ts

diff --git a/src/database.ts b/src/database.ts
index 28fc12e..e068996 100644
--- a/src/database.ts
+++ b/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,
@@ -86,11 +83,7 @@ export const Database = {
         SubscriptionSchema,
         SubscriptionSchemaValidator
     ),
-    REGISTRATION: initializeModel(
-        "registration",
-        RegistrationSchema,
-        RegistrationValidator
-    ),
+    REGISTRATION: mongoose.model("registration", RegistrationSchema),
     NOTIFICATIONS: initializeModel(
         "notifications",
         NotificationsSchema,
diff --git a/src/services/speakers/speakers-router.ts b/src/services/speakers/speakers-router.ts
index 1eddac0..f02ccb2 100644
--- a/src/services/speakers/speakers-router.ts
+++ b/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";
diff --git a/src/services/speakers/speakers-schema.ts b/src/services/speakers/speakers-schema.ts
index bf69b4f..7304eab 100644
--- a/src/services/speakers/speakers-schema.ts
+++ b/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: {
diff --git a/src/services/speakers/speakers-validators.ts b/src/services/speakers/speakers-validators.ts
new file mode 100644
index 0000000..ec7d6d4
--- /dev/null
+++ b/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(),
+});