From 368a38c1b0cf0c677f3ff71d934e8f136b1e13c3 Mon Sep 17 00:00:00 2001
From: Mikayla Dobson <mikaylaherself@gmail.com>
Date: Mon, 27 Nov 2023 10:56:38 -0600
Subject: [PATCH] enabled connection to mongodb

---
 .gitignore                                |  1 +
 app/log/layout.tsx                        |  0
 mdx-components.tsx                        | 17 +++++++++++++++++
 next.config.js                            |  6 ++++--
 package.json                              |  6 +++++-
 server/controllers/base.controller.ts     | 11 ++++++-----
 server/controllers/blogpost.controller.ts |  2 +-
 server/controllers/music.controller.ts    |  2 +-
 server/db/createClient.ts                 |  9 ++++++---
 server/db/seed.js                         | 21 +++++++++++++++++++--
 10 files changed, 60 insertions(+), 15 deletions(-)
 create mode 100644 app/log/layout.tsx
 create mode 100644 mdx-components.tsx

diff --git a/.gitignore b/.gitignore
index c075e17..9404f5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ package-lock.json
 
 # assets
 /seed_data
+/certs
 
 # testing
 /coverage
diff --git a/app/log/layout.tsx b/app/log/layout.tsx
new file mode 100644
index 0000000..e69de29
diff --git a/mdx-components.tsx b/mdx-components.tsx
new file mode 100644
index 0000000..5779915
--- /dev/null
+++ b/mdx-components.tsx
@@ -0,0 +1,17 @@
+import type { MDXComponents } from "mdx/types";
+
+export function useMDXComponents(components: MDXComponents): MDXComponents {
+    return {
+        ...components,
+        h1: (props) =>
+            <h1 className="text-3xl text-black font-semi-bold" {...props} />,
+        h2: (props) =>
+            <h2 className="text-2xl text-black font-semi-bold" {...props} />,
+        h3: (props) =>
+            <h3 className="text-xl text-black font-semi-bold" {...props} />,
+        p: (props) => <p className="text-black" {...props} />,
+        a: (props) => <a className="text-violet-900" {...props} />,
+        ul: (props) => <ul className="list-disc" {...props} />,
+        li: (props) => <li className="text-black" {...props} />,
+    }
+}
diff --git a/next.config.js b/next.config.js
index 486c57e..bd99973 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,7 +1,9 @@
+import createMDX from '@next/mdx'
+
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-    pageExtensions: ['js', 'jsx', 'ts', 'tsx'],
+    pageExtensions: ['js', 'jsx', 'ts', 'tsx', 'mdx'],
     reactStrictMode: true,
 }
 
-export default nextConfig;
+export default createMDX()(nextConfig);
diff --git a/package.json b/package.json
index 9de51d2..d55069e 100644
--- a/package.json
+++ b/package.json
@@ -8,12 +8,15 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "db-seed": "node server/db/seed.js $1",
+    "db-seed": "node --env-file=.env ./server/db/seed.js",
     "s3-seed": "ts-node --project ./tsconfig.json ./server/s3/seed.ts"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.367.0",
     "@aws-sdk/s3-request-presigner": "^3.445.0",
+    "@mdx-js/loader": "^3.0.0",
+    "@mdx-js/react": "^3.0.0",
+    "@next/mdx": "^14.0.3",
     "@smithy/node-http-handler": "^2.1.8",
     "@t3-oss/env-nextjs": "^0.7.0",
     "@vercel/style-guide": "^5.0.1",
@@ -28,6 +31,7 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
+    "@types/mdx": "^2.0.10",
     "@types/node": "^20.10.0",
     "@types/pg": "^8.10.3",
     "@types/react": "18.2.7",
diff --git a/server/controllers/base.controller.ts b/server/controllers/base.controller.ts
index 09854d6..b7883f2 100644
--- a/server/controllers/base.controller.ts
+++ b/server/controllers/base.controller.ts
@@ -1,24 +1,24 @@
 import { createDBClient } from '../db/createClient';
 import { Maybe } from '@/util/helpers';
-import { ParseParams, SafeParseReturnType } from 'zod';
+import { ParseParams } from 'zod';
 import { MongoClient, WithId, Filter, InsertOneResult } from 'mongodb';
 
