Reorder after and before

server/application-server/openapi.yaml

@@ -95,13 +95,13 @@ paths:
       - leaderboard
       operationId: getLeaderboard
       parameters:
-      - name: before
+      - name: after
         in: query
         required: false
         schema:
           type: string
           format: date-time
-      - name: after
+      - name: before
         in: query
         required: false
         schema:
@@ -254,9 +254,8 @@ components:
           type: string
         state:
           type: string
-          description: |-
-            State of the PullRequest.
-             Does not include the state of the merge.
+          description: "State of the PullRequest.\r\n Does not include the state of\
+            \ the merge."
           enum:
           - CLOSED
           - OPEN
@@ -410,15 +409,12 @@ components:
           description: Display name of the user.
         url:
           type: string
-          description: |-
-            Unique URL to the user's profile.
-             Not the website a user can set in their profile.
+          description: "Unique URL to the user's profile.\r\n Not the website a user\
+            \ can set in their profile."
         avatarUrl:
           type: string
-          description: |-
-            URL to the user's avatar.
-             If unavailable, a fallback can be generated from the login, e.g. on Github:
-             https://github.com/{login}.png
+          description: "URL to the user's avatar.\r\n If unavailable, a fallback can\
+            \ be generated from the login, e.g. on Github:\r\n https://github.com/{login}.png"
         type:
           type: string
           description: Type of the user. Used to distinguish between users and bots.

server/application-server/src/main/java/de/tum/in/www1/hephaestus/leaderboard/LeaderboardController.java

@@ -21,8 +21,8 @@ public LeaderboardController(LeaderboardService leaderboardService) {
     }
 
     @GetMapping
-    public ResponseEntity<List<LeaderboardEntry>> getLeaderboard(@RequestParam Optional<OffsetDateTime> before,
-            @RequestParam Optional<OffsetDateTime> after) {
-        return ResponseEntity.ok(leaderboardService.createLeaderboard(before, after));
+    public ResponseEntity<List<LeaderboardEntry>> getLeaderboard(@RequestParam Optional<OffsetDateTime> after,
+            @RequestParam Optional<OffsetDateTime> before) {
+        return ResponseEntity.ok(leaderboardService.createLeaderboard(after, before));
     }
 }

server/application-server/src/main/java/de/tum/in/www1/hephaestus/leaderboard/LeaderboardService.java

@@ -37,7 +37,7 @@ public LeaderboardService(UserService userService) {
         this.userService = userService;
     }
 
-    public List<LeaderboardEntry> createLeaderboard(Optional<OffsetDateTime> before, Optional<OffsetDateTime> after) {
+    public List<LeaderboardEntry> createLeaderboard(Optional<OffsetDateTime> after, Optional<OffsetDateTime> before) {
         logger.info("Creating leaderboard dataset");
 
         List<User> users = userService.getAllUsers();

webapp/src/app/core/modules/openapi/api/leaderboard.service.ts

@@ -96,25 +96,25 @@ export class LeaderboardService implements LeaderboardServiceInterface {
     }
 
     /**
-     * @param before 
      * @param after 
+     * @param before 
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getLeaderboard(before?: string, after?: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<Array<LeaderboardEntry>>;
-    public getLeaderboard(before?: string, after?: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<Array<LeaderboardEntry>>>;
-    public getLeaderboard(before?: string, after?: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<Array<LeaderboardEntry>>>;
-    public getLeaderboard(before?: string, after?: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
+    public getLeaderboard(after?: string, before?: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<Array<LeaderboardEntry>>;
+    public getLeaderboard(after?: string, before?: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<Array<LeaderboardEntry>>>;
+    public getLeaderboard(after?: string, before?: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<Array<LeaderboardEntry>>>;
+    public getLeaderboard(after?: string, before?: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
 
         let localVarQueryParameters = new HttpParams({encoder: this.encoder});
-        if (before !== undefined && before !== null) {
-          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
-            <any>before, 'before');
-        }
         if (after !== undefined && after !== null) {
           localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
             <any>after, 'after');
         }
+        if (before !== undefined && before !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>before, 'before');
+        }
 
         let localVarHeaders = this.defaultHeaders;
 

webapp/src/app/core/modules/openapi/api/leaderboard.serviceInterface.ts

@@ -27,9 +27,9 @@ export interface LeaderboardServiceInterface {
     /**
      * 
      * 
-     * @param before 
      * @param after 
+     * @param before 
      */
-    getLeaderboard(before?: string, after?: string, extraHttpRequestParams?: any): Observable<Array<LeaderboardEntry>>;
+    getLeaderboard(after?: string, before?: string, extraHttpRequestParams?: any): Observable<Array<LeaderboardEntry>>;
 
 }

webapp/src/app/core/modules/openapi/model/pull-request.ts

@@ -23,7 +23,7 @@ export interface PullRequest {
     title: string;
     url: string;
     /**
-     * State of the PullRequest.  Does not include the state of the merge.
+     * State of the PullRequest.   Does not include the state of the merge.
      */
     state: PullRequest.StateEnum;
     additions?: number;

webapp/src/app/core/modules/openapi/model/user.ts

@@ -29,11 +29,11 @@ export interface User {
      */
     name?: string;
     /**
-     * Unique URL to the user\'s profile.  Not the website a user can set in their profile.
+     * Unique URL to the user\'s profile.   Not the website a user can set in their profile.
      */
     url: string;
     /**
-     * URL to the user\'s avatar.  If unavailable, a fallback can be generated from the login, e.g. on Github:  https://github.com/{login}.png
+     * URL to the user\'s avatar.   If unavailable, a fallback can be generated from the login, e.g. on Github:   https://github.com/{login}.png
      */
     avatarUrl?: string;
     /**

webapp/src/app/home/home.component.ts

@@ -24,7 +24,7 @@ export class HomeComponent {
 
   query = injectQuery(() => ({
     queryKey: ['leaderboard', { after: this.after, before: this.before }],
-    queryFn: async () => lastValueFrom(this.leaderboardService.getLeaderboard(this.before(), this.after())),
+    queryFn: async () => lastValueFrom(this.leaderboardService.getLeaderboard(this.after(), this.before())),
     gcTime: Infinity
   }));
 }