From 11c85e57d6ee93166da480c1c29a217c0d82a754 Mon Sep 17 00:00:00 2001
From: Drew Taylor <69828061+drew-fisker@users.noreply.github.com>
Date: Thu, 14 Apr 2022 19:03:22 -0700
Subject: [PATCH] CEC-1256/CEC-1330 fixing filters length function (#137)

* fixing filters length function

* adding filters testing

* code smell

* code smells

* bug
---
 .../App/__snapshots__/App.test.js.snap        |  2 +-
 .../Details/__snapshots__/index.test.jsx.snap |  2 +-
 src/components/Cars/Status/Details/index.jsx  |  2 +-
 .../__snapshots__/DetailsTab.test.jsx.snap    |  2 +-
 src/components/Contexts/FleetContext.test.jsx | 19 +++++++++--
 .../Contexts/VehicleContext.test.jsx          | 19 +++++++++--
 .../Contexts/__mocks__/FleetContext.jsx       | 32 +++++++++----------
 .../Contexts/__mocks__/VehicleContext.jsx     | 18 ++++++++++-
 .../Details/__snapshots__/index.test.jsx.snap |  2 +-
 .../Fleets/Status/Details/index.jsx           |  2 +-
 .../__snapshots__/DetailsTab.test.jsx.snap    |  2 +-
 .../Status/__snapshots__/index.test.jsx.snap  |  2 +-
 .../Table/__snapshots__/index.test.jsx.snap   |  2 +-
 src/services/__mocks__/fleetsAPI.js           | 32 +++++++++----------
 src/services/__mocks__/vehiclesAPI.js         | 17 +++++++++-
 15 files changed, 108 insertions(+), 47 deletions(-)

diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index 8bca4a2..1e56e57 100644
--- a/src/components/App/__snapshots__/App.test.js.snap
+++ b/src/components/App/__snapshots__/App.test.js.snap
@@ -7839,7 +7839,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                               Filters
                             </b>
                             : 
-                            0
+                            3
                           </p>
                         </div>
                         <div
diff --git a/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap b/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap
index b5927fb..71c48c9 100644
--- a/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap
+++ b/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap
@@ -76,7 +76,7 @@ exports[`VehicleDetailsTab Render 1`] = `
                     Filters
                   </b>
                   : 
-                  0
+                  3
                 </p>
               </div>
               <div
diff --git a/src/components/Cars/Status/Details/index.jsx b/src/components/Cars/Status/Details/index.jsx
index 6aa472f..243151f 100644
--- a/src/components/Cars/Status/Details/index.jsx
+++ b/src/components/Cars/Status/Details/index.jsx
@@ -66,7 +66,7 @@ const MainForm = ({ vin }) => {
             <p><b>Max Memory Buffer Size</b>: {vehicle.canbus.max_mem_buffer_size ?? "Default"}</p>
             <p><b>Enabled</b>: {vehicle.canbus.data_logger_enabled.toString()}</p>
             <p><b>Max Disk Buffer Size</b>: {vehicle.canbus.max_disk_buffer_size ?? "Default"}</p>
-            <p><b>Filters</b>: {vehicle.canbus.filters ? vehicle.canbus.filters.length() : 0}</p>
+            <p><b>Filters</b>: {vehicle.canbus.filters ? vehicle.canbus.filters.length : 0}</p>
           </Grid>
         )}
         <Grid item md={12} className={classes.textCenterAlign}>
diff --git a/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap b/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap
index 9e3bd63..e6d8c28 100644
--- a/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap
+++ b/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap
@@ -85,7 +85,7 @@ exports[`DetailsTab Render 1`] = `
                       Filters
                     </b>
                     : 
-                    0
+                    3
                   </p>
                 </div>
                 <div
diff --git a/src/components/Contexts/FleetContext.test.jsx b/src/components/Contexts/FleetContext.test.jsx
index edc8e06..bfdf028 100644
--- a/src/components/Contexts/FleetContext.test.jsx
+++ b/src/components/Contexts/FleetContext.test.jsx
@@ -691,10 +691,25 @@ describe("FleetContext", () => {
   });
 });
 
+const expectedFilters = [
+  {
+    can_id: "123-456",
+    interval: 789
+  },
+  {
+    can_id: "1",
+    interval: 1000
+  },
+  {
+    can_id: "1000",
+    interval: 1
+  }
+]
+
 const expectedFleetData = {
   name: "US-WEST",
   log_level: "info",
-  canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
+  canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: expectedFilters },
   vehicles: ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"]
 }
 
