From 7bc94804e3222521297c2d86fd2a145b6de161a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= <jmm@yavook.de>
Date: Thu, 21 Sep 2023 00:45:57 +0000
Subject: [PATCH] remove DayStrModel

---
 api/advent22_api/routers/admin.py             | 15 ++++--------
 ui/src/components/admin/CalendarAssistant.vue | 24 +++++++++----------
 ui/src/components/admin/ConfigView.vue        | 16 ++++++-------
 ui/src/lib/api.ts                             |  5 ++--
 ui/src/plugins/advent22.ts                    |  2 +-
 5 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/api/advent22_api/routers/admin.py b/api/advent22_api/routers/admin.py
index 7104f03..478cd74 100644
--- a/api/advent22_api/routers/admin.py
+++ b/api/advent22_api/routers/admin.py
@@ -93,35 +93,28 @@ async def get_config_model(
     )
 
 
-class DayStrModel(BaseModel):
-    day: int
-    value: str
-
-
 @router.get("/day_parts")
 async def get_day_parts(
     _: None = Depends(require_admin),
     parts: dict[int, str] = Depends(get_all_parts),
-) -> list[DayStrModel]:
+) -> dict[int, str]:
     """
     Zuordnung der Lösungsteile zu den Tagen
     """
 
-    return [DayStrModel(day=day, value=part) for day, part in sorted(parts.items())]
+    return parts
 
 
 @router.get("/day_image_names")
 async def get_day_image_names(
     _: None = Depends(require_admin),
     image_names: dict[int, str] = Depends(get_all_image_names),
-) -> list[DayStrModel]:
+) -> dict[int, str]:
     """
     Zuordnung der verwendeten Bilder zu den Tagen
     """
 
-    return [
-        DayStrModel(day=day, value=name) for day, name in sorted(image_names.items())
-    ]
+    return image_names
 
 
 @router.get("/doors")
diff --git a/ui/src/components/admin/CalendarAssistant.vue b/ui/src/components/admin/CalendarAssistant.vue
index b053bb9..d599b1b 100644
--- a/ui/src/components/admin/CalendarAssistant.vue
+++ b/ui/src/components/admin/CalendarAssistant.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script lang="ts">
-import { DayStrModel } from "@/lib/api";
+import { Dictionary } from "@/lib/api";
 import { Options, Vue } from "vue-class-component";
 
 import MultiModal from "../MultiModal.vue";
@@ -62,7 +62,7 @@ import BulmaDrawer from "../bulma/Drawer.vue";
 })
 export default class extends Vue {
   public day_data: {
-    [day: number]: {
+    [day: string]: {
       part: string;
       image_name: string;
     };
@@ -76,24 +76,24 @@ export default class extends Vue {
 
   public on_open(ready: () => void, fail: () => void): void {
     Promise.all([
-      this.$advent22.api_get<DayStrModel[]>("admin/day_parts"),
-      this.$advent22.api_get<DayStrModel[]>("admin/day_image_names"),
+      this.$advent22.api_get<Dictionary>("admin/day_parts"),
+      this.$advent22.api_get<Dictionary>("admin/day_image_names"),
     ])
       .then(([day_parts, day_image_names]) => {
-        const _ensure_day = (day: number) => {
+        const _ensure_day = (day: string) => {
           if (!(day in this.day_data)) {
             this.day_data[day] = { part: "", image_name: "" };
           }
         };
 
-        for (const day_part of day_parts) {
-          _ensure_day(day_part.day);
-          this.day_data[day_part.day].part = day_part.value;
+        for (const day in day_parts) {
+          _ensure_day(day);
+          this.day_data[day].part = day_parts[day];
         }
 
-        for (const day_part of day_image_names) {
-          _ensure_day(day_part.day);
-          this.day_data[day_part.day].image_name = day_part.value;
+        for (const day in day_image_names) {
+          _ensure_day(day);
+          this.day_data[day].image_name = day_image_names[day];
         }
 
         ready();
@@ -101,7 +101,7 @@ export default class extends Vue {
       .catch(fail);
   }
 
-  public door_click(day: number) {
+  public door_click(day: unknown) {
     if (this.multi_modal === undefined) return;
     this.multi_modal.show_progress();
 
diff --git a/ui/src/components/admin/ConfigView.vue b/ui/src/components/admin/ConfigView.vue
index 6550ea8..d5c6b0e 100644
--- a/ui/src/components/admin/ConfigView.vue
+++ b/ui/src/components/admin/ConfigView.vue
@@ -51,13 +51,11 @@
 
               <dt>Türchen</dt>
               <dd>
-                <template
-                  v-for="(day_part, index) in day_parts"
-                  :key="`door-${index}`"
-                >
+                <template v-for="(part, day) in day_parts" :key="`door-${day}`">
                   <span>
-                    <template v-if="index > 0">, </template>
-                    {{ day_part.day }}
+                    <template v-if="Number(day) > 1">, </template>
+                    <span v-if="part == ''" class="tag is-warning">_</span>
+                    <template v-else>{{ part }}</template>
                   </span>
                 </template>
               </dd>
@@ -124,7 +122,7 @@
 </template>
 
 <script lang="ts">
-import { ConfigModel, DayStrModel, DoorsSaved } from "@/lib/api";
+import { ConfigModel, Dictionary, DoorsSaved } from "@/lib/api";
 import { DateTime } from "luxon";
 import { Options, Vue } from "vue-class-component";
 
@@ -169,7 +167,7 @@ export default class extends Vue {
       config_file: "sed diam nonumy",
     },
   };
-  public day_parts: DayStrModel[] = [];
+  public day_parts: Dictionary = {};
   public num_user_doors = 0;
   public next_door: number | null = null;
   public dav_credentials: Credentials = { username: "", password: "" };
@@ -185,7 +183,7 @@ export default class extends Vue {
   public on_open(ready: () => void, fail: () => void): void {
     Promise.all([
       this.$advent22.api_get<ConfigModel>("admin/config_model"),
-      this.$advent22.api_get<DayStrModel[]>("admin/day_parts"),
+      this.$advent22.api_get<Dictionary>("admin/day_parts"),
       this.$advent22.api_get<DoorsSaved>("user/doors"),
       this.$advent22.api_get<number | null>("user/next_door"),
     ])
diff --git a/ui/src/lib/api.ts b/ui/src/lib/api.ts
index 199172b..2b2f32d 100644
--- a/ui/src/lib/api.ts
+++ b/ui/src/lib/api.ts
@@ -23,9 +23,8 @@ export interface ConfigModel {
   };
 }
 
-export interface DayStrModel {
-  day: number;
-  value: string;
+export interface Dictionary {
+  [day: string]: string;
 }
 
 export interface DoorSaved {
diff --git a/ui/src/plugins/advent22.ts b/ui/src/plugins/advent22.ts
index 307d559..6b63ceb 100644
--- a/ui/src/plugins/advent22.ts
+++ b/ui/src/plugins/advent22.ts
@@ -24,7 +24,7 @@ export class Advent22 {
     return `//${window.location.hostname}:8000/api`;
   }
 
-  public name_door(day: number): string {
+  public name_door(day: unknown): string {
     return `Türchen ${day}`;
   }