fix count and limit issue in getMembers api

client/src/api/members/getAllMembers.ts

@@ -8,7 +8,7 @@ interface ISinginBody {
 }
 
 interface IParams {
-    offset: number;
+    skip: number;
     limit: number;
 }
 

client/src/modules/common/hooks/useInfiniteScroll.ts

@@ -1,13 +1,13 @@
 import { useEffect, useRef, useState } from 'react';
 
 interface IuseInfiniteScroll {
-    fetchAction: ({ limit, offset }: { limit: number; offset: number }) => void;
+    fetchAction: ({ limit, skip }: { limit: number; skip: number }) => void;
     limit: number;
-    offset: number;
+    skip: number;
     totalCount: number;
 }
 
-const useInfiniteScroll = ({ offset, limit, fetchAction, totalCount }: IuseInfiniteScroll) => {
+const useInfiniteScroll = ({ skip, limit, fetchAction, totalCount }: IuseInfiniteScroll) => {
     const scrollActiveRef = useRef<boolean>(false);
 
     const handleScroll = (event: Event) => {
@@ -18,8 +18,8 @@ const useInfiniteScroll = ({ offset, limit, fetchAction, totalCount }: IuseInfin
                 scrollActiveRef.current = true;
             }
         } else {
-            if (offset < totalCount) {
-                fetchAction({ limit, offset });
+            if (skip < totalCount) {
+                fetchAction({ limit, skip });
             }
             scrollActiveRef.current = false;
         }
@@ -29,7 +29,7 @@ const useInfiniteScroll = ({ offset, limit, fetchAction, totalCount }: IuseInfin
         window.addEventListener('scroll', handleScroll, { passive: true });
 
         return () => window.removeEventListener('scroll', handleScroll);
-    }, [scrollActiveRef.current, totalCount, offset]);
+    }, [scrollActiveRef.current, totalCount, skip]);
 };
 
 export default useInfiniteScroll;

client/src/modules/dashboard/components/MemberLists/index.tsx