-type FullParserType<T extends { [key: string]: any }> = (data: any, params?: Partial<ParseParams> | undefined) => SafeParseReturnType<any, T>
+type FullParserType<T extends { [key: string]: any }> = (data: any, params?: Partial<ParseParams>) => T;
 
 type ControllerOptions<T extends { [key: string]: any }> = {
     tableName: string
-    parser?: FullParserType<T>
+    parse: FullParserType<T>
 }
 
 export default abstract class BaseController<T extends { _id?: any, [key: string]: any }> {
     protected client: MongoClient
     collectionName: string
-    parser?: FullParserType<T>
+    parse: FullParserType<T>
 
     constructor(options: ControllerOptions<T>) {
         this.collectionName = options.tableName;
         this.client = createDBClient();
-        this.parser = options.parser;
+        this.parse = options.parse;
     }
 
     async getAll() {
@@ -59,6 +59,7 @@ export default abstract class BaseController<T extends { _id?: any, [key: string
 
     async post(data: T) {
         let result: Maybe<InsertOneResult<T>>;
+        this.parse(data);
 
         try {
             await this.client.connect();
diff --git a/server/controllers/blogpost.controller.ts b/server/controllers/blogpost.controller.ts
index ab41e37..3262081 100644
--- a/server/controllers/blogpost.controller.ts
+++ b/server/controllers/blogpost.controller.ts
@@ -5,7 +5,7 @@ export default class BlogPostController extends BaseController<BlogPost> {
     constructor() {
         super({
             tableName: "blogposts",
-            parser: ZBlogPost.safeParse,
+            parse: ZBlogPost.parse,
         })
     }
 }
diff --git a/server/controllers/music.controller.ts b/server/controllers/music.controller.ts
index 133f464..3f63295 100644
--- a/server/controllers/music.controller.ts
+++ b/server/controllers/music.controller.ts
@@ -5,7 +5,7 @@ export default class MusicController extends BaseController<MusicStreamingEntry>
     constructor() {
         super({
             tableName: "music",
-            parser: ZMusicStreamingEntry.safeParse,
+            parse: ZMusicStreamingEntry.parse,
         })
     }
 }
diff --git a/server/db/createClient.ts b/server/db/createClient.ts
index ef37dd0..b03cbd2 100644
--- a/server/db/createClient.ts
+++ b/server/db/createClient.ts
@@ -1,6 +1,9 @@
 import { env } from "@/env.mjs";
-import { MongoClient, MongoClientOptions } from "mongodb";
+import { MongoClient } from "mongodb";
 
-export function createDBClient(opts?: MongoClientOptions) {
-    return new MongoClient(env.MONGO_URL, opts)
+export function createDBClient() {
+    return new MongoClient(env.MONGO_URL, {
+        tls: true,
+        tlsCertificateKeyFile: process.cwd() + "/certs/mongo_cert.pem",
+    });
 }
diff --git a/server/db/seed.js b/server/db/seed.js
index 3911b82..01ff6b8 100644
--- a/server/db/seed.js
+++ b/server/db/seed.js
@@ -5,7 +5,20 @@ import { z } from "zod";
 async function main() {
     console.log("Preparing seed data...")
 
-    const connectionString = z.string().safeParse(process.argv[2]).data;
+    const nodeMajorVersion = parseInt(process.version.split(".")[0].split("v")[1]);
+    const nodeMinorVersion = parseInt(process.version.split(".")[1]);
+
+    if (nodeMajorVersion < 20 || (nodeMajorVersion === 20 && nodeMinorVersion < 10)) {
+        throw new Error("Database seed depends on Node version 20.10.0 or higher");
+    }
+
+    if (!process.env.MONGO_URL) throw new Error("Missing required variable `MONGO_URL` for database connection");
+    const connectionString = z.string().url().parse(process.env.MONGO_URL);
+
+    // check if documents and collections exist
+    const client = new MongoClient(connectionString, {
+        tlsCertificateKeyFile: process.cwd() + "/certs/mongo_cert.pem",
+    });
 
     /** @type {import("./schema").MusicStreamingEntry} */
     const jisei = {
@@ -44,7 +57,10 @@ async function main() {
     try {
         console.log("Connecting to MongoDB...")
 
-        const client = new MongoClient(connectionString);
+        const client = new MongoClient(connectionString, {
+            tlsCertificateKeyFile: process.cwd() + "/certs/mongo_cert.pem",
+        });
+
         await client.connect();
 
         const db = client.db("mikayladotdev");
@@ -63,6 +79,7 @@ async function main() {
     }
 
     console.log("Done!")
+    process.exit(0);
 }
 
 main();