core-services-sdk 1.3.38 → 1.3.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-services-sdk",
-  "version": "1.3.38",
+  "version": "1.3.40",
   "main": "src/index.js",
   "type": "module",
   "types": "types/index.d.ts",

package/src/http/HttpError.js

@@ -35,7 +35,7 @@ export class HttpError extends Error {
   constructor(error = {}) {
     const { code, status, message, extendInfo } = error
 
-    super(message || (status && httpStatus[status]) || code || 'Unknown error')
+    super(message || code || httpStatus[status] || 'Unknown error')
 
     this.code = code
     this.status = status

package/src/mongodb/paginate.js

@@ -1,7 +1,7 @@
 import { ObjectId } from 'mongodb'
 
 /**
- * Pagination with SQL-like ascending/descending
+ * Pagination with SQL-like ascending/descending and total count
  *
  * @param {import('mongodb').Collection} collection
  * @param {Object} options
@@ -25,24 +25,74 @@ export async function paginate(
   const query = { ...filter }
   const sort = { [cursorField]: order === 'asc' ? 1 : -1 }
 
+  // Cursor filtering
   if (cursor) {
     if (cursorField === '_id') {
       cursor = new ObjectId(cursor)
     }
-
     query[cursorField] = order === 'asc' ? { $gt: cursor } : { $lt: cursor }
   }
 
+  // Fetch results
   const results = await collection
     .find(query, { projection })
     .sort(sort)
     .limit(limit)
     .toArray()
 
+  // Get total count (for the original filter, not including cursor)
+  const totalCount = await collection.countDocuments(filter)
+
+  const paginationEdges =
+    results.length > 0
+      ? await getPaginationEdges({
+          order,
+          filter,
+          results,
+          collection,
+          cursorField,
+        })
+      : { hasNext: false, hasPrevious: false }
+
+  const { hasNext, hasPrevious } = paginationEdges
   return {
     order,
+    totalCount,
     list: results,
-    previous: results.length ? results[0][cursorField] : null,
-    next: results.length ? results[results.length - 1][cursorField] : null,
+    previous: hasPrevious && results.length ? results[0][cursorField] : null,
+    next:
+      hasNext && results.length
+        ? results[results.length - 1][cursorField]
+        : null,
+  }
+}
+
+export async function getPaginationEdges({
+  order,
+  filter,
+  results,
+  collection,
+  cursorField,
+}) {
+  const first = results[0][cursorField]
+  const last = results[results.length - 1][cursorField]
+
+  // Check if there are items before the first
+  const hasPrevious =
+    (await collection.countDocuments({
+      ...filter,
+      [cursorField]: order === 'asc' ? { $lt: first } : { $gt: first },
+    })) > 0
+
+  // Check if there are items after the last
+  const hasNext =
+    (await collection.countDocuments({
+      ...filter,
+      [cursorField]: order === 'asc' ? { $gt: last } : { $lt: last },
+    })) > 0
+
+  return {
+    hasNext,
+    hasPrevious,
   }
 }

package/tests/http/HttpError.unit.test.js

@@ -21,11 +21,11 @@ describe('HttpError', () => {
 
   it('should fallback to default message from status if message is missing', () => {
     const error = new HttpError({
-      code: 'BAD_REQUEST',
+      code: 'Missing parameter x',
       status: httpStatus.BAD_REQUEST,
     })
 
-    expect(error.message).toBe(httpStatus[httpStatus.BAD_REQUEST])
+    expect(error.message).toBe('Missing parameter x')
     expect(error.extendInfo).toBeUndefined()
   })
 

package/tests/mongodb/paginate.helper.integration.test.js

@@ -54,7 +54,7 @@ describe('paginate - Integration', () => {
 
     expect(result.list).toHaveLength(5)
     expect(result.next).toBeDefined()
-    expect(result.previous).toBeDefined()
+    expect(result.previous).toBeNull()
   })
 
   it('returns empty when no docs match filter', async () => {

package/types/mongodb/paginate.d.ts

@@ -1,5 +1,5 @@
 /**
- * Pagination with SQL-like ascending/descending
+ * Pagination with SQL-like ascending/descending and total count
  *
  * @param {import('mongodb').Collection} collection
  * @param {Object} options
@@ -27,8 +27,25 @@ export function paginate(
   },
 ): Promise<{
   order: 'asc' | 'desc'
+  totalCount: number
   list: import('mongodb').WithId<import('bson').Document>[]
   previous: any
   next: any
 }>
+export function getPaginationEdges({
+  order,
+  filter,
+  results,
+  collection,
+  cursorField,
+}: {
+  order: any
+  filter: any
+  results: any
+  collection: any
+  cursorField: any
+}): Promise<{
+  hasNext: boolean
+  hasPrevious: boolean
+}>
 import { ObjectId } from 'mongodb'