From 79562668883d58dff4cfc37c55bf9ba6aa672ccd Mon Sep 17 00:00:00 2001
From: Mikayla Dobson <mikaylaherself@gmail.com>
Date: Sun, 26 Nov 2023 21:43:03 -0600
Subject: [PATCH] corrections to schemas

---
 app/log/page.tsx                      |  6 ++----
 components/Music/FullMusicList.tsx    |  2 +-
 env.mjs                               |  4 ++--
 server/controllers/base.controller.ts |  9 +--------
 server/db/createClient.ts             | 11 +++--------
 server/db/schema.ts                   |  6 ++++--
 6 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/app/log/page.tsx b/app/log/page.tsx
index 4211f03..dab778e 100644
--- a/app/log/page.tsx
+++ b/app/log/page.tsx
@@ -1,7 +1,6 @@
 import BlogPostController from "@/server/controllers/blogpost.controller";
 
-export default async function DevLogIndex({ query }: { query: { category?: string }}) {
-    const { category } = query;
+export default async function DevLogIndex() {
     const controller = new BlogPostController();
     const posts = await controller.getAll();
 
@@ -10,11 +9,10 @@ export default async function DevLogIndex({ query }: { query: { category?: strin
             <h1>Dev Log</h1>
             <p>Coming soon...</p>
 
-            { category ? <p>Searching by category {category}</p> : null }
             { posts?.map((post, idx) => {
                 return (
                     <div key={idx}>
-                        <a href={`/log/${post._id.toHexString()}`}>{post.title}</a>
+                        <a href={`/log/${post._id.toString()}`}>{post.title}</a>
                         <p>{post.author}</p>
                     </div>
                 )
diff --git a/components/Music/FullMusicList.tsx b/components/Music/FullMusicList.tsx
index cd41881..0f4d057 100644
--- a/components/Music/FullMusicList.tsx
+++ b/components/Music/FullMusicList.tsx
@@ -10,7 +10,7 @@ export default function FullMusicList({ allResults }: { allResults?: Maybe<Parti
             ? allResults.map((result, idx) => {
                 return (
                     <div key={idx}>
-                        <Link href={`/listen/${result.id}`}>{result.name}</Link>
+                        <Link href={`/listen/${result._id?.toString()}`}>{result.name}</Link>
                     </div>
                 )
             }) : <p>No music available for streaming.</p>
diff --git a/env.mjs b/env.mjs
index fd678f1..758fc80 100644
--- a/env.mjs
+++ b/env.mjs
@@ -6,8 +6,8 @@ const env = createEnv({
         NODE_ENV: z.enum(['development', 'production', 'test']).default('development'),
 
         MONGO_URL: z.string().url(),
-        MONGO_USER: z.string(),
-        MONGO_PASSWORD: z.string(),
+        MONGO_USER: z.string().optional(),
+        MONGO_PASSWORD: z.string().optional(),
 
         POSTGRES_URL: z.string().url(),
         POSTGRES_USER: z.string(),
diff --git a/server/controllers/base.controller.ts b/server/controllers/base.controller.ts
index 1102423..09854d6 100644
--- a/server/controllers/base.controller.ts
+++ b/server/controllers/base.controller.ts
@@ -1,10 +1,5 @@
-import { S3Client } from '@aws-sdk/client-s3';
-// import Redis from 'ioredis';
-import pg from 'pg';
 import { createDBClient } from '../db/createClient';
-import { Maybe, must } from '@/util/helpers';
-import { createS3Client } from '../s3';
-import createRedisClient from '../cache/createClient';
+import { Maybe } from '@/util/helpers';
 import { ParseParams, SafeParseReturnType } from 'zod';
 import { MongoClient, WithId, Filter, InsertOneResult } from 'mongodb';
 
@@ -27,8 +22,6 @@ export default abstract class BaseController<T extends { _id?: any, [key: string
     }
 
     async getAll() {
-        'use server';
-
         let result: Maybe<WithId<T>[]>;
 
         try {
diff --git a/server/db/createClient.ts b/server/db/createClient.ts
index 4d1d276..ef37dd0 100644
--- a/server/db/createClient.ts
+++ b/server/db/createClient.ts
@@ -1,11 +1,6 @@
 import { env } from "@/env.mjs";
-import { MongoClient } from "mongodb";
+import { MongoClient, MongoClientOptions } from "mongodb";
 
-export function createDBClient() {
-    return new MongoClient(env.MONGO_URL, {
-        auth: {
-            username: env.MONGO_USER,
-            password: env.MONGO_PASSWORD,
-        }
-    })
+export function createDBClient(opts?: MongoClientOptions) {
+    return new MongoClient(env.MONGO_URL, opts)
 }
diff --git a/server/db/schema.ts b/server/db/schema.ts
index 659a991..038cbcb 100644
--- a/server/db/schema.ts
+++ b/server/db/schema.ts
@@ -3,8 +3,10 @@ import { z } from 'zod';
 const filePathMatcher = /^[1-9]{1,3}\.(wav|mp3|(jpe?g)|png)$/;
 const ZFileName = z.string().regex(filePathMatcher);
 
+const ObjectId = z.string().regex(/^[0-9a-fA-F]{24}$/);
+
 export const ZMusicStreamingEntry = z.object({
-    _id: z.any(),
+    _id: ObjectId.optional(),
     name: z.string().max(100),
     shortdescription: z.string().max(100),
     longdescription: z.string().max(1000),
@@ -19,7 +21,7 @@ export const ZMusicStreamingEntry = z.object({
 });
 
 export const ZBlogPost = z.object({
-    _id: z.any(),
+    _id: ObjectId.optional(),
     title: z.string().max(100),
     author: z.string().max(100),
     content: z.string(),