Merge pull request #18 from jmacuga/add-sql-db

migrated relational data to mariadb database

Author: jmacuga

.env.example

@@ -3,4 +3,7 @@ NEXT_PUBLIC_WEBSOCKET_URL="ws://localhost:3000/api/socket"
 
 # `openssl rand -base64 32`
 AUTH_SECRET=
-AUTH_URL=
+AUTH_URL=
+
+#mariadb
+DATABASE_URL="mysql://root:root1234@localhost:3306/collaboard"

README.md

@@ -68,6 +68,18 @@ Add `.env` file based on `.env.example`
 
 `docker compose up`
 
+5. Generate prisma client
+
+```
+npx prisma generate
+```
+
+6. Initialize MariaDB by applying migrations
+
+```
+npx prisma migrate
+```
+
 3. Run app node.js development server
 
 `npm run dev`

components/boards/board-cards.tsx

@@ -1,4 +1,4 @@
-import { IBoard } from "@/db/models/Board";
+import { Board } from "@prisma/client";
 import {
   Card,
   CardHeader,
@@ -13,12 +13,12 @@ import { getColorForIndex } from "@/lib/utils/colors";
 import { format } from "date-fns";
 import { DeleteBoardDialog } from "@/components/boards/delete-board-dialog";
 
-export function BoardCards({ teamBoards }: { teamBoards: IBoard[] | null }) {
+export function BoardCards({ teamBoards }: { teamBoards: Board[] | null }) {
   return (
     <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
       {teamBoards ? (
         teamBoards.map((board, index) => (
-          <Card key={board._id as string} className="relative group">
+          <Card key={board.id} className="relative group">
             <div
               className="absolute inset-0 opacity-5"
               style={{
@@ -35,7 +35,7 @@ export function BoardCards({ teamBoards }: { teamBoards: IBoard[] | null }) {
                 {board.name}
               </CardTitle>
               <DeleteBoardDialog
-                boardId={board._id as string}
+                boardId={board.id}
                 boardName={board.name}
                 teamId={board.teamId}
               />
@@ -47,7 +47,7 @@ export function BoardCards({ teamBoards }: { teamBoards: IBoard[] | null }) {
               </p>
             </CardContent>
             <CardFooter className="relative justify-end">
-              <Link href={`/board/${board._id}`} className="ml-auto">
+              <Link href={`/board/${board.id}`} className="ml-auto">
                 <Button
                   variant="ghost"
                   className="hover:bg-accent/50 transition-colors flex items-center gap-2"

components/teams/teams-cards.tsx

@@ -1,15 +1,15 @@
 import Link from "next/link";
 import { Card, CardHeader, CardTitle, CardContent } from "@/components/ui/card";
-import { ITeam } from "@/db/models/Team";
+import { Team } from "@prisma/client";
 import { Users } from "lucide-react";
 
-export default function TeamsCards({ teams }: { teams: ITeam[] }) {
+export default function TeamsCards({ teams }: { teams: Team[] }) {
   return (
     <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
       {teams ? (
         teams.map((team) => (
-          <Card key={team._id} className="hover:bg-accent/50 transition-colors">
-            <Link href={`/teams/${team._id}/boards`}>
+          <Card key={team.id} className="hover:bg-accent/50 transition-colors">
+            <Link href={`/teams/${team.id}/boards`}>
               <a className="block">
                 <CardHeader>
                   <CardTitle className="flex items-center gap-2">
@@ -18,7 +18,7 @@ export default function TeamsCards({ teams }: { teams: ITeam[] }) {
                   </CardTitle>
                 </CardHeader>
                 <CardContent className="text-sm text-muted-foreground">
-                  Team ID: {team._id}
+                  Team ID: {team.id}
                 </CardContent>
               </a>
             </Link>

db/data.ts

@@ -1,31 +1,27 @@
 "use server";
 
-import { Board, IBoard } from "@/db/models/Board";
-import dbConnect from "@/db/dbConnect";
-import { ObjectId } from "mongoose";
-import { IUser, User } from "@/db/models/User";
-import { ITeam, Team } from "@/db/models/Team";
-import { TeamMember } from "@/db/models/TeamMember";
-import { IDoc, Doc } from "@/db/models/Doc";
+import { prisma } from "@/db/prisma";
+import { Board, Team, User } from "@prisma/client";
 
-export async function createTeam({
+export async function createBoard({
   name,
   teamId,
   isMergeRequestRequired,
-  docId,
+  docUrl,
 }: {
   name: string;
-  teamId: ObjectId;
+  teamId: string;
   isMergeRequestRequired?: boolean;
-  docId?: string;
-}): Promise<IBoard | null> {
+  docUrl?: string;
+}): Promise<Board | null> {
   try {
-    await dbConnect();
-    const board = await Board.create({
-      name,
-      teamId,
-      isMergeRequestRequired,
-      docId,
+    const board = await prisma.board.create({
+      data: {
+        name,
+        teamId,
+        isMergeRequestRequired: isMergeRequestRequired ?? true,
+        docUrl,
+      },
     });
     return board;
   } catch (e) {
@@ -34,60 +30,81 @@ export async function createTeam({
   }
 }
 
-export async function getBoardById(id: string): Promise<IBoard | null> {
+export async function deleteBoard(boardId: string): Promise<Board | null> {
+  try {
+    const board = await prisma.board.delete({
+      where: { id: boardId },
+    });
+    return board;
+  } catch (e) {
+    console.error(e);
+    return null;
+  }
+}
+
+export async function getBoardById(id: string): Promise<Board | null> {
   try {
     if (!id) {
       console.error("Board ID is required");
       return null;
     }
-    await dbConnect();
-    const board = await Board.findById(id);
-    return JSON.parse(JSON.stringify(board));
+    const board = await prisma.board.findUnique({
+      where: { id },
+    });
+    return board;
   } catch (e) {
     console.error(e);
     return null;
   }
 }
 
-export async function getUser(email: string): Promise<IUser | null> {
+export async function getUser(email: string): Promise<User | null> {
   try {
-    await dbConnect();
-    return await User.findOne({ email: email });
+    return await prisma.user.findUnique({
+      where: { email },
+    });
   } catch (error) {
     console.error("Failed to fetch user:", error);
     return null;
   }
 }
 
-export async function getUserTeams(userId: string): Promise<ITeam[] | null> {
+export async function getUserTeams(userId: string): Promise<Team[] | null> {
   try {
-    await dbConnect();
-    const userTeamMemberships = await TeamMember.find({ userId });
-    const teamIds = userTeamMemberships.map((membership) => membership.teamId);
-    const teams = await Team.find({ _id: { $in: teamIds } });
-    return JSON.parse(JSON.stringify(teams));
+    const teams = await prisma.team.findMany({
+      where: {
+        members: {
+          some: {
+            userId,
+          },
+        },
+      },
+    });
+    return teams;
   } catch (e) {
     console.error(e);
     return null;
   }
 }
 
-export async function getTeamBoards(teamId: string): Promise<IBoard[] | null> {
+export async function getTeamBoards(teamId: string): Promise<Board[] | null> {
   try {
-    await dbConnect();
-    const boards = await Board.find({ teamId });
-    return JSON.parse(JSON.stringify(boards));
+    const boards = await prisma.board.findMany({
+      where: { teamId },
+    });
+    return boards;
   } catch (e) {
     console.error(e);
     return null;
   }
 }
 
-export async function getTeam(id: string): Promise<ITeam | null> {
+export async function getTeam(id: string): Promise<Team | null> {
   try {
-    await dbConnect();
-    const team = await Team.findById(id);
-    return JSON.parse(JSON.stringify(team));
+    const team = await prisma.team.findUnique({
+      where: { id },
+    });
+    return team;
   } catch (e) {
     console.error(e);
     return null;
@@ -96,15 +113,17 @@ export async function getTeam(id: string): Promise<ITeam | null> {
 
 export async function updateBoard(
   boardId: string,
-  updateData: Partial<IBoard>
-) {
+  updateData: Partial<Board>
+): Promise<Board | null> {
   if (!boardId) {
     console.error("Board ID is required");
     return null;
   }
   try {
-    await dbConnect();
-    return await Board.findByIdAndUpdate(boardId, updateData);
+    return await prisma.board.update({
+      where: { id: boardId },
+      data: updateData,
+    });
   } catch (e) {
     console.error(e);
     return null;
@@ -113,8 +132,10 @@ export async function updateBoard(
 
 export async function getBoardDocUrl(boardId: string): Promise<string | null> {
   try {
-    await dbConnect();
-    const board = await Board.findById(boardId);
+    const board = await prisma.board.findUnique({
+      where: { id: boardId },
+      select: { docUrl: true },
+    });
     return board?.docUrl || null;
   } catch (e) {
     console.error(e);