Make submeters property mandatory

EG-A-S · Jan 21, 2022 · bc50cca · bc50cca
1 parent 199453f
commit bc50cca
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 26 deletions.
diff --git a/src/app/meter.ts b/src/app/meter.ts
@@ -2,5 +2,5 @@ export interface Meter {
   id: number;
   facilityId: number;
   name: string;
-  subMeters?: Meter[];
+  subMeters: Meter[] | undefined;
 }
diff --git a/src/app/services/meter-hiearchy-helpers.spec.ts b/src/app/services/meter-hiearchy-helpers.spec.ts
@@ -11,13 +11,13 @@ describe('MeterHierarchyHelpers', () => {
   describe('#findMeterWithId', () => {
     it('should find meter from top level', () => {
       expect(helpers.findMeterWithId(hierarchy, 9)).toEqual({
-        id: 9, facilityId: 101, name: 'm 8'
+        id: 9, facilityId: 101, name: 'm 8', subMeters: undefined
       });
     });
 
     it('should find meter recursively', () => {
       expect(helpers.findMeterWithId(hierarchy, 46)).toEqual({
-        id: 46, name: 'meter46', facilityId: 88
+        id: 46, name: 'meter46', facilityId: 88, subMeters: undefined
       });
     });
 
@@ -34,8 +34,8 @@ describe('MeterHierarchyHelpers', () => {
           facilityId: 4,
           name: 'mittari 5',
           subMeters: [
-            { id: 12, name: 'Meter 12', facilityId: 4 },
-            { id: 13, name: 'Meter 13', facilityId: 4 }
+            { id: 12, name: 'Meter 12', facilityId: 4, subMeters: undefined },
+            { id: 13, name: 'Meter 13', facilityId: 4, subMeters: undefined }
           ]
         },
         {
@@ -48,17 +48,18 @@ describe('MeterHierarchyHelpers', () => {
               name: 'M33',
               facilityId: 88,
               subMeters: [
-                { id: 45, name: 'meter45', facilityId: 88 },
-                { id: 46, name: 'meter46', facilityId: 88 },
-                { id: 48, name: 'meter48', facilityId: 88 }
+                { id: 45, name: 'meter45', facilityId: 88, subMeters: undefined },
+                { id: 46, name: 'meter46', facilityId: 88, subMeters: undefined },
+                { id: 48, name: 'meter48', facilityId: 88, subMeters: undefined }
               ]
             }
           ]
         },
         {
           id: 55,
           name: 'Mittari 55',
-          facilityId: 400
+          facilityId: 400,
+          subMeters: undefined,
         }
       ];
 
@@ -72,19 +73,21 @@ describe('MeterHierarchyHelpers', () => {
           facilityId: 4,
           name: 'mittari 5',
           subMeters: [
-            { id: 12, name: 'Meter 12', facilityId: 4 },
-            { id: 13, name: 'Meter 13', facilityId: 4 }
+            { id: 12, name: 'Meter 12', facilityId: 4, subMeters: undefined },
+            { id: 13, name: 'Meter 13', facilityId: 4, subMeters: undefined }
           ]
         },
         {
           id: 9,
           facilityId: 101,
-          name: 'm 8'
+          name: 'm 8',
+          subMeters: undefined
         },
         {
           id: 55,
           name: 'Mittari 55',
-          facilityId: 400
+          facilityId: 400,
+          subMeters: undefined
         }
       ];
 
@@ -98,13 +101,14 @@ describe('MeterHierarchyHelpers', () => {
           facilityId: 4,
           name: 'mittari 5',
           subMeters: [
-            { id: 13, name: 'Meter 13', facilityId: 4 }
+            { id: 13, name: 'Meter 13', facilityId: 4, subMeters: undefined }
           ]
         },
         {
           id: 9,
           facilityId: 101,
-          name: 'm 8'
+          name: 'm 8',
+          subMeters: undefined
         },
         {
           id: 11,
@@ -116,17 +120,18 @@ describe('MeterHierarchyHelpers', () => {
               name: 'M33',
               facilityId: 88,
               subMeters: [
-                { id: 45, name: 'meter45', facilityId: 88 },
-                { id: 46, name: 'meter46', facilityId: 88 },
-                { id: 48, name: 'meter48', facilityId: 88 }
+                { id: 45, name: 'meter45', facilityId: 88, subMeters: undefined },
+                { id: 46, name: 'meter46', facilityId: 88, subMeters: undefined },
+                { id: 48, name: 'meter48', facilityId: 88, subMeters: undefined }
               ]
             }
           ]
         },
         {
           id: 55,
           name: 'Mittari 55',
-          facilityId: 400
+          facilityId: 400,
+          subMeters: undefined
         }
       ];
 

diff --git a/src/app/services/meter-hiearchy-helpers.ts b/src/app/services/meter-hiearchy-helpers.ts
@@ -25,14 +25,15 @@ export function getExampleHierarchy(): Meter[] {
       facilityId: 4,
       name: 'mittari 5',
       subMeters: [
-        { id: 12, name: 'Meter 12', facilityId: 4 },
-        { id: 13, name: 'Meter 13', facilityId: 4 }
+        { id: 12, name: 'Meter 12', facilityId: 4, subMeters: undefined },
+        { id: 13, name: 'Meter 13', facilityId: 4, subMeters: undefined }
       ]
     },
     {
       id: 9,
       facilityId: 101,
-      name: 'm 8'
+      name: 'm 8',
+      subMeters: undefined,
     },
     {
       id: 11,
@@ -44,17 +45,18 @@ export function getExampleHierarchy(): Meter[] {
           name: 'M33',
           facilityId: 88,
           subMeters: [
-            { id: 45, name: 'meter45', facilityId: 88 },
-            { id: 46, name: 'meter46', facilityId: 88 },
-            { id: 48, name: 'meter48', facilityId: 88 }
+            { id: 45, name: 'meter45', facilityId: 88, subMeters: undefined },
+            { id: 46, name: 'meter46', facilityId: 88, subMeters: undefined },
+            { id: 48, name: 'meter48', facilityId: 88, subMeters: undefined }
           ]
         }
       ]
     },
     {
       id: 55,
       name: 'Mittari 55',
-      facilityId: 400
+      facilityId: 400,
+      subMeters: undefined,
     }
   ];
 }