feat: add totalCount, stable ordering and book(id) to GraphQL API

backend/src/schema/books/resolvers/BookSearchResult.ts

@@ -0,0 +1,2 @@
+import type { BookSearchResultResolvers } from "./../../types.generated";
+export const BookSearchResult: BookSearchResultResolvers = {};

backend/src/schema/books/resolvers/Query/book.ts

@@ -0,0 +1,11 @@
+import type { QueryResolvers } from "./../../../types.generated";
+import { db } from "~/db";
+export const book: NonNullable<QueryResolvers["book"]> = async (
+  _parent,
+  args,
+  _ctx,
+) => {
+  const foundBook = await db.query.books.findFirst({ where: { id: args.id } });
+
+  return foundBook ?? null;
+};

backend/src/schema/books/resolvers/Query/searchBooks.ts

@@ -1,33 +1,42 @@
+import { and, asc, ilike, type SQL } from "drizzle-orm";
 import { db } from "~/db";
+import { books } from "~/db/schema";
 import type { QueryResolvers } from "~/schema/types.generated";
 
 export const searchBooks: NonNullable<QueryResolvers["searchBooks"]> = async (
   _parent,
   args,
   _ctx,
 ) => {
-  return db.query.books.findMany({
-    where: {
-      title: {
-        ilike: args.title ? `%${args.title ?? ""}%` : undefined,
-      },
-      series: {
-        ilike: args.series ? `%${args.series ?? ""}%` : undefined,
-      },
-      author: {
-        ilike: args.author ? `%${args.author ?? ""}%` : undefined,
-      },
-      language: {
-        ilike: args.language ? `%${args.language ?? ""}%` : undefined,
-      },
-      bookFormat: {
-        ilike: args.bookFormat ? `%${args.bookFormat ?? ""}%` : undefined,
-      },
-      publisher: {
-        ilike: args.publisher ? `%${args.publisher ?? ""}%` : undefined,
-      },
-    },
-    limit: args.limit,
-    offset: args.offset,
-  });
+  const conditions: SQL[] = [];
+
+  if (args.title) conditions.push(ilike(books.title, `%${args.title}%`));
+  if (args.series) conditions.push(ilike(books.series, `%${args.series}%`));
+  if (args.author) conditions.push(ilike(books.author, `%${args.author}%`));
+  if (args.language)
+    conditions.push(ilike(books.language, `%${args.language}%`));
+  if (args.bookFormat)
+    conditions.push(ilike(books.bookFormat, `%${args.bookFormat}%`));
+  if (args.publisher)
+    conditions.push(ilike(books.publisher, `%${args.publisher}%`));
+
+  // Here we build the filter once with Drizzle's SQL builder, so the same filter
+  // can be used both for fetching one page and for counting all matches.
+  const filter = and(...conditions);
+
+  const [foundBooks, totalCount] = await Promise.all([
+    db
+      .select()
+      .from(books)
+      .where(filter)
+      .orderBy(asc(books.id))
+      .limit(args.limit)
+      .offset(args.offset),
+    db.$count(books, filter),
+  ]);
+
+  return {
+    books: foundBooks,
+    totalCount,
+  };
 };

backend/src/schema/books/schema.graphql

@@ -24,5 +24,11 @@ extend type Query {
     publisher: String
     limit: Int = 12
     offset: Int = 0
-  ): [Book]
+  ): BookSearchResult!
+  book(id: Int!): Book
+}
+
+type BookSearchResult {
+  books: [Book!]!
+  totalCount: Int!
 }

backend/src/schema/resolvers.generated.ts

@@ -1,10 +1,13 @@
 /* This file was automatically generated. DO NOT UPDATE MANUALLY. */
     import type   { Resolvers } from './types.generated';
-    import    { searchBooks as Query_searchBooks } from './books/resolvers/Query/searchBooks';
+    import    { book as Query_book } from './books/resolvers/Query/book';
+import    { searchBooks as Query_searchBooks } from './books/resolvers/Query/searchBooks';
 import    { Book } from './books/resolvers/Book';
+import    { BookSearchResult } from './books/resolvers/BookSearchResult';
     export const resolvers: Resolvers = {
-      Query: { searchBooks: Query_searchBooks },
+      Query: { book: Query_book,searchBooks: Query_searchBooks },
 
 
-      Book: Book
+      Book: Book,
+BookSearchResult: BookSearchResult
     }

backend/src/schema/schema.generated.graphqls

@@ -14,6 +14,12 @@ type Book {
   title: String!
 }
 
+type BookSearchResult {
+  books: [Book!]!
+  totalCount: Int!
+}
+
 type Query {
-  searchBooks(author: String, bookFormat: String, language: String, limit: Int = 12, offset: Int = 0, publisher: String, series: String, title: String): [Book]
+  book(id: Int!): Book
+  searchBooks(author: String, bookFormat: String, language: String, limit: Int = 12, offset: Int = 0, publisher: String, series: String, title: String): BookSearchResult!
 }

backend/src/schema/typeDefs.generated.ts

@@ -1,2 +1,2 @@
 import type { DocumentNode } from 'graphql';