@@ -702,7 +717,7 @@ const expectedFleetsData = [
   {
     name: "US-WEST",
     log_level: "info",
-    canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
+    canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: expectedFilters },
     vehicles: ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"]
   },
   {
diff --git a/src/components/Contexts/VehicleContext.test.jsx b/src/components/Contexts/VehicleContext.test.jsx
index cd538c7..c371cfe 100644
--- a/src/components/Contexts/VehicleContext.test.jsx
+++ b/src/components/Contexts/VehicleContext.test.jsx
@@ -319,6 +319,21 @@ describe("VehicleContext", () => {
   });
 });
 
+const expectedFilters = [
+  {
+    can_id: "123-456",
+    interval: 789
+  },
+  {
+    can_id: "1",
+    interval: 1000
+  },
+  {
+    can_id: "1000",
+    interval: 1
+  }
+]
+
 const expectedVehicleData = {
   vin: "3C4PDCBG0ET127145",
   year: 2021,
@@ -326,7 +341,7 @@ const expectedVehicleData = {
   trim: "Basic",
   ecu_list: "ECUA 2.0.0, ECUB 2.1.1",
   log_level: "info",
-  canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
+  canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: expectedFilters },
   connected: true,
 }
 
@@ -338,7 +353,7 @@ const expectedVehiclesData = [
     trim: "Basic",
     ecu_list: "ECUA 2.0.0, ECUB 2.1.1",
     log_level: "info",
-    canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
+    canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: expectedFilters },
     connected: true,
   },
   { vin: "1G1FP87S3GN100062", connected: true },
diff --git a/src/components/Contexts/__mocks__/FleetContext.jsx b/src/components/Contexts/__mocks__/FleetContext.jsx
index f6f7632..70afe26 100644
--- a/src/components/Contexts/__mocks__/FleetContext.jsx
+++ b/src/components/Contexts/__mocks__/FleetContext.jsx
@@ -1,15 +1,29 @@
 let busy = false;
