feat: conflicts solved

MatejFrnka · Apr 13, 2024 · 1c2082c · 1c2082c
1 parent 271f275
commit 1c2082c
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 22 deletions.
diff --git a/frontend/sportsmatch-app/src/generated/api/index.ts b/frontend/sportsmatch-app/src/generated/api/index.ts
@@ -10,7 +10,6 @@ export type { OpenAPIConfig } from './core/OpenAPI';
 export type { AuthRequestDTO } from './models/AuthRequestDTO';
 export type { EventDTO } from './models/EventDTO';
 export { EventHistoryDTO } from './models/EventHistoryDTO';
-export type { Pageable } from './models/Pageable';
 export type { PlaceDTO } from './models/PlaceDTO';
 export type { RatingDTO } from './models/RatingDTO';
 export type { RequestEventDTO } from './models/RequestEventDTO';

diff --git a/frontend/sportsmatch-app/src/generated/api/models/Pageable.ts b/frontend/sportsmatch-app/src/generated/api/models/Pageable.ts
diff --git a/frontend/sportsmatch-app/src/generated/api/models/SportDTO.ts b/frontend/sportsmatch-app/src/generated/api/models/SportDTO.ts
@@ -6,5 +6,6 @@ export type SportDTO = {
     name?: string;
     emoji?: string;
     backgroundUImageURL?: string;
+    id?: number;
 };
 
diff --git a/frontend/sportsmatch-app/src/generated/api/services/EventsControllerService.ts b/frontend/sportsmatch-app/src/generated/api/services/EventsControllerService.ts
@@ -4,7 +4,6 @@
 /* eslint-disable */
 import type { EventDTO } from '../models/EventDTO';
 import type { EventHistoryDTO } from '../models/EventHistoryDTO';
-import type { Pageable } from '../models/Pageable';
 import type { RequestEventDTO } from '../models/RequestEventDTO';
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -73,6 +72,16 @@ export class EventsControllerService {
             },
         });
     }
+    /**
+     * @returns EventDTO OK
+     * @throws ApiError
+     */
+    public static getUpcomingMatches(): CancelablePromise<Array<EventDTO>> {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/api/v1/event/upcoming-matches',
+        });
+    }
     /**
      * @param sportsIds
      * @returns any OK
@@ -91,36 +100,48 @@ export class EventsControllerService {
     }
     /**
      * @param requestEventDto
-     * @param pageable
+     * @param page Zero-based page index (0..N)
+     * @param size The size of the page to be returned
+     * @param sort Sorting criteria in the format: property,(asc|desc). Default sort order is ascending. Multiple sort criteria are supported.
      * @returns EventDTO OK
      * @throws ApiError
      */
     public static getNearbyEvents(
         requestEventDto: RequestEventDTO,
-        pageable: Pageable,
+        page?: number,
+        size: number = 20,
+        sort?: Array<string>,
     ): CancelablePromise<Array<EventDTO>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/api/v1/event/nearby',
             query: {
                 'requestEventDTO': requestEventDto,
-                'pageable': pageable,
+                'page': page,
+                'size': size,
+                'sort': sort,
             },
         });
     }
     /**
-     * @param pageable
+     * @param page Zero-based page index (0..N)
+     * @param size The size of the page to be returned
+     * @param sort Sorting criteria in the format: property,(asc|desc). Default sort order is ascending. Multiple sort criteria are supported.
      * @returns EventHistoryDTO OK
      * @throws ApiError
      */
     public static getEventsHistory(
-        pageable: Pageable,
+        page?: number,
+        size: number = 20,
+        sort?: Array<string>,
     ): CancelablePromise<Array<EventHistoryDTO>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/api/v1/event/event-history',
             query: {
-                'pageable': pageable,
+                'page': page,
+                'size': size,
+                'sort': sort,
             },
         });
     }

diff --git a/frontend/sportsmatch-app/src/generated/api/services/SportControllerService.ts b/frontend/sportsmatch-app/src/generated/api/services/SportControllerService.ts
@@ -2,25 +2,30 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { Pageable } from '../models/Pageable';
 import type { SportDTO } from '../models/SportDTO';
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
 import { request as __request } from '../core/request';
 export class SportControllerService {
     /**
-     * @param pageable
+     * @param page Zero-based page index (0..N)
+     * @param size The size of the page to be returned
+     * @param sort Sorting criteria in the format: property,(asc|desc). Default sort order is ascending. Multiple sort criteria are supported.
      * @returns SportDTO OK
      * @throws ApiError
      */
     public static getSports(
-        pageable: Pageable,
+        page?: number,
+        size: number = 20,
+        sort?: Array<string>,
     ): CancelablePromise<Array<SportDTO>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/api/v1/sports/all',
             query: {
-                'pageable': pageable,
+                'page': page,
+                'size': size,
+                'sort': sort,
             },
         });
     }