chore: fix switches tests

mdvanes · May 23, 2024 · ee8ab35 · ee8ab35
1 parent 8d61cc8
commit ee8ab35
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 40 deletions.
diff --git a/apps/client/src/Components/Molecules/SwitchBarList/SwitchBarList.test.tsx b/apps/client/src/Components/Molecules/SwitchBarList/SwitchBarList.test.tsx
@@ -21,6 +21,7 @@ const mockRootState: MockRootState = {
                 dimLevel: null,
                 readOnly: false,
                 children: false,
+                origin: "domoticz",
             },
             {
                 idx: "4",
@@ -29,6 +30,7 @@ const mockRootState: MockRootState = {
                 status: "On",
                 dimLevel: null,
                 readOnly: false,
+                origin: "domoticz",
                 children: [
                     {
                         idx: "5",
@@ -38,6 +40,7 @@ const mockRootState: MockRootState = {
                         dimLevel: null,
                         readOnly: false,
                         children: false,
+                        origin: "domoticz",
                     },
                 ],
             },
@@ -49,6 +52,7 @@ const mockRootState: MockRootState = {
                 dimLevel: 30,
                 readOnly: true,
                 children: false,
+                origin: "domoticz",
             },
             {
                 idx: "7",
@@ -58,6 +62,7 @@ const mockRootState: MockRootState = {
                 dimLevel: 30,
                 readOnly: false,
                 children: false,
+                origin: "domoticz",
             },
             {
                 idx: "8",
@@ -67,6 +72,7 @@ const mockRootState: MockRootState = {
                 dimLevel: null,
                 readOnly: false,
                 children: false,
+                origin: "domoticz",
             },
         ],
         expanded: [],

diff --git a/apps/client/src/Components/Molecules/SwitchBarList/SwitchBarList_renderWith.test.tsx b/apps/client/src/Components/Molecules/SwitchBarList/SwitchBarList_renderWith.test.tsx
@@ -20,6 +20,7 @@ const mockRootState: MockRootState = {
                 dimLevel: null,
                 readOnly: false,
                 children: false,
+                origin: "domoticz",
             },
             {
                 idx: "4",
@@ -28,6 +29,7 @@ const mockRootState: MockRootState = {
                 status: "On",
                 dimLevel: null,
                 readOnly: false,
+                origin: "domoticz",
                 children: [
                     {
                         idx: "5",
@@ -37,6 +39,7 @@ const mockRootState: MockRootState = {
                         dimLevel: null,
                         readOnly: false,
                         children: false,
+                        origin: "domoticz",
                     },
                 ],
             },
@@ -48,6 +51,7 @@ const mockRootState: MockRootState = {
                 dimLevel: 30,
                 readOnly: true,
                 children: false,
+                origin: "domoticz",
             },
             {
                 idx: "7",
@@ -57,6 +61,7 @@ const mockRootState: MockRootState = {
                 dimLevel: 30,
                 readOnly: false,
                 children: false,
+                origin: "domoticz",
             },
             {
                 idx: "8",
@@ -66,6 +71,7 @@ const mockRootState: MockRootState = {
                 dimLevel: null,
                 readOnly: false,
                 children: false,
+                origin: "domoticz",
             },
         ],
         expanded: [],

diff --git a/apps/server/src/switches/switches.controller.spec.ts b/apps/server/src/switches/switches.controller.spec.ts
@@ -2,11 +2,16 @@ import { DomoticzTypeOptions } from "@homeremote/types";
 import { ConfigService } from "@nestjs/config";
 import { Test, TestingModule } from "@nestjs/testing";
 import * as Got from "got";
+import { AuthenticatedRequest } from "../login/LoginRequest.types";
 import { DomoticzSwitch, SwitchesController } from "./switches.controller";
 
 jest.mock("got");
 const gotSpy = jest.spyOn(Got, "default");
 
+const mockAuthenticatedRequest = {
+    user: { name: "someuser", id: 1 },
+} as AuthenticatedRequest;
+
 describe("Switches Controller", () => {
     let controller: SwitchesController;
     let configService: ConfigService;
@@ -42,7 +47,7 @@ describe("Switches Controller", () => {
         gotSpy.mockResolvedValue({
             body: JSON.stringify({ status: "OK", result: [mockSwitch] }),
         });
-        expect(await controller.getSwitches()).toEqual({
+        expect(await controller.getSwitches(mockAuthenticatedRequest)).toEqual({
             status: "received",
             switches: [
                 {
@@ -53,14 +58,15 @@ describe("Switches Controller", () => {
                     dimLevel: null,
                     readOnly: false,
                     children: false,
+                    origin: "domoticz",
                 },
             ],
         });
     });
 
     it("returns error status on failed /GET ", async () => {
         gotSpy.mockRejectedValue("Mock Server Down");
-        expect(await controller.getSwitches()).toEqual({
+        expect(await controller.getSwitches(mockAuthenticatedRequest)).toEqual({
             status: "error",
         });
     });
@@ -69,7 +75,7 @@ describe("Switches Controller", () => {
         gotSpy.mockResolvedValue({
             body: JSON.stringify({ status: "error" }),
         });
-        expect(await controller.getSwitches()).toEqual({
+        expect(await controller.getSwitches(mockAuthenticatedRequest)).toEqual({
             status: "error",
         });
     });
@@ -78,7 +84,7 @@ describe("Switches Controller", () => {
         gotSpy.mockResolvedValue({
             body: "not json",
         });
-        expect(await controller.getSwitches()).toEqual({
+        expect(await controller.getSwitches(mockAuthenticatedRequest)).toEqual({
             status: "error",
         });
     });

diff --git a/apps/server/src/switches/switches.controller.ts b/apps/server/src/switches/switches.controller.ts
@@ -77,6 +77,7 @@ type GetChildren = (
     SceneType: DomoticzType,
     SceneStatus: DomoticzStatus
 ) => Promise<HomeRemoteSwitch[] | false>;
+
 const getChildren: GetChildren = async (
     domoticzuri,
     SceneIdx,
@@ -149,45 +150,50 @@ export class SwitchesController {
     }
 
     getHaLightFavoritesAsSwitches = async (): Promise<HomeRemoteHaSwitch[]> => {
-        const haFavoritesResponse = await fetch(
-            `${this.haApiConfig.baseUrl}/api/states/light.favorites`,
-            {
-                headers: {
-                    Authorization: `Bearer ${this.haApiConfig.token}`,
-                },
-            }
-        );
-        const haFavoriteIds =
-            (await haFavoritesResponse.json()) as GetHaStatesResponse;
+        try {
+            const haFavoritesResponse = await fetch(
+                `${this.haApiConfig.baseUrl}/api/states/light.favorites`,
+                {
+                    headers: {
+                        Authorization: `Bearer ${this.haApiConfig.token}`,
+                    },
+                }
+            );
+            const haFavoriteIds =
+                (await haFavoritesResponse.json()) as GetHaStatesResponse;
 
-        const haStatesPromises = haFavoriteIds.attributes.entity_id.map(
-            async (entity) => {
-                const haStateResponse = await fetch(
-                    `${this.haApiConfig.baseUrl}/api/states/${entity}`,
-                    {
-                        headers: {
-                            Authorization: `Bearer ${this.haApiConfig.token}`,
-                        },
-                    }
-                );
-                return (await haStateResponse.json()) as GetHaStatesResponse;
-            }
-        );
-        const haStates = await Promise.all(haStatesPromises);
+            const haStatesPromises = haFavoriteIds.attributes.entity_id.map(
+                async (entity) => {
+                    const haStateResponse = await fetch(
+                        `${this.haApiConfig.baseUrl}/api/states/${entity}`,
+                        {
+                            headers: {
+                                Authorization: `Bearer ${this.haApiConfig.token}`,
+                            },
+                        }
+                    );
+                    return (await haStateResponse.json()) as GetHaStatesResponse;
+                }
+            );
+            const haStates = await Promise.all(haStatesPromises);
 
-        const haSwitches: HomeRemoteHaSwitch[] =
-            haStates.map<HomeRemoteHaSwitch>((entity) => ({
-                origin: "home-assistant",
-                dimLevel: null,
-                idx: entity.entity_id,
-                name: entity.attributes.friendly_name,
-                readOnly: false,
-                status: entity.state === "off" ? "Off" : "On",
-                type: "Light/Switch",
-                children: false,
-            }));
+            const haSwitches: HomeRemoteHaSwitch[] =
+                haStates.map<HomeRemoteHaSwitch>((entity) => ({
+                    origin: "home-assistant",
+                    dimLevel: null,
+                    idx: entity.entity_id,
+                    name: entity.attributes.friendly_name,
+                    readOnly: false,
+                    status: entity.state === "off" ? "Off" : "On",
+                    type: "Light/Switch",
+                    children: false,
+                }));
 
-        return haSwitches;
+            return haSwitches;
+        } catch (err) {
+            this.logger.error(`Can't get HaLightFavorites ${err}`);
+            return [];
+        }
     };
 
     @UseGuards(JwtAuthGuard)