-  export const typeDefs = {"kind":"Document","definitions":[{"name":{"kind":"Name","value":"Query"},"kind":"ObjectTypeDefinition","fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"searchBooks"},"arguments":[{"kind":"InputValueDefinition","name":{"kind":"Name","value":"title"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"InputValueDefinition","name":{"kind":"Name","value":"series"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"InputValueDefinition","name":{"kind":"Name","value":"author"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"InputValueDefinition","name":{"kind":"Name","value":"language"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"InputValueDefinition","name":{"kind":"Name","value":"bookFormat"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"InputValueDefinition","name":{"kind":"Name","value":"publisher"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"InputValueDefinition","name":{"kind":"Name","value":"limit"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"12"}},{"kind":"InputValueDefinition","name":{"kind":"Name","value":"offset"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"0"}}],"type":{"kind":"ListType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Book"}}}}],"directives":[],"interfaces":[]},{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Book"},"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"id"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"isbn"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"title"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"series"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"author"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"description"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"language"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"bookFormat"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"edition"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"pages"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"publisher"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"publishDate"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"coverImgUrl"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}]},{"kind":"SchemaDefinition","operationTypes":[{"kind":"OperationTypeDefinition","type":{"kind":"NamedType","name":{"kind":"Name","value":"Query"}},"operation":"query"}]}]} as unknown as DocumentNode
+  export const typeDefs = {"kind":"Document","definitions":[{"name":{"kind":"Name","value":"Query"},"kind":"ObjectTypeDefinition","fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"searchBooks"},"arguments":[{"kind":"InputValueDefinition","name":{"kind":"Name","value":"title"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"InputValueDefinition","name":{"kind":"Name","value":"series"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"InputValueDefinition","name":{"kind":"Name","value":"author"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"InputValueDefinition","name":{"kind":"Name","value":"language"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"InputValueDefinition","name":{"kind":"Name","value":"bookFormat"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"InputValueDefinition","name":{"kind":"Name","value":"publisher"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"InputValueDefinition","name":{"kind":"Name","value":"limit"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"12"}},{"kind":"InputValueDefinition","name":{"kind":"Name","value":"offset"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"0"}}],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"BookSearchResult"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"book"},"arguments":[{"kind":"InputValueDefinition","name":{"kind":"Name","value":"id"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}],"type":{"kind":"NamedType","name":{"kind":"Name","value":"Book"}}}],"directives":[],"interfaces":[]},{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Book"},"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"id"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"isbn"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"title"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"series"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"author"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"description"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"language"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"bookFormat"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"edition"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"pages"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"publisher"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"publishDate"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"coverImgUrl"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}]},{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"BookSearchResult"},"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"books"},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Book"}}}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"totalCount"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}]},{"kind":"SchemaDefinition","operationTypes":[{"kind":"OperationTypeDefinition","type":{"kind":"NamedType","name":{"kind":"Name","value":"Query"}},"operation":"query"}]}]} as unknown as DocumentNode

backend/src/schema/types.generated.ts

@@ -28,9 +28,21 @@ export type Book = {
   title: Scalars['String']['output'];
 };
 
+export type BookSearchResult = {
+  __typename?: 'BookSearchResult';
+  books: Array<Book>;
+  totalCount: Scalars['Int']['output'];
+};
+
 export type Query = {
   __typename?: 'Query';
-  searchBooks?: Maybe<Array<Maybe<Book>>>;
+  book?: Maybe<Book>;
+  searchBooks: BookSearchResult;
+};
+
+
+export type QuerybookArgs = {
+  id: Scalars['Int']['input'];
 };
 
 
@@ -121,6 +133,7 @@ export type ResolversTypes = {
   Book: ResolverTypeWrapper<Book>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
+  BookSearchResult: ResolverTypeWrapper<BookSearchResult>;
   Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>;
 };
@@ -130,6 +143,7 @@ export type ResolversParentTypes = {
   Book: Book;
   String: Scalars['String']['output'];
   Int: Scalars['Int']['output'];
+  BookSearchResult: BookSearchResult;
   Query: Record<PropertyKey, never>;
   Boolean: Scalars['Boolean']['output'];
 };
@@ -150,12 +164,19 @@ export type BookResolvers<ContextType = any, ParentType extends ResolversParentT
   title?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
 };
 
+export type BookSearchResultResolvers<ContextType = any, ParentType extends ResolversParentTypes['BookSearchResult'] = ResolversParentTypes['BookSearchResult']> = {
+  books?: Resolver<Array<ResolversTypes['Book']>, ParentType, ContextType>;
+  totalCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+};
+
 export type QueryResolvers<ContextType = any, ParentType extends ResolversParentTypes['Query'] = ResolversParentTypes['Query']> = {
-  searchBooks?: Resolver<Maybe<Array<Maybe<ResolversTypes['Book']>>>, ParentType, ContextType, RequireFields<QuerysearchBooksArgs, 'limit' | 'offset'>>;
+  book?: Resolver<Maybe<ResolversTypes['Book']>, ParentType, ContextType, RequireFields<QuerybookArgs, 'id'>>;
+  searchBooks?: Resolver<ResolversTypes['BookSearchResult'], ParentType, ContextType, RequireFields<QuerysearchBooksArgs, 'limit' | 'offset'>>;
 };
 
 export type Resolvers<ContextType = any> = {
   Book?: BookResolvers<ContextType>;
+  BookSearchResult?: BookSearchResultResolvers<ContextType>;
   Query?: QueryResolvers<ContextType>;
 };