From 6240297e84a842a92030cc470767f264d27489d3 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Tue, 15 Nov 2022 19:50:30 +0100
Subject: [PATCH] Pobieranie danych o sceneriach / caching

---
 src/components/OrderTrainPicker.vue | 35 ++++++++++++++++++++---------
 src/types/apiTypes.ts               |  2 --
 src/types/dataTypes.ts              | 18 ++++++++++++++-
 vite.config.ts                      | 19 +++++++++++++++-
 4 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/src/components/OrderTrainPicker.vue b/src/components/OrderTrainPicker.vue
index 60dee01..b96d9d6 100644
--- a/src/components/OrderTrainPicker.vue
+++ b/src/components/OrderTrainPicker.vue
@@ -27,13 +27,13 @@
       <div v-else>
         <b class="text--accent">Kliknij na gracza, aby wypełnić obecny rozkaz jego danymi</b>
 
-        <p>Gracze bez rozkładu jazdy</p>
+        <p>Gracze online bez RJ</p>
         <ul class="train-list">
           <li v-for="train in sceneryTrains" @click="fillOrder(train.trainNo)">
             <b>{{ train.trainNo }} | {{ train.driverName }}</b>
           </li>
 
-          <li class="no-trains" v-if="sceneryTrains.length == 0 && selectedSceneryName">Brak graczy na scenerii</li>
+          <li class="no-trains" v-if="sceneryTrains.length == 0 && selectedSceneryName">Brak graczy</li>
         </ul>
 
         <p>Aktywne rozkłady jazdy</p>
@@ -53,16 +53,17 @@
 import { defineComponent } from 'vue';
 import axios from 'axios';
 import { ApiSWDR, ApiStacjownik } from '../types/apiTypes';
-import { ISceneryData } from '../types/dataTypes';
 import { useStore } from '../store/store';
 import { currentFormattedDate } from '../utils/dateUtils';
+import { ISceneryOnline, ISceneryData } from '../types/dataTypes';
 
 export default defineComponent({
   name: 'order-train-picker',
 
   data() {
     return {
-      sceneriesOnline: [] as ISceneryData[],
+      sceneriesData: [] as ISceneryData[],
+      sceneriesOnline: [] as ISceneryOnline[],
       trainsOnline: [] as ApiStacjownik.IActiveTrain[],
 
       selectedSceneryName: null as string | null,
@@ -73,12 +74,16 @@ export default defineComponent({
     };
   },
 
+  created() {
+    this.fetchSceneriesData();
+  },
+
   activated() {
-    this.fetchData();
+    this.fetchOnlineData();
 
     this.refreshInterval = window.setInterval(() => {
-      this.fetchData();
-    }, 5 * 1000);
+      this.fetchOnlineData();
+    }, 35 * 1000);
   },
 
   deactivated() {
@@ -101,7 +106,9 @@ export default defineComponent({
     },
 
     dispatcherNameList() {
-      return [...new Set(this.sceneriesOnlinePL1.map((s) => s.dispatcherName))].sort((a, b) => (a < b ? -1 : 1));
+      return [...new Set(this.sceneriesOnlinePL1.map((s) => s.dispatcherName))].sort((a, b) =>
+        a.toLocaleLowerCase() < b.toLocaleLowerCase() ? -1 : 1
+      );
     },
 
     sceneryNameList() {
@@ -128,7 +135,15 @@ export default defineComponent({
   },
 
   methods: {
-    async fetchData() {
+    async fetchSceneriesData() {
+      const data: ISceneryData[] = await (await axios.get(`${import.meta.env['VITE_APP_API_URL']}/getSceneries`)).data;
+
+      if (!data) return;
+
+      this.sceneriesData = data;
+    },
+
+    async fetchOnlineData() {
       this.fetchSceneriesOnline();
       this.fetchTrainsOnline();
     },
@@ -154,7 +169,7 @@ export default defineComponent({
     },
 
     fillOrder(trainNo: number) {
-      if(!this.selectedDispatcherName || !this.selectedSceneryName) return;
+      if (!this.selectedDispatcherName || !this.selectedSceneryName) return;
 
       const chosenOrder = this.store[this.store.chosenOrderType];
       chosenOrder.header.trainNo = trainNo.toString();
diff --git a/src/types/apiTypes.ts b/src/types/apiTypes.ts
index 7930505..46e4181 100644
--- a/src/types/apiTypes.ts
+++ b/src/types/apiTypes.ts
@@ -1,5 +1,3 @@
-import { ISceneryData } from './dataTypes';
-
 export declare module ApiSWDR {
   export interface IStationsOnline {
     success: boolean;
diff --git a/src/types/dataTypes.ts b/src/types/dataTypes.ts
index 46fb74f..447000b 100644
--- a/src/types/dataTypes.ts
+++ b/src/types/dataTypes.ts
@@ -1,4 +1,4 @@
-export interface ISceneryData {
+export interface ISceneryOnline {
   dispatcherId: number;
   dispatcherName: string;
   dispatcherIsSupporter: boolean;
@@ -17,6 +17,21 @@ export interface ISceneryData {
   dispatcherRate: number;
 }
 
+export interface ISceneryData {
+  id: string;
+  name: string;
+  SUP: boolean;
+  authors: string;
+  availability: string;
+  checkpoints: string;
+  controlType: string;
+  lines: string;
+  project: string;
+  reqLevel: number;
+  routes: string;
+  signalType: string;
+  url: string;
+}
 // export interface ITrainData {
 //   trainNo: number;
 //   driverId: number;
@@ -35,3 +50,4 @@ export interface ISceneryData {
 //   station?: ISceneryData;
 // }
 
+
diff --git a/vite.config.ts b/vite.config.ts
index db8efdb..22c6009 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -5,7 +5,7 @@ import { VitePWA } from 'vite-plugin-pwa';
 
 export default defineConfig({
   server: {
-    port: 8081
+    port: 8081,
   },
   plugins: [
     vue(),
@@ -13,6 +13,22 @@ export default defineConfig({
       registerType: 'prompt',
       workbox: {
         globPatterns: ['**/*.{js,css,html,png,svg,img}'],
+        runtimeCaching: [
+          {
+            urlPattern: /^https:\/\/stacjownik-api-b9mrc\.ondigitalocean\.app\/api\/getSceneries/i,
+            handler: 'CacheFirst',
+            options: {
+              cacheName: 'sceneries-data-cache',
+              expiration: {
+                maxEntries: 250,
+                maxAgeSeconds: 60 * 60 * 24 * 7, // <== 7 days
+              },
+              cacheableResponse: {
+                statuses: [0, 200],
+              },
+            },
+          },
+        ],
       },
       devOptions: {
         enabled: true,
@@ -20,3 +36,4 @@ export default defineConfig({
     }),
   ],
 });
+