@@ -22,7 +22,7 @@ const MemberLists = () => {
     const [selectedMember, setSelectedMember] = useState<IMember>();
     useEffect(() => {
         if (!members.length) {
-            dispatch(fetchMembers({ limit: 6, offset: 0 }));
+            dispatch(fetchMembers({ limit: 6, skip: 0 }));
         }
     }, []);
 
@@ -31,15 +31,13 @@ const MemberLists = () => {
         setEditModalOpen(true);
     };
 
-
-
     useInfiniteScroll({
         totalCount: meta?.count || 0,
         limit: 6,
-        offset: members.length,
-        fetchAction: ({ limit, offset }) => {
+        skip: members.length,
+        fetchAction: ({ limit, skip }) => {
             if (!paginationLoading && !loading) {
-                dispatch(fetchMembers({ limit, offset }));
+                dispatch(fetchMembers({ limit, skip }));
             }
         },
     });
@@ -73,8 +71,8 @@ const MemberLists = () => {
                 <Spinner className='mt-40' />
             ) : (
                 <div className='max-w-6xl px-5 mx-auto relative'>
-                    {members.map((member, index) => {
-                        return <List onSelect={handleSelectMember} key={index} member={member} />;
+                    {members.map((member) => {
+                        return <List onSelect={handleSelectMember} key={member._id} member={member} />;
                     })}
                     {paginationLoading ? <Spinner className='mt-10' /> : null}
                 </div>

client/src/reducers/membersReducer.ts

@@ -28,7 +28,7 @@ const memebersSlice = createSlice({
             } else {
                 const meta: IMeta = {
                     count: 1,
-                    offset: 1,
+                    skip: 1,
                 };
                 state.meta = meta;
             }
@@ -56,9 +56,9 @@ const memebersSlice = createSlice({
     },
 });
 
-export const fetchMembers = createAsyncThunk('members/fetch', async ({ limit, offset }: { limit: number; offset: number }) => {
+export const fetchMembers = createAsyncThunk('members/fetch', async ({ limit, skip }: { limit: number; skip: number }) => {
     process.env.NODE_ENV !== 'production' && (await sleep(500));
-    const response = await getAllMembers({ limit, offset });
+    const response = await getAllMembers({ limit, skip });
     return response;
 });
 

client/src/types/Meta.ts

@@ -1,12 +1,5 @@
 export interface IMeta {
     count: number;
-    offset: number;
+    skip: number;
     limit?: number;
-    totalPages?: number;
-    page?: number;
-    pagingCounter?: number;
-    hasPrevPage?: boolean;
-    hasNextPage?: boolean;
-    prevPage?: number | null;
-    nextPage?: number | null;
 }

server/common/handler.ts

@@ -40,24 +40,20 @@ const findOne = async (modelName, request) => {
     return model;
 };
 
-const getWithPagination = async (modelName, { limit, offset }: { page: number; limit: number; offset: number }) => {
-    const mongoModel = mongoose.models[modelName] as any;
-    const myCustomLabels = {
-        totalDocs: 'count',
-        docs: 'result',
-        meta: 'meta',
-    };
-    const options = {
-        sort: { createdAt: -1 },
-        limit: limit,
-        customLabels: myCustomLabels,
-        offset: offset,
+const getWithPagination = async (modelName, { limit, skip }: { page: number; limit: number; skip: number }) => {
+    const mongoModel = mongoose.models[modelName];
+
+    const totalCount = await mongoModel.count();
+    const result = await mongoModel.find().sort({ createdAt: -1 }).skip(skip).limit(limit).exec();
+
+    return {
+        result: result,
+        meta: {
+            limit,
+            skip,
+            count: totalCount,
+        },
     };
-    const model = await mongoModel.paginate({}, options);
-    if (model == null) {
-        throw new Error('Product not found by the id: ');
-    }
-    return model;
 };
 
 export { save, update, deleteById, getById, getAll, getWithPagination, findOne };

server/controllers/members/index.ts

@@ -87,9 +87,9 @@ const deleteHandler = async (req, res, next) => {
 };
 
 const getHandler = async (req, res, next) => {
-    const { page = 1, limit = 10, offset = 0 } = req.query;
+    const { page = 1, limit = 10, skip = 0 } = req.query;
     try {
-        const data = await get({ page, limit, offset });
+        const data = await get({ page, limit, skip });
         res.status(200).send(data);
     } catch (error) {
         return next(error, req, res);

server/core/mongo.ts

@@ -19,15 +19,18 @@ const connectWithDb = async (): Promise<void> => {
     const memberData = await getAllMembers();
     if (!memberData.length) {
         console.log('Connected to MongoDB');
-        await Promise.all(
-            memberJson.map(async (member) => {
-                await save({
-                    ...(member as any),
+        for (let i = 0; i < memberJson.length; i++) {
+            create(() =>
+                save({
+                    ...(memberJson[i] as any),
                     uid: 'CM-' + randomId(6),
-                });
-            })
-        );
+                })
+            );
+        }
         console.log('Seeded members');
     }
 };
+
+const create = (fn) => new Promise((resolve) => setTimeout(() => resolve(fn()), 100));
+
 export default connectWithDb;

server/models/member/index.ts

@@ -1,5 +1,4 @@
 import { Schema, model } from 'mongoose';
-import mongoosePaginate from 'mongoose-paginate-v2';
 
 type MembershipType = 'VIP' | 'CHILDREN' | 'WOMEN' | 'PLAYER' | 'FOREIGNER' | 'NORMAL';
 
@@ -46,7 +45,6 @@ const schema = new Schema<IMember>(
     { timestamps: true }
 );
 
-schema.plugin(mongoosePaginate);
 const Member = model<IMember>('Member', schema);
 
 export default Member;

server/package.json

@@ -26,7 +26,6 @@
         "express": "^4.17.3",
         "joi": "^17.6.0",
         "jsonwebtoken": "^8.5.1",
-        "mongoose-paginate-v2": "^1.6.2",
         "multer": "^1.4.4"
     }
 }

server/services/member/index.ts

@@ -12,8 +12,8 @@ import { NotFound } from '../../common/errors';
 
 const modelName = 'Member';
 
-const get = async ({ page, limit, offset }: { page: number; limit: number; offset: number }) => {
-    const result = await getWithPagination(modelName, { page, limit, offset });
+const get = async ({ page, limit, skip }: { page: number; limit: number; skip: number }) => {
+    const result = await getWithPagination(modelName, { page, limit, skip });
     return result;
 };