fixing logbook skip take order by

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "",
   "author": "",
   "private": true,

api/src/log/log.service.spec.ts

@@ -234,14 +234,14 @@ describe('LogService', () => {
     const count = 1
     const morePages = false
     
-    jest.spyOn(mockLogRepository, 'findAndCount').mockReturnValue([logs, count, morePages]);
+    jest.spyOn(mockQueryBuilder, 'getManyAndCount').mockReturnValue([logs, count, morePages]);
 
     const {entities, total, hasNextPage} = await service.findLogsWithCount();
 
     expect(entities).toEqual(logs);
     expect(count).toEqual(total);
     expect(hasNextPage).toEqual(morePages);
-    expect(mockLogRepository.findAndCount).toHaveBeenCalled();
+    expect(mockQueryBuilder.getManyAndCount).toHaveBeenCalled();
   })
 
     it('findLogsWithTracks => should find log entries with tracks', async () => {
@@ -294,7 +294,7 @@ describe('LogService', () => {
     expect(entities).toEqual(logs);
     expect(count).toEqual(total);
     expect(hasNextPage).toEqual(morePages);
-    expect(mockLogRepository.findAndCount).toHaveBeenCalled();
+    expect(mockQueryBuilder.getManyAndCount).toHaveBeenCalled();
   })
 
   it('update => should update a log entry', async () => {

api/src/log/log.service.ts

@@ -25,11 +25,22 @@ export class LogService {
   }
 
   async findLogsWithCount(skip?: number, take?: number): Promise<Logs> {
-    const [entities, total] = await this.logRepository.findAndCount({ 
+    // const [entities, total] = await this.logRepository.findAndCount({ 
-      take, 
+    //   take, 
-      skip,
+    //   skip,
-      relations: ['pilot', 'tracks']
+    //   order: {
-    })
+    //     date: 'DESC'
+    //   },
+    //   relations: ['pilot', 'tracks']
+    // })
+
+    const [entities, total] = await this.logRepository
+      .createQueryBuilder('logs')
+      .innerJoinAndSelect('logs.pilot', 'pilot')
+      .orderBy('logs.date', 'DESC')
+      .skip(skip)
+      .take(take)
+      .getManyAndCount()
 
     return {
       entities,

client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "client",
   "private": true,
-  "version": "2.1.1",
+  "version": "2.1.2",
   "type": "module",
   "scripts": {
     "dev": "vite",

client/src/components/logbook/Logbook.tsx

@@ -380,13 +380,13 @@ const Logbook: React.FC<unknown> = () => {
     setPageIndex
   } = table;
 
-  const getLogbookEntries = async (pageIndex?: number, pageSize?: number) => {
+  const getLogbookEntries = async (pageIndex: number, pageSize: number) => {
     try {
       dispatch({ type: 'SET_IS_LOADING', payload: true });
 
       const response: AxiosResponse = await httpClient.get(`api/logs`, {
         params: {
-          skip: pageIndex,
+          skip: pageIndex * pageSize,
           take: pageSize
         }
       });
@@ -527,6 +527,10 @@ const Logbook: React.FC<unknown> = () => {
     dispatch({ type: 'SET_PAGES', payload: pages })
   }, [state.totalEntries, state.pagination?.pageSize])
 
+  useEffect(() => {
+    console.log(state.pagination)
+  }, [state.pagination])
+
   return (
     <>
       <div className={`${screenSize === ScreenSize.SM ? 'mr-4 ml-4' : 'mr-10 ml-10'} grid grid-cols-12`}>
@@ -569,7 +573,7 @@ const Logbook: React.FC<unknown> = () => {
                   >
                     <option value={10}>10</option>
                     <option value={25}>25</option>
-                    <option value={3}>50</option>
+                    <option value={50}>50</option>
                     <option value={state.totalEntries}>All</option>
                   </select>
                 </label>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noahspan/flying",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "scripts": {
     "start": "node api/dist/main",
     "format": "prettier --write \"**/src/**/*.ts\" \"**/test/**/*.ts\"",