Merge pull request #133 from CodeForStartup/feat/refactor-prisma

feat: refactor prisma

Author: luannguyenQV

apps/web/@/actions/protect/postAction.ts

@@ -3,7 +3,7 @@
 import { revalidatePath } from "next/cache"
 import { redirect } from "next/navigation"
 
-import {
+import prisma, {
   createPost,
   PostOnUserType,
   PostStatus,

apps/web/@/molecules/post-form/index.tsx

@@ -6,7 +6,7 @@ import Image from "next/image"
 import Link from "next/link"
 
 import { zodResolver } from "@hookform/resolvers/zod"
-import { Image as ImageType, Prisma, TPostItem } from "database"
+import { Prisma, TImage, TPostItem } from "database"
 import { Upload as UploadIcon, X } from "lucide-react"
 import { useSession } from "next-auth/react"
 import { useTranslations } from "next-intl"
@@ -28,7 +28,7 @@ const PostForm = ({ post: postData }: { post?: TPostItem }) => {
 
   const t = useTranslations()
   const session = useSession()
-  const [image, setImage] = useState<ImageType | null>(postData?.Image)
+  const [image, setImage] = useState<TImage | null>(postData?.Image)
 
   const userId = session?.data?.user?.id
 

packages/database/src/images/queries.ts

@@ -1,21 +1,12 @@
-import { Image } from "@prisma/client"
+import { Image, Prisma } from "@prisma/client"
 
 import prisma from "../prisma"
-import { DEFAULT_LIMIT, DEFAULT_PAGE, IActionReturn, IGetListResponse } from "../shared/type"
-import { imageSelect } from "./selects"
+import { DEFAULT_LIMIT, DEFAULT_PAGE, IActionReturn } from "../shared/type"
+import { imageSelect, TImage } from "./selects"
 import { IImageFilter, IListImageResponse } from "./type"
 
 export const getImages = async (options: IImageFilter): Promise<IListImageResponse> => {
-  const {
-    page = DEFAULT_PAGE,
-    limit = DEFAULT_LIMIT,
-    userId,
-    orderBy: orderByKey,
-    order,
-    search,
-  } = options
-
-  console.log(">>>options", options)
+  const { page = DEFAULT_PAGE, limit = DEFAULT_LIMIT, userId, order } = options
 
   try {
     let where = {}
@@ -25,33 +16,10 @@ export const getImages = async (options: IImageFilter): Promise<IListImageRespon
         userId: userId,
       }
     }
-
-    if (search) {
-      where = {
-        ...where,
-        name: {
-          contains: search,
-          mode: "insensitive",
-        },
-      }
-    }
-
-    let orderBy = {
-      createdAt: "desc",
-    }
-
-    if (orderByKey && order) {
-      orderBy = {
-        ...orderBy,
-        [orderByKey]: order,
-      }
-    }
-
     const [total, data] = await Promise.all([
       prisma.image.count({ where }),
       prisma.image.findMany({
         where,
-        orderBy,
         take: limit,
         skip: (page - 1) * limit,
         select: imageSelect,
@@ -88,6 +56,12 @@ export const getImage = async (id: string): Promise<IActionReturn<Image>> => {
       select: imageSelect,
     })
 
+    if (!image) {
+      return {
+        error: "NOT_FOUND",
+      }
+    }
+
     return {
       data: image,
     }
@@ -99,8 +73,8 @@ export const getImage = async (id: string): Promise<IActionReturn<Image>> => {
 }
 
 export const createImage = async (
-  data: Omit<Image, "id" | "createdAt" | "updatedAt">
-): Promise<IActionReturn<Image>> => {
+  data: Prisma.ImageCreateInput
+): Promise<IActionReturn<TImage>> => {
   try {
     const image = await prisma.image.create({
       data,
@@ -118,8 +92,8 @@ export const createImage = async (
 
 export const updateImage = async (
   id: string,
-  data: Partial<Omit<Image, "id" | "createdAt" | "updatedAt">>
-): Promise<IActionReturn<Image>> => {
+  data: Prisma.ImageUpdateInput
+): Promise<IActionReturn<TImage>> => {
   try {
     const image = await prisma.image.update({
       where: { id },
@@ -136,16 +110,15 @@ export const updateImage = async (
   }
 }
 
-export const deleteImage = async (id: string, userId: string): Promise<IActionReturn<"">> => {
+export const deleteImage = async (id: string, userId: string): Promise<IActionReturn<Image>> => {
   try {
-    // only owner can delete
     const deleteImage = await prisma.image.delete({
       where: { id, userId },
     })
 
     if (!deleteImage) {
       return {
-        error: "Unauthorized",
+        error: "UNAUTHORIZED",
       }
     }
 

packages/database/src/images/selects.ts

@@ -18,8 +18,6 @@ export const imageSelect = {
   updatedAt: true,
 } satisfies Prisma.ImageSelect
 
-const getImage = Prisma.validator<Prisma.ImageDefaultArgs>()({
-  select: imageSelect,
-})
-
-export type TImageItem = Prisma.ImageGetPayload<typeof getImage>
+export type TImage = Prisma.ImageGetPayload<{
+  select: typeof imageSelect
+}>

packages/database/src/images/type.ts

@@ -1,15 +1,14 @@
-import { Image } from "@prisma/client"
-import { IActionReturn, IGetListResponse, OrderBy } from "src/shared/type"
+import { Image, Prisma } from "@prisma/client"
+import { IActionReturn, IGetListResponse } from "src/shared/type"
 
 export type ImageOrderBys = "createdAt" | "name"
 
 export interface IImageFilter {
   page?: number
   limit?: number
   userId?: string
-  orderBy?: ImageOrderBys
-  order?: OrderBy
-  search?: string
+  where?: Prisma.ImageWhereInput
+  order?: Prisma.ImageOrderByRelevanceInput
 }
 
 export interface IListImageResponse extends IActionReturn<IGetListResponse<Image>> {}

packages/database/src/index.ts

@@ -1,4 +1,5 @@
 import { createImage, deleteImage, getImage, getImages, updateImage } from "./images/queries"
+import { TImage } from "./images/selects"
 import { IImageFilter, IListImageResponse, ImageOrderBys } from "./images/type"
 import { createPost, getPost, getPosts, updatePost, updatePostStatus } from "./posts/queries"
 import { TCreatePostInput, TPostActionType, TPostItem } from "./posts/selects"
@@ -9,7 +10,6 @@ import {
   DEFAULT_PAGE,
   IActionReturn,
   IGetListResponse,
-  OrderBy,
   PeriodValues,
 } from "./shared/type"
 import { createTag, getTag, getTags, getTopTags } from "./tags/queries"
@@ -56,10 +56,10 @@ export type {
   IImageFilter,
   IListImageResponse,
   ImageOrderBys,
+  TImage,
 
   // Shared
   IActionReturn,
-  OrderBy,
   IGetListResponse,
   PeriodValues,
   DEFAULT_LIMIT,

packages/database/src/posts/queries.ts

@@ -157,13 +157,15 @@ export const getPosts = async ({ searchParams }: TGetPostsRequest): Promise<TGet
         total: total,
         page: Number(page),
         limit: Number(limit),
+        totalPages: Math.ceil(total / Number(limit)),
       },
     }
   } catch (error) {
     return {
       data: {
         data: [],
         total: 0,
+        totalPages: 0,
         page: Number(page),
         limit: Number(limit),
       },

packages/database/src/posts/selects.ts

@@ -50,11 +50,9 @@ export const postSelect = {
   },
 } satisfies Prisma.PostSelect
 
-const getPostItem = Prisma.validator<Prisma.PostDefaultArgs>()({
-  select: postSelect,
-})
-
-export type TPostItem = Prisma.PostGetPayload<typeof getPostItem>
+export type TPostItem = Prisma.PostGetPayload<{
+  select: typeof postSelect
+}>
 
 export type TCreatePostInput = Prisma.PostCreateInput & {
   tags?: {

packages/database/src/prisma.ts

@@ -1,15 +1,19 @@
 import { PrismaClient } from "@prisma/client"
 
-declare global {
-  const prisma: PrismaClient | undefined
-}
+// declare global {
+//   const prisma: PrismaClient | undefined
+// }
 
-const prisma =
-  global.prisma ||
-  new PrismaClient({
-    log: ["info", "warn", "error", "query"],
-  })
+// const prisma =
+//   global.prisma ||
+//   new PrismaClient({
+//     log: ["info", "warn", "error", "query"],
+//   })
 
-if (process.env.NODE_ENV === "development") global.prisma = prisma
+// if (process.env.NODE_ENV === "development") global.prisma = prisma
+
+const prisma = new PrismaClient({
+  log: ["info", "warn", "error", "query"],
+})
 
 export default prisma

packages/database/src/shared/type.ts

@@ -19,8 +19,6 @@ export interface IActionReturn<T> {
   error?: any
 }
 
-export type OrderBy = "asc" | "desc"
-
 export interface IGetListResponse<T> {
   data: T[]
   total: number