From f5f759ca0a100bf8a858ea4293c30f528571c3d4 Mon Sep 17 00:00:00 2001
From: Kevin Midboe <kevin.midboe@gmail.com>
Date: Sun, 27 Aug 2023 13:43:04 +0200
Subject: [PATCH] DTO interfaces for API responses.

---
 .../components/VerticalSensorDisplay.svelte   | 85 +++++++++++++------
 src/lib/interfaces/IRelaysDTO.ts              | 17 ++++
 src/lib/interfaces/ISensorDTO.ts              | 19 +++++
 src/lib/interfaces/IStateDTO.ts               | 15 ++++
 src/routes/+page.server.ts                    | 34 ++++----
 src/routes/+page.svelte                       |  6 +-
 6 files changed, 129 insertions(+), 47 deletions(-)
 create mode 100644 src/lib/interfaces/IRelaysDTO.ts
 create mode 100644 src/lib/interfaces/ISensorDTO.ts
 create mode 100644 src/lib/interfaces/IStateDTO.ts

diff --git a/src/lib/components/VerticalSensorDisplay.svelte b/src/lib/components/VerticalSensorDisplay.svelte
index eb11478..2c53943 100644
--- a/src/lib/components/VerticalSensorDisplay.svelte
+++ b/src/lib/components/VerticalSensorDisplay.svelte
@@ -1,22 +1,31 @@
 <script lang="ts">
-  import { onMount } from 'svelte'
-  import CardButton from "./CardButton.svelte";
-  import Activity from "../icons/Activity.svelte";
+  import { onMount } from 'svelte';
+  import CardButton from './CardButton.svelte';
+  import Activity from '../icons/Activity.svelte';
+  import { ISensorDTO } from '../interfaces/ISensorDTO';
+  import { IRelaysDTO } from '../interfaces/IRelaysDTO';
+  import { IStateDTO } from '../interfaces/IStateDTO';
 
-  export let inside;
-  export let outside;
+  export let inside: ISensorDTO;
+  export let outside: ISensorDTO;
+  export let relays: IRelaysDTO[] = [];
+  export let state: IStateDTO;
 
   let loadedTime: number = new Date().getTime();
   let currentTime: number = new Date().getTime();
   let autoReload = false;
-  const currentGoal = 18.5;
 
   function updateTime() {
     currentTime = new Date().getTime();
   }
 
   function flipCard(): void {
-    console.log("flip-a-delphia")
+    console.log('flip-a-delphia');
+  }
+
+  function tempToStateClass(temp: number | undefined) {
+    if (temp === undefined || !!isNaN(temp)) return 'idle';
+    return Number(temp) > 14 ? 'heating' : 'cooling';
   }
 
   onMount(() => setInterval(updateTime, 1000));
@@ -24,41 +33,47 @@
 </script>
 
 <div class="card">
+  <h1>Fridge sensors</h1>
   <CardButton>
-    <Activity on:click={flipCard} />
+    <Activity on:click="{flipCard}" />
   </CardButton>
 
   <h2>Current target temperature</h2>
   <div class="sensor-reading">
-    <div class="blue">
-      <span class="value">{currentGoal}</span>
+    <div class="{state.state}">
+      <span class="value">{state.goal}</span>
       <span class="unit">°C</span>
     </div>
-  </div>
-
-  <h2>Inside temperature</h2>
-  <div class="sensor-reading">
-    <div class="blue">
-      <span class="value">{inside?.temperature}</span>
-      <span class="unit">{inside?.temperature_unit}</span>
-    </div>
 
     <div>
-      <span class="value">{Math.floor(inside?.humidity)}</span>
+      <span class="value"></span>
+      <span class="unit">{state.state}</span>
+    </div>
+  </div>
+
+  <h2>Inside frigde temperature</h2>
+  <div class="sensor-reading">
+    <div class="{tempToStateClass(inside?.temperature)}">
+      <span class="value">{inside?.temperature || 0}</span>
+      <span class="unit">{inside?.temperature_unit || '°C'}</span>
+    </div>
+
+    <div>
+      <span class="value">{Math.floor(inside?.humidity || 0)}</span>
       <span class="unit">{inside?.humidity_unit || '%'}</span>
     </div>
   </div>
 
   <h2>Outside temperature</h2>
   <div class="sensor-reading">
-    <div class="red">
-      <span class="value">{outside?.temperature}</span>
-      <span class="unit">{outside?.temperature_unit}</span>
+    <div class="{tempToStateClass(outside?.temperature)}">
+      <span class="value">{outside?.temperature || 0}</span>
+      <span class="unit">{outside?.temperature_unit || '°C'}</span>
     </div>
 
     <div>
-      <span class="value">{Math.floor(outside?.humidity)}</span>
-      <span class="unit">{outside?.humidity_unit}</span>
+      <span class="value">{Math.floor(outside?.humidity || 0)}</span>
+      <span class="unit">{outside?.humidity_unit || '%'}</span>
     </div>
   </div>
 
@@ -70,14 +85,16 @@
 
   <div class="button-timer">
     <span>Updated {secondsSinceUpdate === 0 ? 'now' : secondsSinceUpdate + 's ago'}</span>
-
-
   </div>
 </div>
 
 <style lang="scss" module="scoped">
   @import '../../styles/media-queries.scss';
 
