feat: fetching stages by city

odyseja-ui/src/routes/panel/stage/+page.svelte

@@ -1,13 +1,20 @@
 <script lang="ts">
     import {put} from "$lib/apiService";
     import type {Stages} from "$lib/types"
+    import {city} from "$lib/cityStore";
+    import {fetchStages} from "./stageService";
 
     export let data;
 
     let initialData = JSON.parse(JSON.stringify(data))
 
     $: isChanged = JSON.stringify(data) !== JSON.stringify(initialData);
 
+    city.subscribe(async currentCity => {
+        data = await fetchStages();
+        initialData = JSON.parse(JSON.stringify(data))
+    });
+
     function save() {
         saveStages(data.stages);
         initialData = JSON.parse(JSON.stringify(data))

odyseja-ui/src/routes/panel/stage/+page.ts

@@ -1,14 +1,8 @@
-import {get} from '$lib/apiService';
-import type { PageLoad } from './$types';
-import type {Stage, Stages} from "$lib/types";
+import type {PageLoad} from './$types';
+import {fetchStages} from "./stageService";
 
 export const load = (({params}) => {
     return fetchStages();
 }) satisfies PageLoad;
 
 
-async function fetchStages(): Promise<Stages> {
-    const data = await get('/stage')
-    const stages = data as Stage[]
-    return {stages: stages};
-}

odyseja-ui/src/routes/panel/stage/stageService.ts

@@ -0,0 +1,8 @@
+import type {Stage, Stages} from "$lib/types";
+import {get} from "$lib/apiService";
+
+export async function fetchStages(): Promise<Stages> {
+    const data = await get('/stage')
+    const stages = data as Stage[]
+    return {stages: stages};
+}

src/main/kotlin/odyseja/odysejapka/rest/StageController.kt

@@ -11,14 +11,9 @@ class StageController(
   private val stageService: StageService
 ) {
 
-  @GetMapping("{cityId}")
-  fun getStages(@PathVariable cityId: Int): List<Stage> {
-    return stageService.getStages(cityId)
-  }
-
-  @GetMapping
-  fun getStages(): List<Stage> {
-    return stageService.getStages()
+  @GetMapping()
+  fun getStages(@RequestParam(required = false) cityId: Int?): List<Stage> {
+    return cityId?.let { stageService.getStages(cityId) } ?: stageService.getStages()
   }
 
   @Secured("ROLE_ADMIN")