+let fleetCANFilters = [
+  {
+    can_id: "123-456",
+    interval: 789
+  },
+  {
+    can_id: "1",
+    interval: 1000
+  },
+  {
+    can_id: "1000",
+    interval: 1
+  }
+]
 let fleet = {
   name: "US-WEST",
   log_level: "info",
-  canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
+  canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: fleetCANFilters },
   vehicles: ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"],
 }
 let fleets = [
   {
     name: "US-WEST",
     log_level: "info",
-    canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
+    canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: fleetCANFilters },
     vehicles: ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"]
   },
   {
@@ -28,20 +42,6 @@ let fleets = [
 let totalFleets = 3;
 let fleetVehicles = ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"];
 let totalFleetVehicles = 3;
-let fleetCANFilters = [
-  {
-    can_id: "123-456",
-    interval: 789
-  },
-  {
-    can_id: "1",
-    interval: 1000
-  },
-  {
-    can_id: "1000",
-    interval: 1
-  }
-]
 let totalFleetCANFilters = 3;
 
 export const FleetProvider = ({ children }) => {
diff --git a/src/components/Contexts/__mocks__/VehicleContext.jsx b/src/components/Contexts/__mocks__/VehicleContext.jsx
index d0a9d15..94c13d2 100644
--- a/src/components/Contexts/__mocks__/VehicleContext.jsx
+++ b/src/components/Contexts/__mocks__/VehicleContext.jsx
@@ -1,6 +1,22 @@
 import React from "react";
 
 let busy = false;
+
+const filters = [
+  {
+    can_id: "123-456",
+    interval: 789
+  },
+  {
+    can_id: "1",
+    interval: 1000
+  },
+  {
+    can_id: "1000",
+    interval: 1
+  }
+]
+
 let vehicle = {
   vin: "3C4PDCBG0ET127145",
   year: 2021,
@@ -8,7 +24,7 @@ let vehicle = {
   trim: "Basic",
   ecu_list: "ECUA 2.0.0, ECUB 2.1.1",
   log_level: "info",
-  canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
+  canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: filters },
 };
 let vehicles = [];
 let models = ["Ocean", "PEAR"];
diff --git a/src/components/Fleets/Status/Details/__snapshots__/index.test.jsx.snap b/src/components/Fleets/Status/Details/__snapshots__/index.test.jsx.snap
index 98e90f6..0211fa3 100644
--- a/src/components/Fleets/Status/Details/__snapshots__/index.test.jsx.snap
+++ b/src/components/Fleets/Status/Details/__snapshots__/index.test.jsx.snap
@@ -83,7 +83,7 @@ exports[`FleetDetailsTab Render 1`] = `
                     Filters
                   </b>
                   : 
-                  0
+                  3
                 </p>
               </div>
               <div
diff --git a/src/components/Fleets/Status/Details/index.jsx b/src/components/Fleets/Status/Details/index.jsx
index d1a5c59..9b5b31f 100644
--- a/src/components/Fleets/Status/Details/index.jsx
+++ b/src/components/Fleets/Status/Details/index.jsx
@@ -67,7 +67,7 @@ const MainForm = ({ name }) => {
             <p><b>Max Memory Buffer Size</b>: {fleet.canbus.max_mem_buffer_size ?? "Default"}</p>
             <p><b>Enabled</b>: {fleet.canbus.data_logger_enabled.toString()}</p>
             <p><b>Max Disk Buffer Size</b>: {fleet.canbus.max_disk_buffer_size ?? "Default"}</p>
-            <p><b>Filters</b>: {fleet.canbus.filters ? fleet.canbus.filters.length() : 0}</p>
+            <p><b>Filters</b>: {fleet.canbus.filters ? fleet.canbus.filters.length : 0}</p>
           </Grid>
         )}
         <Grid item md={12} className={classes.textCenterAlign}>
diff --git a/src/components/Fleets/Status/__snapshots__/DetailsTab.test.jsx.snap b/src/components/Fleets/Status/__snapshots__/DetailsTab.test.jsx.snap
index 50f7cea..694df0c 100644
--- a/src/components/Fleets/Status/__snapshots__/DetailsTab.test.jsx.snap
+++ b/src/components/Fleets/Status/__snapshots__/DetailsTab.test.jsx.snap
@@ -92,7 +92,7 @@ exports[`DetailsTab Render 1`] = `
                       Filters
                     </b>
                     : 
-                    0
+                    3
                   </p>
                 </div>
                 <div
diff --git a/src/components/Fleets/Status/__snapshots__/index.test.jsx.snap b/src/components/Fleets/Status/__snapshots__/index.test.jsx.snap
index 0b06fe9..199f26b 100644
--- a/src/components/Fleets/Status/__snapshots__/index.test.jsx.snap
+++ b/src/components/Fleets/Status/__snapshots__/index.test.jsx.snap
@@ -179,7 +179,7 @@ exports[`FleetStatus Render 1`] = `
                             Filters
                           </b>
                           : 
-                          0
+                          3
                         </p>
                       </div>
                       <div
diff --git a/src/components/Fleets/Table/__snapshots__/index.test.jsx.snap b/src/components/Fleets/Table/__snapshots__/index.test.jsx.snap
index 02ed9c4..5807135 100644
--- a/src/components/Fleets/Table/__snapshots__/index.test.jsx.snap
+++ b/src/components/Fleets/Table/__snapshots__/index.test.jsx.snap
@@ -285,7 +285,7 @@ exports[`FleetTable Render 1`] = `
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
                   >
-                    0
+                    3
                   </td>
                 </tr>
                 <tr
diff --git a/src/services/__mocks__/fleetsAPI.js b/src/services/__mocks__/fleetsAPI.js
index 591c0e4..64a610c 100644
--- a/src/services/__mocks__/fleetsAPI.js
+++ b/src/services/__mocks__/fleetsAPI.js
@@ -1,8 +1,23 @@
+const filters = [
+  {
+    can_id: "123-456",
+    interval: 789
+  },
+  {
+    can_id: "1",
+    interval: 1000
+  },
+  {
+    can_id: "1000",
+    interval: 1
+  }
+]
+
 const fleets = [
   {
     name: "US-WEST",
     log_level: "info",
-    canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
+    canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: filters },
     vehicles: ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"]
   },
   {
@@ -21,21 +36,6 @@ const fleets = [
 
 const vehicles = ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"];
 
-const filters = [
-  {
-    can_id: "123-456",
-    interval: 789
-  },
-  {
-    can_id: "1",
-    interval: 1000
-  },
-  {
-    can_id: "1000",
-    interval: 1
-  }
-]
-
 const fleetsAPI = {
   addFleet: async (fleet) => {
     fleets.push(fleet);
diff --git a/src/services/__mocks__/vehiclesAPI.js b/src/services/__mocks__/vehiclesAPI.js
index 40fcb13..ea3d879 100644
--- a/src/services/__mocks__/vehiclesAPI.js
+++ b/src/services/__mocks__/vehiclesAPI.js
@@ -1,3 +1,18 @@
+const filters = [
+  {
+    can_id: "123-456",
+    interval: 789
+  },
+  {
+    can_id: "1",
+    interval: 1000
+  },
+  {
+    can_id: "1000",
+    interval: 1
+  }
+]
+
 const data = [
   {
     vin: "3C4PDCBG0ET127145",
@@ -6,7 +21,7 @@ const data = [
     trim: "Basic",
     ecu_list: "ECUA 2.0.0, ECUB 2.1.1",
     log_level: "info",
-    canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
+    canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: filters },
   },
   { vin: "1G1FP87S3GN100062" },
   { vin: "1HGCG325XYA062256", year: 2021 },