+  .card {
+    position: relative;
+  }
+
   h2 {
     font-size: 1.4rem;
     margin-bottom: 1.5rem;
@@ -92,6 +109,7 @@
   .sensor-reading {
     display: flex;
     justify-content: space-between;
+    flex-wrap: wrap;
     margin-bottom: 1.75rem;
 
     font-size: 2.2rem;
@@ -117,13 +135,24 @@
       margin-left: 0.3rem;
     }
 
-    .red {
+    .info {
+      font-size: 1rem;
+      width: 100%;
+      margin-bottom: 0;
+      font-weight: 500;
+    }
+
+    .heating {
       color: var(--red);
     }
 
-    .blue {
+    .cooling {
       color: var(--blue);
     }
+
+    .idle {
+      color: var(--green);
+    }
   }
 
   .button-timer {
diff --git a/src/lib/interfaces/IRelaysDTO.ts b/src/lib/interfaces/IRelaysDTO.ts
new file mode 100644
index 0000000..71944e9
--- /dev/null
+++ b/src/lib/interfaces/IRelaysDTO.ts
@@ -0,0 +1,17 @@
+enum Controls {
+  heating = 'heating',
+  cooling = 'cooling',
+  fan = 'fan',
+  lights = 'lights'
+}
+
+interface IRelaysDTO {
+  controls: Controls;
+  pin: number;
+  state: boolean;
+}
+
+export {
+  IRelaysDTO,
+  Controls
+}
\ No newline at end of file
diff --git a/src/lib/interfaces/ISensorDTO.ts b/src/lib/interfaces/ISensorDTO.ts
new file mode 100644
index 0000000..bb2036c
--- /dev/null
+++ b/src/lib/interfaces/ISensorDTO.ts
@@ -0,0 +1,19 @@
+enum Location {
+  inside = 'inside',
+  outside = 'outside'
+}
+
+interface ISensorDTO {
+  location: Location;
+  temperature?: number
+  temperature_unit?: string
+  humidity?: number
+  humidity_unit?: string
+  pressure?: number
+  pressure_unit?: string
+}
+
+export {
+  ISensorDTO,
+  Location
+}
\ No newline at end of file
diff --git a/src/lib/interfaces/IStateDTO.ts b/src/lib/interfaces/IStateDTO.ts
new file mode 100644
index 0000000..230ef52
--- /dev/null
+++ b/src/lib/interfaces/IStateDTO.ts
@@ -0,0 +1,15 @@
+enum State {
+  idle = 'idle',
+  cooling = 'cooling',
+  heating = 'heating'
+}
+
+interface IStateDTO {
+  goal: number;
+  state: State
+}
+
+export {
+  IStateDTO,
+  State
+}
\ No newline at end of file
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index e72ded5..0f56c61 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -1,34 +1,36 @@
 import { BREWLOGGER_HOST } from '$env/static/private';
 import type { PageServerLoad } from './$types';
+import type { ISensorDTO } from '../lib/interfaces/ISensorDTO'
+import { IRelaysDTO } from '../lib/interfaces/IRelaysDTO';
+import { IStateDTO } from '../lib/interfaces/IStateDTO';
 
 const sensorsUrl = `${BREWLOGGER_HOST}/api/sensors`;
 const relaysUrl = `${BREWLOGGER_HOST}/api/relays`;
+const stateUrl = `${BREWLOGGER_HOST}/api/regulator`;
 
-async function getSensors() {
-  return fetch(sensorsUrl)
+async function getFromEndpoint(endpoint: string)  {
+  return fetch(endpoint)
     .then((resp) => resp.json())
-    .then((response) => {
-      return response?.sensors;
-    });
-}
-
-async function getRelays() {
-  return fetch(relaysUrl)
-    .then((resp) => resp.json())
-    .then((response) => {
-      return response?.relays || [];
+    .catch((error) => {
+      console.error('Failed to fetch endpoint:', endpoint);
+      console.error(error);
+      return null
     });
 }
 
 export const load: PageServerLoad = async () => {
-  const [sensors, relays] = await Promise.all([getSensors(), getRelays()]);
+  const [sensorsResp, relaysResp, stateResp] = await Promise.all([getFromEndpoint(sensorsUrl), getFromEndpoint(relaysUrl), getFromEndpoint(stateUrl)]);
+  const sensors: ISensorDTO[] = sensorsResp?.sensors || []
+  const relays: IRelaysDTO[] = relaysResp?.relays || []
+  const state: IStateDTO = stateResp
 
-  const inside = sensors.find((sensor) => sensor.location === 'inside');
-  const outside = sensors.find((sensor) => sensor.location === 'outside');
+  const inside = sensors.find((sensor: ISensorDTO) => sensor.location === 'inside');
+  const outside = sensors.find((sensor: ISensorDTO) => sensor.location === 'outside');
 
   return {
     inside: inside || null,
     outside: outside || null,
-    relays
+    relays,
+    state
   };
 };
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 293b4d0..427cdb4 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import Logo from '../lib/components/Logo.svelte';
   import VerticalSensorDisplay from '../lib/components/VerticalSensorDisplay.svelte';
-  // import Livestream from '$lib/components/Livestream.svelte'
   import BrewProgress from '../lib/components/BrewProgress.svelte';
-  import type { PageData } from './$types';
   import RelayControls from '../lib/components/RelayControls.svelte';
+  import type { PageData } from './$types';
+  import type { IStateDTO } from '../lib/interfaces/IStateDTO';
 
   export let data: PageData;
   const { inside, outside, relays } = data;
@@ -15,7 +15,7 @@
 <div class="vertical-grid">
   <BrewProgress />
 
-  <VerticalSensorDisplay inside="{inside}" outside="{outside}" />
+  <VerticalSensorDisplay {inside} {outside} {relays} {state} />
 
   <RelayControls relays="{relays}" />