fix filter and sort books

Dockerfile

@@ -3,7 +3,6 @@ FROM node:20-alpine as dev-stage
 WORKDIR /app
 COPY package*.json ./
 RUN npm install
-COPY . .
 RUN npx prisma generate
 USER root
 RUN apk add --no-cache mc mysql-client

src/services/bookService.ts

@@ -5,7 +5,7 @@ import { Book, BaseBook, QueryBooks, BookFromDB } from '../types/book.js';
 import { BookTagShrink, Tag } from '../types/tag.js';
 
 const prisma = new PrismaClient({
-  // log: ['query'],
+  log: ['query'],
 });
 
 async function createBook(data: BaseBook) {
@@ -231,7 +231,8 @@ async function searchBook(params: QueryBooks) {
       },
     });
   }
-  const whereQuery = whereConditions.length ? { OR: whereConditions } : {};
+  const whereQuery = whereConditions.length ? { AND: whereConditions } : {};
+  console.log('whereQuery', whereQuery)
   const books = await prisma.book.findMany({
     select: {
       id: true,
@@ -248,16 +249,22 @@ async function searchBook(params: QueryBooks) {
       last_read: true,
       book_tag: {
         select: {
+
           tag: true,
         },
       },
     },
     where: whereQuery,
+    orderBy: [
+      {
+        [sort]: sortWay,
+      },
+      {
+        id: 'desc'
+      }
+    ],
     skip: (page - 1) * perPage,
     take: Number(perPage),
-    orderBy: {
-      [sort]: sortWay,
-    },
   });
   const total = await prisma.book.count({ where: whereQuery });
   return {
@@ -325,7 +332,7 @@ function prepareBook(book: BookFromDB): Book {
       : [],
     text_length,
     view_count,
-    updated_at,
+    updated_at: updated_at ?? new Date(),
     last_read,
     tags: convertTags(book.book_tag),
   };

src/types/book.ts

@@ -108,7 +108,7 @@ interface BookFromDB {
   image?: Array<ImageFromDB> | null;
   text_length: number | null;
   view_count: number;
-  updated_at: Date;
+  updated_at: Date | null;
   last_read: Date | null;
 }