From 02d9f1588e2bfe3aaa932802b8c0b39fe0c3df41 Mon Sep 17 00:00:00 2001 From: solderq35 Date: Thu, 18 Jan 2024 15:52:11 -0800 Subject: [PATCH 1/9] updated nash research --- backend/dependencies/nodejs/models/meter.js | 4 +- src/components/view/modals/download_data.vue | 4 +- src/store/chart.module.js | 8 +- src/store/chart_modifiers/line_bar/base.js | 6 + tests/assertedData/mock_allbuildings.json | 264 +++++++++---------- 5 files changed, 146 insertions(+), 140 deletions(-) diff --git a/backend/dependencies/nodejs/models/meter.js b/backend/dependencies/nodejs/models/meter.js index ebc6818a..5138c61a 100644 --- a/backend/dependencies/nodejs/models/meter.js +++ b/backend/dependencies/nodejs/models/meter.js @@ -73,8 +73,8 @@ class Meter { const map = { accumulated_real: 'Net Energy Usage (kWh)', - real_power: 'Real Power (W)', - reactive_power: 'Reactive Power (VAR)', + real_power: 'Real Power (kW)', + reactive_power: 'Reactive Power (kVAR)', apparent_power: 'Apparent Power (VA)', real_a: 'Real Power, Phase A (kW)', real_b: 'Real Power, Phase B (kW)', diff --git a/src/components/view/modals/download_data.vue b/src/components/view/modals/download_data.vue index 951f3fa7..0126787f 100644 --- a/src/components/view/modals/download_data.vue +++ b/src/components/view/modals/download_data.vue @@ -222,8 +222,8 @@ export default { let zip = new JSZip() const map = { accumulated_real: 'Net Energy Usage (kWh)', - real_power: 'Real Power (W)', - reactive_power: 'Reactive Power (VAR)', + real_power: 'Real Power (kW)', + reactive_power: 'Reactive Power (kVAR)', apparent_power: 'Apparent Power (VA)', real_a: 'Real Power, Phase A (kW)', real_b: 'Real Power, Phase B (kW)', diff --git a/src/store/chart.module.js b/src/store/chart.module.js index b2d02416..fb697852 100644 --- a/src/store/chart.module.js +++ b/src/store/chart.module.js @@ -241,8 +241,8 @@ const getters = { if (state.point) { const map = { accumulated_real: 'Net Energy Usage (kWh)', - real_power: 'Real Power (W)', - reactive_power: 'Reactive Power (VAR)', + real_power: 'Real Power (kW)', + reactive_power: 'Reactive Power (kVAR)', apparent_power: 'Apparent Power (VA)', real_a: 'Real Power, Phase A (kW)', real_b: 'Real Power, Phase B (kW)', @@ -286,8 +286,8 @@ const getters = { unitString (state) { const map = { accumulated_real: 'kWh', - real_power: 'W', - reactive_power: 'VAR', + real_power: 'kW', + reactive_power: 'kVAR', apparent_power: 'VA', real_a: 'kW', real_b: 'kW', diff --git a/src/store/chart_modifiers/line_bar/base.js b/src/store/chart_modifiers/line_bar/base.js index 3ce43ab9..70dcd02c 100644 --- a/src/store/chart_modifiers/line_bar/base.js +++ b/src/store/chart_modifiers/line_bar/base.js @@ -77,6 +77,12 @@ export default class LineBaseModifier { x: new Date((i + delta + offset) * 1000), y: accumulator }) + // console.log(accumulator) + // console.log(Math.abs(accumulator)) + // console.log(payload.point) + // Maybe use Math.abs(accumulator) to flip sign + // Maybe use payload.point to determine if we need to flip sign + // See PR for other comments } catch (error) { console.log(error) } diff --git a/tests/assertedData/mock_allbuildings.json b/tests/assertedData/mock_allbuildings.json index 043770f2..5eb24357 100644 --- a/tests/assertedData/mock_allbuildings.json +++ b/tests/assertedData/mock_allbuildings.json @@ -19,8 +19,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -92,8 +92,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -148,8 +148,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -204,8 +204,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -260,8 +260,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -316,8 +316,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -372,8 +372,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -428,8 +428,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -484,8 +484,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -540,8 +540,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -603,8 +603,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -666,8 +666,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -729,8 +729,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -792,8 +792,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -855,8 +855,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -918,8 +918,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -981,8 +981,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1044,8 +1044,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1107,8 +1107,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1180,8 +1180,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1236,8 +1236,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1299,8 +1299,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1362,8 +1362,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1435,8 +1435,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1491,8 +1491,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1554,8 +1554,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1617,8 +1617,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1690,8 +1690,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1763,8 +1763,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1819,8 +1819,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1903,8 +1903,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -1966,8 +1966,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2039,8 +2039,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2112,8 +2112,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2185,8 +2185,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2241,8 +2241,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2335,8 +2335,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2429,8 +2429,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2502,8 +2502,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2551,8 +2551,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2600,8 +2600,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2673,8 +2673,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2729,8 +2729,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2792,8 +2792,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2855,8 +2855,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2928,8 +2928,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -2999,8 +2999,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -3072,8 +3072,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -3145,8 +3145,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -3223,7 +3223,7 @@ { "label": "Voltage, Phase B-N (V)", "value": "vphase_bn" }, { "label": "Voltage, Phase A-C (V)", "value": "vphase_ac" }, { "label": "Voltage, Phase C-N (V)", "value": "vphase_cn" }, - { "label": "Real Power (W)", "value": "real_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, { "label": "Net Energy Usage (kWh)", "value": "accumulated_real" } ] } @@ -3256,8 +3256,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -3369,8 +3369,8 @@ { "label": "Power Factor, Phase B", "value": "pf_b" }, { "label": "Power Factor, Phase C", "value": "pf_c" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" } + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" } ] } ] @@ -3402,8 +3402,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -3475,8 +3475,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -3531,8 +3531,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -3594,8 +3594,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -3667,8 +3667,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -3740,8 +3740,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -3813,8 +3813,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -3869,8 +3869,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -3953,8 +3953,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -4016,8 +4016,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -4094,7 +4094,7 @@ { "label": "Voltage, Phase B-N (V)", "value": "vphase_bn" }, { "label": "Voltage, Phase A-C (V)", "value": "vphase_ac" }, { "label": "Voltage, Phase C-N (V)", "value": "vphase_cn" }, - { "label": "Real Power (W)", "value": "real_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, { "label": "Net Energy Usage (kWh)", "value": "accumulated_real" } ] } @@ -4127,8 +4127,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -4221,8 +4221,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -4294,8 +4294,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, @@ -4367,8 +4367,8 @@ "label": "Net Energy Usage (kWh)", "value": "accumulated_real" }, - { "label": "Real Power (W)", "value": "real_power" }, - { "label": "Reactive Power (VAR)", "value": "reactive_power" }, + { "label": "Real Power (kW)", "value": "real_power" }, + { "label": "Reactive Power (kVAR)", "value": "reactive_power" }, { "label": "Apparent Power (VA)", "value": "apparent_power" }, { "label": "Real Power, Phase A (kW)", "value": "real_a" }, { "label": "Real Power, Phase B (kW)", "value": "real_b" }, From cf2ab5db1b33161f68cf2aa57e87615f2dfb9478 Mon Sep 17 00:00:00 2001 From: solderq35 Date: Tue, 23 Jan 2024 14:37:33 -0800 Subject: [PATCH 2/9] remove negate from meter_group and operation from meter_group_relation --- backend/app/meter.js | 2 +- .../dependencies/nodejs/models/building.js | 8 +- backend/dependencies/nodejs/models/meter.js | 21 +- .../dependencies/nodejs/models/meter_group.js | 11 +- backend/tests/assertedData/meters_insert.sql | 154 ++--- backend/tests/buildTestDatabase.js | 2 - documents/backend/RDSEnergyData.puml | 247 ++++--- documents/frontend/VuexStore.puml | 617 +++++++++--------- src/store/building.module.js | 5 - src/store/chart_modifiers/line_bar/base.js | 8 +- src/store/meter.module.js | 10 - src/store/meter_group.module.js | 14 +- tests/assertedData/mock_allbuildings.json | 146 ++--- tests/assertedData/story.json | 3 +- 14 files changed, 598 insertions(+), 650 deletions(-) diff --git a/backend/app/meter.js b/backend/app/meter.js index 41fb979d..86a232f5 100644 --- a/backend/app/meter.js +++ b/backend/app/meter.js @@ -194,7 +194,7 @@ exports.put = async (event, context) => { let response = new Response(event) let user = new User(event, response) try { - await Meter(event.body.id).update(event.body.name, event.body.classInt, event.body.negate, user) + await Meter(event.body.id).update(event.body.name, event.body.classInt, user) } catch (error) { response.body = error.message response.status = 400 diff --git a/backend/dependencies/nodejs/models/building.js b/backend/dependencies/nodejs/models/building.js index c667aa89..1d87ab4b 100644 --- a/backend/dependencies/nodejs/models/building.js +++ b/backend/dependencies/nodejs/models/building.js @@ -158,8 +158,7 @@ class Building { meter_groups.default as meter_group_default, meters.name as meter_name, meters.id as meter_id, - meters.class as meter_class, - meter_group_relation.operation as meter_negate + meters.class as meter_class FROM buildings LEFT JOIN meter_groups on buildings.id = meter_groups.building_id_2 LEFT JOIN meter_group_relation on meter_groups.id = meter_group_relation.group_id @@ -191,8 +190,7 @@ class Building { queryJson[row.id].meterGroups[row.meter_group_id].meters[row.meter_id] = { name: row.meter_name, - classInt: row.meter_class, - negate: row.meter_negate === 0 + classInt: row.meter_class } } @@ -204,7 +202,7 @@ class Building { for (let meterKey of Object.keys(queryJson[key].meterGroups[groupKey].meters)) { let meterJson = queryJson[key].meterGroups[groupKey].meters[meterKey] let meter = new Meter(meterKey) - meter.set(meterJson.name, meterJson.classInt, meterJson.negate) + meter.set(meterJson.name, meterJson.classInt) meters.push(meter) } diff --git a/backend/dependencies/nodejs/models/meter.js b/backend/dependencies/nodejs/models/meter.js index 5138c61a..616a9f2b 100644 --- a/backend/dependencies/nodejs/models/meter.js +++ b/backend/dependencies/nodejs/models/meter.js @@ -18,7 +18,6 @@ class Meter { this.name = '' this.address = address this.classInt = 0 - this.negate = 0 this.type = '' this.points = [] } @@ -42,16 +41,13 @@ class Meter { this.name = row[0]['name'] this.address = row[0]['address'] this.classInt = row[0]['class'] - this.negate = row[0]['negate'] === 1 - this.calcProps() return this } - set(name, classInt, negate) { + set(name, classInt) { this.name = name this.classInt = classInt - this.negate = negate this.calcProps() } @@ -131,7 +127,6 @@ class Meter { name: this.name, address: this.address, classInt: this.classInt, - negate: this.negate, type: this.type, points: this.points } @@ -391,30 +386,27 @@ class Meter { } } - async update(name, classInt, negate, user) { + async update(name, classInt, user) { if (user.data.privilege <= 3) { throw new Error('Need escalated privileges') } await DB.connect() - await DB.query('UPDATE meters SET name = ?, class = ?, negate = ? WHERE id = ?', [name, classInt, negate, this.id]) + await DB.query('UPDATE meters SET name = ?, class = ? WHERE id = ?', [name, classInt, this.id]) this.name = name this.classInt = classInt - this.negate = negate } - static async create(name, address, classInt, negate = 0) { + static async create(name, address, classInt) { await DB.connect() - let returnRow = await DB.query('INSERT INTO meters (name, address, class, negate) values (?, ?, ?, ?)', [ + let returnRow = await DB.query('INSERT INTO meters (name, address, class) values (?, ?, ?)', [ name, address, - classInt, - negate + classInt ]) let meter = new Meter(returnRow.insertId) meter.name = name meter.address = address meter.class = classInt - meter.negate = negate return meter } @@ -429,7 +421,6 @@ class Meter { meter.name = meterQ['name'] meter.address = meterQ['address'] meter.classInt = meterQ['class'] - meter.negate = meterQ['negate'] === 1 meter.calcProps() r.push(meter.data) } diff --git a/backend/dependencies/nodejs/models/meter_group.js b/backend/dependencies/nodejs/models/meter_group.js index 94495126..532a5a7c 100644 --- a/backend/dependencies/nodejs/models/meter_group.js +++ b/backend/dependencies/nodejs/models/meter_group.js @@ -58,11 +58,7 @@ class MeterGroup { this.meters = [] for (let meter of meters) { // this.meters.push((new Meter(meter)).get()) - DB.query('INSERT INTO meter_group_relation (meter_id, group_id, operation) VALUES (?, ?, ?)', [ - meter.id, - this.id, - meter.operation - ]) + DB.query('INSERT INTO meter_group_relation (meter_id, group_id) VALUES (?, ?)', [meter.id, this.id]) } // this.meters = await Promise.all(this.meters) return this @@ -125,10 +121,9 @@ class MeterGroup { let meterPromises = [] for (let meter of meters) { meterPromises.push( - DB.query('INSERT INTO meter_group_relation (meter_id, group_id, operation) VALUES (?, ?, ?)', [ + DB.query('INSERT INTO meter_group_relation (meter_id, group_id) VALUES (?, ?)', [ meter.id, - insertRow['insertId'], - meter.operation + insertRow['insertId'] ]) ) } diff --git a/backend/tests/assertedData/meters_insert.sql b/backend/tests/assertedData/meters_insert.sql index 945fda46..cd5b25d8 100644 --- a/backend/tests/assertedData/meters_insert.sql +++ b/backend/tests/assertedData/meters_insert.sql @@ -1,77 +1,77 @@ -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (1,'Tebeau Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (2,'McNary Complex Master Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (3,'Valley Library Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (4,'Sackett Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (5,'Dixon Electricity','e',1,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (6,'McNary Hall Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (7,'Dixon Steam','s',NULL,4444); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (8,'Memorial Union West Electricity (2000A)','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (9,'Memorial Union East Electricity (1000A)','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (10,'Arnold Dining Electrical Main','e',NULL,5); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (11,'Central feeder distribution panel (SDP-1)','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (12,'My New Device','e',NULL,4025); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (13,'Bloss Hall Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (14,'West mechanical room distribution panel (SD-W)','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (15,'Filnley Hall Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (16,'Arnold Dining Chiller Electricity','e',NULL,2); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (17,'My New Device','e',NULL,4025); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (18,'Halsell Hall Electricity','e',NULL,4045); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (19,'Internal I/O','e',NULL,27); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (20,'4M-1A','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (21,'X-3','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (22,'4L-1A','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (23,'4M-PHA','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (24,'ATS-LS','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (25,'SPARE 100A','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (26,'SPARE 225A','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (27,'Internal I/O','e',NULL,27); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (28,'ILLC Electricity','e',NULL,82); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (29,'Student Experience Center Steam','s',NULL,4444); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (30,'Student Experience Center Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (31,'Nash 1500 Amp Electrical','e',1,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (32,'Nash 3000 Amp Electrical','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (33,'4000A service','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (34,'2000A Service','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (35,'Weniger South Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (36,'Milne South Electrical','e',1,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (37,'Milne North Electrical','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (38,'Buxton Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (39,'Hawley Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (40,'Dryden Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (41,'Callahan Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (42,'Wilson Electricity','e',1,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (43,'Poling Electricity','e',NULL,4045); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (44,'West Hall Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (45,'Cauthorn Hall Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (46,'West Dining','e',NULL,2); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (47,'Gill','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (48,'Internal I/O','e',NULL,27); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (49,'Milam Electricity','e',1,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (50,'CH2MHill Alumni Center Electricity Old','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (51,'CH2MHill Alumni Center Electricity New','e',NULL,2); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (52,'CH2MHill Alumni Center Modhopper','g',NULL,17); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (53,'Buxton Electricity','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (54,NULL,NULL,NULL,NULL); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (55,'Main Johnson Hall','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (56,'X-7','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (57,'X-9','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (58,'S4P-PHA','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (59,'X-10','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (60,'S4P-1A','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (61,'SPARE 200A','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (62,'Wave Tank # 1','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (63,'Wave Tank # 2','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (64,'Wave Tank # 3','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (65,'Wave Tank # 4','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (66,'Wave Tank HVAC','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (67,'Building Main','e',NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (68,'Orchard Court',NULL,NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (69,'West Side Wave Tank',NULL,1,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (70,'Main Pump Disconnect',NULL,NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (71,'Wave Machine',NULL,NULL,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (72,'Kelley Steam','s',NULL,4444); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (73,'Nash Steam','s',NULL,4444); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (75,'Test Meter',NULL,0,2); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (76,'Test Meter',NULL,0,2); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (77,'Valley Library Electric',NULL,0,48); -INSERT INTO `` (`id`,`name`,`type`,`negate`,`class`) VALUES (78,'Red Lion',NULL,0,4444); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (1,'Tebeau Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (2,'McNary Complex Master Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (3,'Valley Library Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (4,'Sackett Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (5,'Dixon Electricity','e',1,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (6,'McNary Hall Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (7,'Dixon Steam','s',4444); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (8,'Memorial Union West Electricity (2000A)','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (9,'Memorial Union East Electricity (1000A)','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (10,'Arnold Dining Electrical Main','e',5); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (11,'Central feeder distribution panel (SDP-1)','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (12,'My New Device','e',4025); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (13,'Bloss Hall Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (14,'West mechanical room distribution panel (SD-W)','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (15,'Filnley Hall Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (16,'Arnold Dining Chiller Electricity','e',2); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (17,'My New Device','e',4025); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (18,'Halsell Hall Electricity','e',4045); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (19,'Internal I/O','e',27); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (20,'4M-1A','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (21,'X-3','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (22,'4L-1A','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (23,'4M-PHA','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (24,'ATS-LS','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (25,'SPARE 100A','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (26,'SPARE 225A','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (27,'Internal I/O','e',27); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (28,'ILLC Electricity','e',82); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (29,'Student Experience Center Steam','s',4444); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (30,'Student Experience Center Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (31,'Nash 1500 Amp Electrical','e',1,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (32,'Nash 3000 Amp Electrical','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (33,'4000A service','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (34,'2000A Service','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (35,'Weniger South Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (36,'Milne South Electrical','e',1,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (37,'Milne North Electrical','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (38,'Buxton Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (39,'Hawley Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (40,'Dryden Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (41,'Callahan Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (42,'Wilson Electricity','e',1,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (43,'Poling Electricity','e',4045); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (44,'West Hall Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (45,'Cauthorn Hall Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (46,'West Dining','e',2); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (47,'Gill','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (48,'Internal I/O','e',27); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (49,'Milam Electricity','e',1,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (50,'CH2MHill Alumni Center Electricity Old','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (51,'CH2MHill Alumni Center Electricity New','e',2); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (52,'CH2MHill Alumni Center Modhopper','g',17); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (53,'Buxton Electricity','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (54,NULL); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (55,'Main Johnson Hall','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (56,'X-7','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (57,'X-9','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (58,'S4P-PHA','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (59,'X-10','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (60,'S4P-1A','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (61,'SPARE 200A','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (62,'Wave Tank # 1','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (63,'Wave Tank # 2','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (64,'Wave Tank # 3','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (65,'Wave Tank # 4','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (66,'Wave Tank HVAC','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (67,'Building Main','e',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (68,'Orchard Court',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (69,'West Side Wave Tank',1,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (70,'Main Pump Disconnect',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (71,'Wave Machine',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (72,'Kelley Steam','s',4444); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (73,'Nash Steam','s',4444); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (75,'Test Meter',0,2); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (76,'Test Meter',0,2); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (77,'Valley Library Electric',0,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (78,'Red Lion',0,4444); diff --git a/backend/tests/buildTestDatabase.js b/backend/tests/buildTestDatabase.js index 8a04af42..1c968572 100644 --- a/backend/tests/buildTestDatabase.js +++ b/backend/tests/buildTestDatabase.js @@ -78,7 +78,6 @@ DB.beginTransaction(err => { \`id\` INTEGER NOT NULL AUTO_INCREMENT, \`meter_id\` INTEGER, \`group_id\` INTEGER, - \`operation\` INTEGER, PRIMARY KEY (\`id\`) );` @@ -87,7 +86,6 @@ DB.beginTransaction(err => { \`name\` TEXT, \`address\` char(16) DEFAULT NULL, \`type\` TEXT, - \`negate\` INTEGER, \`class\` INTEGER, PRIMARY KEY (\`id\`) );` diff --git a/documents/backend/RDSEnergyData.puml b/documents/backend/RDSEnergyData.puml index 59c791e3..d57dae88 100644 --- a/documents/backend/RDSEnergyData.puml +++ b/documents/backend/RDSEnergyData.puml @@ -1,124 +1,123 @@ -@startuml RDS - -entity "Alerts" as alerts { - id: integer <> - onid: string - point: string - lower_bounds: integer - upper_bounds: integer -} - -entity "Charts" as charts { - id: integer <> - block_id: integer <> - group_id: integer <> - name: string - point: string - meter: integer -} - -entity "Blocks" as blocks { - id: integer <> - date_start: datetime - date_end: datetime - graph_type: integer - name: string - date_interval: integer - interval_unit: string -} - -entity "Buildings" as buildings { - id: integer <> - building_id: hash - group: string -} - -entity "Campaign Groups" as campaign_groups { - id: integer <> - goal: integer - building_id: integer - campaign_id: integer -} - -entity "Campaigns" as campaigns { - id: integer <> - date_start: string - date_end: string - compare_start: string - compare_end: string - media: string -} - -entity "Data" as data { - id: integer <> - time: datettime - meter_id: integer - accumulated_real: integer - real_power: float - reactive_power: float - apparent_power: float - real_a: float - real_b: float - real_c: float - reactive_a: float - reactive_b: float - reactive_c: float - apparent_a: float - apparent_b: float - apparent_c: float - pf_a: float - pf_b: float - pf_c: float - vphase_ab: float - vphase_bc: float - vphase_ac: float - vphase_an: float - vphase_bn: float - vphase_cn: float - cphase_a: float - cphase_b: float - cphase_c: float - cubic_feet: integer - maximum: integer - minimum: integer - instant: integer - rate: integer - total: integer - input: integer -} - -entity "Meter Group Relation" as meter_group_relation { - id: integer - meter_id: integer - group_id: integer - operation: integer -} - -entity "Meter Groups" as meter_groups { - id: integer <> - name: string - building_id: integer <> - -} - -entity "Meters" as meters { - id: integer <> - name: string - address: string - class: integer -} - - - -meter_group_relation -up-> meter_groups -meter_group_relation -> meters -meters -> data -buildings <- meter_groups - -campaign_groups -down-> campaigns -buildings -down-> campaign_groups - -blocks -> charts -charts -> meter_groups - -@enduml +@startuml RDS + +entity "Alerts" as alerts { + id: integer <> + onid: string + point: string + lower_bounds: integer + upper_bounds: integer +} + +entity "Charts" as charts { + id: integer <> + block_id: integer <> + group_id: integer <> + name: string + point: string + meter: integer +} + +entity "Blocks" as blocks { + id: integer <> + date_start: datetime + date_end: datetime + graph_type: integer + name: string + date_interval: integer + interval_unit: string +} + +entity "Buildings" as buildings { + id: integer <> + building_id: hash + group: string +} + +entity "Campaign Groups" as campaign_groups { + id: integer <> + goal: integer + building_id: integer + campaign_id: integer +} + +entity "Campaigns" as campaigns { + id: integer <> + date_start: string + date_end: string + compare_start: string + compare_end: string + media: string +} + +entity "Data" as data { + id: integer <> + time: datettime + meter_id: integer + accumulated_real: integer + real_power: float + reactive_power: float + apparent_power: float + real_a: float + real_b: float + real_c: float + reactive_a: float + reactive_b: float + reactive_c: float + apparent_a: float + apparent_b: float + apparent_c: float + pf_a: float + pf_b: float + pf_c: float + vphase_ab: float + vphase_bc: float + vphase_ac: float + vphase_an: float + vphase_bn: float + vphase_cn: float + cphase_a: float + cphase_b: float + cphase_c: float + cubic_feet: integer + maximum: integer + minimum: integer + instant: integer + rate: integer + total: integer + input: integer +} + +entity "Meter Group Relation" as meter_group_relation { + id: integer + meter_id: integer + group_id: integer +} + +entity "Meter Groups" as meter_groups { + id: integer <> + name: string + building_id: integer <> + +} + +entity "Meters" as meters { + id: integer <> + name: string + address: string + class: integer +} + + + +meter_group_relation -up-> meter_groups +meter_group_relation -> meters +meters -> data +buildings <- meter_groups + +campaign_groups -down-> campaigns +buildings -down-> campaign_groups + +blocks -> charts +charts -> meter_groups + +@enduml diff --git a/documents/frontend/VuexStore.puml b/documents/frontend/VuexStore.puml index 59922cf9..11e49c17 100644 --- a/documents/frontend/VuexStore.puml +++ b/documents/frontend/VuexStore.puml @@ -1,311 +1,308 @@ -@startuml VuexStore -allow_mixing - -class Alert { - --State-- - + id: integer - + path: string - + promise: Promise - + lowThreshold: float - + highThreshold: float - + meterGroup: string - --Getters-- - + id() - + path() - + promise() - + lowThreshold() - + highThreshold() - + meterGroup() - --Mutations-- - + id(integer) - + path(string) - + promise(Promise) - + lowThreshold(integer) - + highThreshold(integer) - + meterGroup(string) - --Actions-- - + changeAlert(Object) -} - -class Block { - --State-- - + path: string - + promise: Promise - + name: string - + dateInterval: integer - + intervalUnit: string - + graphType: intger - + dateStart: integer - + dateEnd: integer - + id: integer - + chartColors: array - --Getters-- - + path() - + promise() - + name() - + dateInterval() - + intervalUnit() - + graphType() - + dateStart() - + dateEnd() - + id() - + chartColors() - .... - + charts() - --Mutations-- - + path(string) - + promise(Promise) - + name(string) - + dateInterval(integer) - + intervalUnit(string) - + graphType(integer) - + dateStart(integer) - + dateEnd(integer) - + id(integer) - + chartColors(array) - --Actions-- - + loadChart(integer) - + changeBlock(integer) - + loadDefault(Object) - + getData() -} - -class Building { - --State-- - + path: string - + promise: Promise - + name: string - + group: string - + image: string - + geoJSON: Object - + id: integer - --Getters-- - + path() - + promise() - + name() - + group() - + image() - + geoJSON() - + id() - .... - + meterGroups() - + blocks() - --Mutations-- - + path(string) - + promise(Promise) - + name(string) - + group(string) - + image(string) - + geoJSON(Object) - + id(integer) - --Actions-- - + loadMeterGroup(Object) - + loadDefaultBlocks() -} - -class Campaign { - --State-- - + path: string - + promise: Promise - + buildings: array - + name: string - + id: integer - + image: string - + dateStart: integer - + dateEnd: integer - + compareStart: integer - + compareEnd: integer - --Getters-- - + path() - + promise() - + buildings() - + dateStart() - + dateEnd() - + compareStart() - + compareEnd() - --Mutations-- - + path(string) - + promise(Promise) - + addBuilding(string) - + name(string) - + id(integer) - + image(string) - --Actions-- - + changeCampaign(integer) -} - -class Chart { - --State-- - + name: string - + point: string - + building: string - + id: integer - + meterGroupPath: string - + path: string - + color: hexcode - --Getters-- - + name() - + point() - + building() - + id() - + meterGroupPath() - + path() - + color() - .... - + pointString() - + unitString() - --Mutations-- - + name(string) - + point(string) - + building(string) - + id(integer) - + meterGroupPath(string) - + path(string) - + color(integer) - --Actions-- - + getData(Object) - + changeChart(integer) -} - -class Map { - --State-- - + path: string - + promise: Promise - --Getters-- - + path() - + promise() - .... - + building(integer) - + buildings() - + campaigns() - + meterGroup(integer) - --Mutations-- - + path(string) - + promise(Promise) - --Actions-- - + loadBuilding(Object) - + loadCampaign(Object) - + loadMap() -} - -class MeterGroup { - --State-- - + path: string - + promise: Promise - + name: string - + default: boolean - + id: integer - --Getters-- - + path() - + promise() - + name() - + default() - + id() - .... - + meters() - --Mutations-- - + path(string) - + promise(Promise) - + name(string) - + default(boolean) - + id(integer) - --Actions-- - + getData(Object) - + changeGroup(integer) -} - -class Meter { - --State-- - + id: integer - + path: string - + promise: Promise - + classInt: integer - + address: string - + negate: boolean - --Getters-- - + id() - + path() - + promise() - + classInt() - + address() - + negate() - .... - + type() - --Mutations-- - + id(integer) - + path(string) - + promise(Promise) - + classInt(integer) - + address(string) - + negate(boolean) - --Actions-- - + changeMeter(integr) - + getData(Object) -} - -class View { - --State-- - + path: string - + promise: Promise - + name: string - + id: integer - + media: string - + description: string - --Getters-- - + path() - + promise() - + name() - + id() - + media() - + description() - .... - + blocks() - --Mutations-- - + path() - + promise() - + name() - + id() - + media() - + description() - --Actions-- - + loadBlocks(Object) - + changeView(integer) -} - -class User { - --State-- - + onid: integer - + privilege: integer - --Getters-- - + onid() - + privilege() - .... - + alerts() - + views() - --Mutations-- - + onid(string) - + privilege(integer) - --Actions-- - + login() - + user() - + loadAlerts(Object) - + loadViews(Object) -} - -Map -down-> Building -Map -down-> Campaign -Building -down-> MeterGroup - -View -down-> Block -Block -down-> Chart -Chart -up[dashed]-> MeterGroup -Building -down-> Block - -MeterGroup -down-> Meter -User -down-> View -User -down-> Alert -Campaign -right-> Building -Alert -down[dashed]-> MeterGroup -Chart -up[dashed]->Building - +@startuml VuexStore +allow_mixing + +class Alert { + --State-- + + id: integer + + path: string + + promise: Promise + + lowThreshold: float + + highThreshold: float + + meterGroup: string + --Getters-- + + id() + + path() + + promise() + + lowThreshold() + + highThreshold() + + meterGroup() + --Mutations-- + + id(integer) + + path(string) + + promise(Promise) + + lowThreshold(integer) + + highThreshold(integer) + + meterGroup(string) + --Actions-- + + changeAlert(Object) +} + +class Block { + --State-- + + path: string + + promise: Promise + + name: string + + dateInterval: integer + + intervalUnit: string + + graphType: intger + + dateStart: integer + + dateEnd: integer + + id: integer + + chartColors: array + --Getters-- + + path() + + promise() + + name() + + dateInterval() + + intervalUnit() + + graphType() + + dateStart() + + dateEnd() + + id() + + chartColors() + .... + + charts() + --Mutations-- + + path(string) + + promise(Promise) + + name(string) + + dateInterval(integer) + + intervalUnit(string) + + graphType(integer) + + dateStart(integer) + + dateEnd(integer) + + id(integer) + + chartColors(array) + --Actions-- + + loadChart(integer) + + changeBlock(integer) + + loadDefault(Object) + + getData() +} + +class Building { + --State-- + + path: string + + promise: Promise + + name: string + + group: string + + image: string + + geoJSON: Object + + id: integer + --Getters-- + + path() + + promise() + + name() + + group() + + image() + + geoJSON() + + id() + .... + + meterGroups() + + blocks() + --Mutations-- + + path(string) + + promise(Promise) + + name(string) + + group(string) + + image(string) + + geoJSON(Object) + + id(integer) + --Actions-- + + loadMeterGroup(Object) + + loadDefaultBlocks() +} + +class Campaign { + --State-- + + path: string + + promise: Promise + + buildings: array + + name: string + + id: integer + + image: string + + dateStart: integer + + dateEnd: integer + + compareStart: integer + + compareEnd: integer + --Getters-- + + path() + + promise() + + buildings() + + dateStart() + + dateEnd() + + compareStart() + + compareEnd() + --Mutations-- + + path(string) + + promise(Promise) + + addBuilding(string) + + name(string) + + id(integer) + + image(string) + --Actions-- + + changeCampaign(integer) +} + +class Chart { + --State-- + + name: string + + point: string + + building: string + + id: integer + + meterGroupPath: string + + path: string + + color: hexcode + --Getters-- + + name() + + point() + + building() + + id() + + meterGroupPath() + + path() + + color() + .... + + pointString() + + unitString() + --Mutations-- + + name(string) + + point(string) + + building(string) + + id(integer) + + meterGroupPath(string) + + path(string) + + color(integer) + --Actions-- + + getData(Object) + + changeChart(integer) +} + +class Map { + --State-- + + path: string + + promise: Promise + --Getters-- + + path() + + promise() + .... + + building(integer) + + buildings() + + campaigns() + + meterGroup(integer) + --Mutations-- + + path(string) + + promise(Promise) + --Actions-- + + loadBuilding(Object) + + loadCampaign(Object) + + loadMap() +} + +class MeterGroup { + --State-- + + path: string + + promise: Promise + + name: string + + default: boolean + + id: integer + --Getters-- + + path() + + promise() + + name() + + default() + + id() + .... + + meters() + --Mutations-- + + path(string) + + promise(Promise) + + name(string) + + default(boolean) + + id(integer) + --Actions-- + + getData(Object) + + changeGroup(integer) +} + +class Meter { + --State-- + + id: integer + + path: string + + promise: Promise + + classInt: integer + + address: string + --Getters-- + + id() + + path() + + promise() + + classInt() + + address() + .... + + type() + --Mutations-- + + id(integer) + + path(string) + + promise(Promise) + + classInt(integer) + + address(string) + --Actions-- + + changeMeter(integr) + + getData(Object) +} + +class View { + --State-- + + path: string + + promise: Promise + + name: string + + id: integer + + media: string + + description: string + --Getters-- + + path() + + promise() + + name() + + id() + + media() + + description() + .... + + blocks() + --Mutations-- + + path() + + promise() + + name() + + id() + + media() + + description() + --Actions-- + + loadBlocks(Object) + + changeView(integer) +} + +class User { + --State-- + + onid: integer + + privilege: integer + --Getters-- + + onid() + + privilege() + .... + + alerts() + + views() + --Mutations-- + + onid(string) + + privilege(integer) + --Actions-- + + login() + + user() + + loadAlerts(Object) + + loadViews(Object) +} + +Map -down-> Building +Map -down-> Campaign +Building -down-> MeterGroup + +View -down-> Block +Block -down-> Chart +Chart -up[dashed]-> MeterGroup +Building -down-> Block + +MeterGroup -down-> Meter +User -down-> View +User -down-> Alert +Campaign -right-> Building +Alert -down[dashed]-> MeterGroup +Chart -up[dashed]->Building + @enduml \ No newline at end of file diff --git a/src/store/building.module.js b/src/store/building.module.js index 1f59940e..9c753038 100644 --- a/src/store/building.module.js +++ b/src/store/building.module.js @@ -71,11 +71,6 @@ const actions = { id: this.getters[group.path + '/id'], meters: {} } - for (let meter of this.getters[group.path + '/meters']) { - payloadGroup.meters[meter.id] = { - operation: parseInt(!meter.negate) - } - } reqPayload.reqPayload.meters.push(payloadGroup) } } diff --git a/src/store/chart_modifiers/line_bar/base.js b/src/store/chart_modifiers/line_bar/base.js index 70dcd02c..418a70c0 100644 --- a/src/store/chart_modifiers/line_bar/base.js +++ b/src/store/chart_modifiers/line_bar/base.js @@ -75,14 +75,8 @@ export default class LineBaseModifier { accumulator = resultDataObject.get(i + delta) returnData.push({ x: new Date((i + delta + offset) * 1000), - y: accumulator + y: Math.abs(accumulator) }) - // console.log(accumulator) - // console.log(Math.abs(accumulator)) - // console.log(payload.point) - // Maybe use Math.abs(accumulator) to flip sign - // Maybe use payload.point to determine if we need to flip sign - // See PR for other comments } catch (error) { console.log(error) } diff --git a/src/store/meter.module.js b/src/store/meter.module.js index e2aea94e..573de3b3 100644 --- a/src/store/meter.module.js +++ b/src/store/meter.module.js @@ -13,7 +13,6 @@ const state = () => { name: null, // String address: null, // String classInt: null, // Int - negate: null, // Bool path: null, promise: null, type: '', @@ -43,7 +42,6 @@ const actions = { store.commit('name', meter.name) store.commit('address', meter.address) store.commit('classInt', meter.classInt) - store.commit('negate', meter.negate) store.commit('points', meter.points) store.commit('type', meter.type) wait = false @@ -81,10 +79,6 @@ const mutations = { state.classInt = classInt }, - negate (state, negate) { - state.negate = negate - }, - id (state, id) { state.id = id }, @@ -123,10 +117,6 @@ const getters = { return state.classInt }, - negate (state) { - return state.negate - }, - id (state) { return state.id }, diff --git a/src/store/meter_group.module.js b/src/store/meter_group.module.js index 7e72ecaa..8cadee13 100644 --- a/src/store/meter_group.module.js +++ b/src/store/meter_group.module.js @@ -60,7 +60,6 @@ const actions = { store.commit(meterSpace + '/name', meter.name) store.commit(meterSpace + '/address', meter.address) store.commit(meterSpace + '/classInt', meter.classInt) - store.commit(meterSpace + '/negate', meter.negate) store.commit(meterSpace + '/type', meter.type) store.commit(meterSpace + '/points', meter.points) }, @@ -148,10 +147,7 @@ const actions = { promiseObject[meter.id] = promise } } - /* - The following section is possibly the most important computation the dashboard does - since the meters sometimes need to be negated to get the correct meter reading. - */ + for (let meter of store.getters.meters) { let data = await promiseObject[meter.id] // For some reason if the array is empty it sometimes forgets it is an array @@ -160,13 +156,9 @@ const actions = { } for (let dataPoint of data) { if (resultDataObject.get(dataPoint['time'])) { - if (meter.negate) { - resultDataObject.set(dataPoint['time'], resultDataObject.get(dataPoint['time']) - dataPoint[payload.point]) - } else { - resultDataObject.set(dataPoint['time'], resultDataObject.get(dataPoint['time']) + dataPoint[payload.point]) - } + resultDataObject.set(dataPoint['time'], resultDataObject.get(dataPoint['time']) + dataPoint[payload.point]) } else { - resultDataObject.set(dataPoint['time'], dataPoint[payload.point] * (meter.negate ? -1 : 1)) + resultDataObject.set(dataPoint['time'], dataPoint[payload.point]) } } } diff --git a/tests/assertedData/mock_allbuildings.json b/tests/assertedData/mock_allbuildings.json index 5eb24357..8552ae31 100644 --- a/tests/assertedData/mock_allbuildings.json +++ b/tests/assertedData/mock_allbuildings.json @@ -12,7 +12,7 @@ "name": "Tebeau Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -85,7 +85,7 @@ "name": "Wave Tank # 1", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -141,7 +141,7 @@ "name": "Wave Tank # 2", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -197,7 +197,7 @@ "name": "Wave Tank # 3", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -253,7 +253,7 @@ "name": "Wave Tank # 4", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -309,7 +309,7 @@ "name": "Wave Tank HVAC", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -365,7 +365,7 @@ "name": "Building Main", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -421,7 +421,7 @@ "name": "West Side Wave Tank", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -477,7 +477,7 @@ "name": "Main Pump Disconnect", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -533,7 +533,7 @@ "name": "Wave Machine", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -596,7 +596,7 @@ "name": "Wave Tank # 1", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -659,7 +659,7 @@ "name": "Wave Tank # 2", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -722,7 +722,7 @@ "name": "Wave Tank # 3", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -785,7 +785,7 @@ "name": "Wave Tank # 4", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -848,7 +848,7 @@ "name": "Wave Tank HVAC", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -911,7 +911,7 @@ "name": "Building Main", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -974,7 +974,7 @@ "name": "West Side Wave Tank", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -1037,7 +1037,7 @@ "name": "Main Pump Disconnect", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -1100,7 +1100,7 @@ "name": "Wave Machine", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -1173,7 +1173,7 @@ "name": "Memorial Union West Electricity (2000A)", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -1229,7 +1229,7 @@ "name": "Memorial Union East Electricity (1000A)", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -1292,7 +1292,7 @@ "name": "Memorial Union West Electricity (2000A)", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -1355,7 +1355,7 @@ "name": "Memorial Union East Electricity (1000A)", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -1428,7 +1428,7 @@ "name": "Milne South Electrical", "address": "", "classInt": 48, - "negate": true, + "type": "Electricity", "points": [ { @@ -1484,7 +1484,7 @@ "name": "Milne North Electrical", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -1547,7 +1547,7 @@ "name": "Milne South Electrical", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -1610,7 +1610,7 @@ "name": "Milne North Electrical", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -1683,7 +1683,7 @@ "name": "Dryden Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -1756,7 +1756,7 @@ "name": "4000A service", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -1812,7 +1812,7 @@ "name": "2000A Service", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -1875,7 +1875,7 @@ "name": "Kelley Steam", "address": "", "classInt": 4444, - "negate": false, + "type": "Steam", "points": [ { "label": "Steam Input", "value": "input" }, @@ -1896,7 +1896,7 @@ "name": "4000A service", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -1959,7 +1959,7 @@ "name": "2000A Service", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -2032,7 +2032,7 @@ "name": "Sackett Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -2105,7 +2105,7 @@ "name": "Cauthorn Hall Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -2178,7 +2178,7 @@ "name": "Valley Library Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -2234,7 +2234,7 @@ "name": "Valley Library Electric", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -2297,7 +2297,7 @@ "name": "Red Lion", "address": "", "classInt": 4444, - "negate": false, + "type": "Steam", "points": [ { "label": "Steam Input", "value": "input" }, @@ -2328,7 +2328,7 @@ "name": "Dixon Electricity", "address": "", "classInt": 48, - "negate": true, + "type": "Electricity", "points": [ { @@ -2391,7 +2391,7 @@ "name": "Dixon Steam", "address": "", "classInt": 4444, - "negate": false, + "type": "Steam", "points": [ { "label": "Steam Input", "value": "input" }, @@ -2422,7 +2422,7 @@ "name": "West Hall Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -2495,7 +2495,7 @@ "name": "West Dining", "address": "", "classInt": 2, - "negate": false, + "type": "Electricity", "points": [ { @@ -2544,7 +2544,7 @@ "name": "Arnold Dining Electrical Main", "address": "", "classInt": 5, - "negate": false, + "type": "Electricity", "points": [ { @@ -2593,7 +2593,7 @@ "name": "Bloss Hall Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -2666,7 +2666,7 @@ "name": "Buxton Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -2722,7 +2722,7 @@ "name": "Buxton Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -2785,7 +2785,7 @@ "name": "Buxton Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -2848,7 +2848,7 @@ "name": "Buxton Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -2921,7 +2921,7 @@ "name": "CH2MHill Alumni Center Electricity New", "address": "", "classInt": 2, - "negate": false, + "type": "Electricity", "points": [ { @@ -2960,7 +2960,7 @@ "name": "CH2MHill Alumni Center Modhopper", "address": "", "classInt": 17, - "negate": false, + "type": "Gas", "points": [ { "label": "Total Natural Gas (CF)", "value": "cubic_feet" }, @@ -2992,7 +2992,7 @@ "name": "Callahan Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -3065,7 +3065,7 @@ "name": "Filnley Hall Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -3138,7 +3138,7 @@ "name": "Gill", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -3211,7 +3211,7 @@ "name": "Halsell Hall Electricity", "address": "", "classInt": 4045, - "negate": false, + "type": "Electricity", "points": [ { "label": "Current, Phase A (A)", "value": "cphase_a" }, @@ -3249,7 +3249,7 @@ "name": "Hawley Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -3322,7 +3322,7 @@ "name": "ILLC Electricity", "address": "", "classInt": 82, - "negate": false, + "type": "Electricity", "points": [ { @@ -3395,7 +3395,7 @@ "name": "Main Johnson Hall", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -3468,7 +3468,7 @@ "name": "McNary Complex Master Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -3524,7 +3524,7 @@ "name": "McNary Hall Electricity", "address": "", "classInt": 48, - "negate": true, + "type": "Electricity", "points": [ { @@ -3587,7 +3587,7 @@ "name": "McNary Complex Master Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -3660,7 +3660,7 @@ "name": "McNary Hall Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -3733,7 +3733,7 @@ "name": "Milam Electricity", "address": "", "classInt": 48, - "negate": true, + "type": "Electricity", "points": [ { @@ -3806,7 +3806,7 @@ "name": "Nash 1500 Amp Electrical", "address": "", "classInt": 48, - "negate": true, + "type": "Electricity", "points": [ { @@ -3862,7 +3862,7 @@ "name": "Nash 3000 Amp Electrical", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -3925,7 +3925,7 @@ "name": "Nash Steam", "address": "", "classInt": 4444, - "negate": false, + "type": "Steam", "points": [ { "label": "Steam Input", "value": "input" }, @@ -3946,7 +3946,7 @@ "name": "Nash 1500 Amp Electrical", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -4009,7 +4009,7 @@ "name": "Nash 3000 Amp Electrical", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -4082,7 +4082,7 @@ "name": "Poling Electricity", "address": "", "classInt": 4045, - "negate": false, + "type": "Electricity", "points": [ { "label": "Current, Phase A (A)", "value": "cphase_a" }, @@ -4120,7 +4120,7 @@ "name": "Student Experience Center Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -4183,7 +4183,7 @@ "name": "Student Experience Center Steam", "address": "", "classInt": 4444, - "negate": false, + "type": "Steam", "points": [ { "label": "Steam Input", "value": "input" }, @@ -4214,7 +4214,7 @@ "name": "Weniger South Electricity", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { @@ -4287,7 +4287,7 @@ "name": "Wilson Electricity", "address": "", "classInt": 48, - "negate": true, + "type": "Electricity", "points": [ { @@ -4360,7 +4360,7 @@ "name": "Orchard Court", "address": "", "classInt": 48, - "negate": false, + "type": "Electricity", "points": [ { diff --git a/tests/assertedData/story.json b/tests/assertedData/story.json index b1d948aa..2e62b366 100644 --- a/tests/assertedData/story.json +++ b/tests/assertedData/story.json @@ -38,8 +38,7 @@ "group_id": 8, "id": 121, "meter_id": 1, - "negate": null, - "operation": 1, + "type": "e" } ], From 0cddd9eae518c507a14b33cf21f344e942f59e31 Mon Sep 17 00:00:00 2001 From: solderq35 Date: Tue, 23 Jan 2024 14:42:10 -0800 Subject: [PATCH 3/9] update unit test --- .../meter_group_relation_insert.sql | 292 +++++++++--------- 1 file changed, 146 insertions(+), 146 deletions(-) diff --git a/backend/tests/assertedData/meter_group_relation_insert.sql b/backend/tests/assertedData/meter_group_relation_insert.sql index 0cf461f4..2aac56c6 100644 --- a/backend/tests/assertedData/meter_group_relation_insert.sql +++ b/backend/tests/assertedData/meter_group_relation_insert.sql @@ -1,146 +1,146 @@ -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (160,8,9,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (161,9,9,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (166,40,11,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (167,2,12,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (168,6,12,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (169,6,13,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (171,39,15,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (172,38,16,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (175,41,19,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (176,43,20,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (177,13,21,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (178,15,22,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (179,10,23,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (180,3,24,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (181,33,25,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (182,34,25,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (183,30,26,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (185,46,28,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (186,55,29,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (191,5,14,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (192,42,18,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (193,31,30,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (194,32,30,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (195,35,31,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (197,45,32,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (198,47,33,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (199,7,14,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (200,29,26,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (201,51,34,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (202,52,34,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (203,18,35,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (204,49,36,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (205,28,37,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (206,53,16,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (209,20,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (210,21,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (211,22,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (212,23,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (213,25,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (214,26,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (215,56,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (216,57,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (217,58,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (218,59,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (219,60,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (220,61,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (221,67,38,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (222,66,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (223,65,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (224,64,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (225,63,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (226,62,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (227,68,39,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (228,69,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (229,70,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (230,71,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (231,72,25,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (232,73,30,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (246,3,NULL,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (249,4,NULL,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (289,45,54,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (290,3,55,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (293,36,10,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (294,37,10,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (296,46,58,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (298,45,59,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (300,1,8,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (301,44,27,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (302,4,17,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (307,5,56,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (308,7,60,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (310,10,61,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (314,13,62,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (317,38,63,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (318,53,63,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (324,41,65,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (325,15,66,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (327,47,67,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (329,18,68,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (331,39,69,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (333,51,64,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (334,52,70,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (336,28,71,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (338,55,72,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (339,33,52,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (340,34,52,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (341,72,73,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (344,2,74,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (345,6,74,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (347,6,75,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (350,49,76,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (354,31,77,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (355,32,77,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (356,73,78,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (357,43,79,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (360,30,80,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (361,29,81,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (363,35,82,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (365,42,83,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (411,2,129,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (412,8,130,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (413,9,131,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (414,11,132,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (415,12,133,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (416,14,134,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (417,16,135,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (418,17,136,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (419,19,137,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (420,20,138,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (421,21,139,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (422,22,140,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (423,23,141,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (424,24,142,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (425,25,143,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (426,26,144,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (427,27,145,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (428,31,146,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (429,32,147,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (430,33,148,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (431,34,149,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (432,36,150,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (433,37,151,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (434,38,152,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (435,48,153,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (436,50,154,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (437,53,155,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (438,54,156,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (439,56,157,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (440,57,158,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (441,58,159,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (442,59,160,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (443,60,161,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (444,61,162,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (445,62,163,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (446,63,164,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (447,64,165,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (448,65,166,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (449,66,167,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (450,67,168,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (451,68,169,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (452,69,170,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (453,70,171,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (454,71,172,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (455,75,173,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (456,77,55,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`,`operation`) VALUES (457,78,174,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (160,8,9,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (161,9,9,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (166,40,11,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (167,2,12,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (168,6,12,0); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (169,6,13,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (171,39,15,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (172,38,16,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (175,41,19,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (176,43,20,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (177,13,21,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (178,15,22,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (179,10,23,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (180,3,24,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (181,33,25,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (182,34,25,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (183,30,26,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (185,46,28,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (186,55,29,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (191,5,14,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (192,42,18,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (193,31,30,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (194,32,30,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (195,35,31,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (197,45,32,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (198,47,33,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (199,7,14,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (200,29,26,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (201,51,34,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (202,52,34,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (203,18,35,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (204,49,36,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (205,28,37,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (206,53,16,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (209,20,29,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (210,21,29,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (211,22,29,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (212,23,29,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (213,25,29,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (214,26,29,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (215,56,29,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (216,57,29,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (217,58,29,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (218,59,29,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (219,60,29,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (220,61,29,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (221,67,38,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (222,66,38,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (223,65,38,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (224,64,38,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (225,63,38,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (226,62,38,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (227,68,39,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (228,69,38,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (229,70,38,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (230,71,38,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (231,72,25,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (232,73,30,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (246,3,NULL,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (249,4,NULL,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (289,45,54,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (290,3,55,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (293,36,10,0); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (294,37,10,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (296,46,58,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (298,45,59,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (300,1,8,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (301,44,27,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (302,4,17,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (307,5,56,0); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (308,7,60,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (310,10,61,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (314,13,62,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (317,38,63,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (318,53,63,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (324,41,65,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (325,15,66,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (327,47,67,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (329,18,68,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (331,39,69,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (333,51,64,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (334,52,70,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (336,28,71,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (338,55,72,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (339,33,52,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (340,34,52,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (341,72,73,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (344,2,74,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (345,6,74,0); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (347,6,75,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (350,49,76,0); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (354,31,77,0); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (355,32,77,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (356,73,78,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (357,43,79,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (360,30,80,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (361,29,81,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (363,35,82,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (365,42,83,0); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (411,2,129,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (412,8,130,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (413,9,131,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (414,11,132,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (415,12,133,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (416,14,134,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (417,16,135,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (418,17,136,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (419,19,137,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (420,20,138,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (421,21,139,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (422,22,140,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (423,23,141,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (424,24,142,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (425,25,143,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (426,26,144,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (427,27,145,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (428,31,146,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (429,32,147,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (430,33,148,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (431,34,149,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (432,36,150,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (433,37,151,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (434,38,152,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (435,48,153,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (436,50,154,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (437,53,155,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (438,54,156,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (439,56,157,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (440,57,158,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (441,58,159,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (442,59,160,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (443,60,161,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (444,61,162,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (445,62,163,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (446,63,164,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (447,64,165,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (448,65,166,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (449,66,167,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (450,67,168,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (451,68,169,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (452,69,170,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (453,70,171,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (454,71,172,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (455,75,173,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (456,77,55,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (457,78,174,1); From 0dbb532476554df8f1aa61ba35be27f69938a240 Mon Sep 17 00:00:00 2001 From: solderq35 Date: Tue, 23 Jan 2024 14:44:05 -0800 Subject: [PATCH 4/9] ok now unit test should be good --- .../meter_group_relation_insert.sql | 252 +++++++++--------- 1 file changed, 126 insertions(+), 126 deletions(-) diff --git a/backend/tests/assertedData/meter_group_relation_insert.sql b/backend/tests/assertedData/meter_group_relation_insert.sql index 2aac56c6..56c508f1 100644 --- a/backend/tests/assertedData/meter_group_relation_insert.sql +++ b/backend/tests/assertedData/meter_group_relation_insert.sql @@ -1,37 +1,37 @@ -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (160,8,9,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (161,9,9,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (166,40,11,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (167,2,12,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (168,6,12,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (169,6,13,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (171,39,15,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (172,38,16,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (175,41,19,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (176,43,20,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (177,13,21,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (178,15,22,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (179,10,23,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (180,3,24,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (181,33,25,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (182,34,25,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (183,30,26,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (185,46,28,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (186,55,29,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (191,5,14,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (192,42,18,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (193,31,30,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (194,32,30,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (195,35,31,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (197,45,32,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (198,47,33,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (199,7,14,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (200,29,26,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (201,51,34,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (202,52,34,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (203,18,35,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (204,49,36,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (205,28,37,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (206,53,16,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (160,8,9); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (161,9,9); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (166,40,11); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (167,2,12); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (168,6,12); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (169,6,13); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (171,39,15); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (172,38,16); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (175,41,19); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (176,43,20); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (177,13,21); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (178,15,22); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (179,10,23); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (180,3,24); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (181,33,25); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (182,34,25); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (183,30,26); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (185,46,28); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (186,55,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (191,5,14); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (192,42,18); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (193,31,30); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (194,32,30); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (195,35,31); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (197,45,32); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (198,47,33); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (199,7,14); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (200,29,26); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (201,51,34); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (202,52,34); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (203,18,35); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (204,49,36); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (205,28,37); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (206,53,16); INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (209,20,29,2); INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (210,21,29,2); INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (211,22,29,2); @@ -44,103 +44,103 @@ INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (217,58,29,2); INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (218,59,29,2); INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (219,60,29,2); INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (220,61,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (221,67,38,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (221,67,38); INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (222,66,38,2); INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (223,65,38,2); INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (224,64,38,2); INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (225,63,38,2); INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (226,62,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (227,68,39,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (227,68,39); INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (228,69,38,2); INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (229,70,38,2); INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (230,71,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (231,72,25,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (232,73,30,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (246,3,NULL,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (249,4,NULL,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (289,45,54,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (290,3,55,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (293,36,10,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (294,37,10,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (296,46,58,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (298,45,59,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (300,1,8,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (301,44,27,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (302,4,17,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (307,5,56,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (308,7,60,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (310,10,61,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (314,13,62,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (317,38,63,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (318,53,63,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (324,41,65,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (325,15,66,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (327,47,67,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (329,18,68,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (331,39,69,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (333,51,64,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (334,52,70,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (336,28,71,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (338,55,72,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (339,33,52,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (340,34,52,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (341,72,73,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (344,2,74,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (345,6,74,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (347,6,75,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (350,49,76,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (354,31,77,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (355,32,77,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (356,73,78,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (357,43,79,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (360,30,80,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (361,29,81,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (363,35,82,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (365,42,83,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (411,2,129,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (412,8,130,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (413,9,131,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (414,11,132,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (415,12,133,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (416,14,134,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (417,16,135,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (418,17,136,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (419,19,137,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (420,20,138,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (421,21,139,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (422,22,140,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (423,23,141,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (424,24,142,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (425,25,143,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (426,26,144,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (427,27,145,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (428,31,146,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (429,32,147,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (430,33,148,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (431,34,149,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (432,36,150,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (433,37,151,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (434,38,152,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (435,48,153,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (436,50,154,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (437,53,155,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (438,54,156,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (439,56,157,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (440,57,158,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (441,58,159,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (442,59,160,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (443,60,161,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (444,61,162,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (445,62,163,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (446,63,164,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (447,64,165,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (448,65,166,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (449,66,167,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (450,67,168,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (451,68,169,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (452,69,170,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (453,70,171,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (454,71,172,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (455,75,173,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (456,77,55,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (457,78,174,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (231,72,25); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (232,73,30); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (246,3,NULL); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (249,4,NULL); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (289,45,54); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (290,3,55); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (293,36,10); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (294,37,10); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (296,46,58); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (298,45,59); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (300,1,8); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (301,44,27); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (302,4,17); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (307,5,56); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (308,7,60); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (310,10,61); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (314,13,62); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (317,38,63); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (318,53,63); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (324,41,65); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (325,15,66); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (327,47,67); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (329,18,68); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (331,39,69); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (333,51,64); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (334,52,70); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (336,28,71); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (338,55,72); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (339,33,52); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (340,34,52); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (341,72,73); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (344,2,74); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (345,6,74); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (347,6,75); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (350,49,76); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (354,31,77); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (355,32,77); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (356,73,78); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (357,43,79); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (360,30,80); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (361,29,81); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (363,35,82); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (365,42,83); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (411,2,129); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (412,8,130); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (413,9,131); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (414,11,132); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (415,12,133); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (416,14,134); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (417,16,135); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (418,17,136); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (419,19,137); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (420,20,138); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (421,21,139); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (422,22,140); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (423,23,141); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (424,24,142); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (425,25,143); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (426,26,144); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (427,27,145); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (428,31,146); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (429,32,147); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (430,33,148); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (431,34,149); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (432,36,150); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (433,37,151); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (434,38,152); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (435,48,153); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (436,50,154); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (437,53,155); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (438,54,156); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (439,56,157); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (440,57,158); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (441,58,159); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (442,59,160); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (443,60,161); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (444,61,162); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (445,62,163); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (446,63,164); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (447,64,165); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (448,65,166); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (449,66,167); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (450,67,168); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (451,68,169); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (452,69,170); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (453,70,171); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (454,71,172); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (455,75,173); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (456,77,55); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (457,78,174); From 485e4fc21535e379449c37102bae367ebedea40b Mon Sep 17 00:00:00 2001 From: solderq35 Date: Tue, 23 Jan 2024 15:15:28 -0800 Subject: [PATCH 5/9] used regex and python script to remove 4th item in values() --- backend/tests/assertedData/meters_insert.sql | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/backend/tests/assertedData/meters_insert.sql b/backend/tests/assertedData/meters_insert.sql index cd5b25d8..b6c540dd 100644 --- a/backend/tests/assertedData/meters_insert.sql +++ b/backend/tests/assertedData/meters_insert.sql @@ -2,7 +2,7 @@ INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (1,'Tebeau Electricity','e',4 INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (2,'McNary Complex Master Electricity','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (3,'Valley Library Electricity','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (4,'Sackett Electricity','e',48); -INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (5,'Dixon Electricity','e',1,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (5,'Dixon Electricity','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (6,'McNary Hall Electricity','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (7,'Dixon Steam','s',4444); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (8,'Memorial Union West Electricity (2000A)','e',48); @@ -28,30 +28,30 @@ INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (27,'Internal I/O','e',27); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (28,'ILLC Electricity','e',82); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (29,'Student Experience Center Steam','s',4444); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (30,'Student Experience Center Electricity','e',48); -INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (31,'Nash 1500 Amp Electrical','e',1,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (31,'Nash 1500 Amp Electrical','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (32,'Nash 3000 Amp Electrical','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (33,'4000A service','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (34,'2000A Service','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (35,'Weniger South Electricity','e',48); -INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (36,'Milne South Electrical','e',1,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (36,'Milne South Electrical','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (37,'Milne North Electrical','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (38,'Buxton Electricity','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (39,'Hawley Electricity','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (40,'Dryden Electricity','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (41,'Callahan Electricity','e',48); -INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (42,'Wilson Electricity','e',1,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (42,'Wilson Electricity','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (43,'Poling Electricity','e',4045); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (44,'West Hall Electricity','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (45,'Cauthorn Hall Electricity','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (46,'West Dining','e',2); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (47,'Gill','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (48,'Internal I/O','e',27); -INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (49,'Milam Electricity','e',1,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (49,'Milam Electricity','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (50,'CH2MHill Alumni Center Electricity Old','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (51,'CH2MHill Alumni Center Electricity New','e',2); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (52,'CH2MHill Alumni Center Modhopper','g',17); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (53,'Buxton Electricity','e',48); -INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (54,NULL); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (54,NULL,NULL,NULL); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (55,'Main Johnson Hall','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (56,'X-7','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (57,'X-9','e',48); @@ -65,13 +65,13 @@ INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (64,'Wave Tank # 3','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (65,'Wave Tank # 4','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (66,'Wave Tank HVAC','e',48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (67,'Building Main','e',48); -INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (68,'Orchard Court',48); -INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (69,'West Side Wave Tank',1,48); -INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (70,'Main Pump Disconnect',48); -INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (71,'Wave Machine',48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (68,'Orchard Court',NULL,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (69,'West Side Wave Tank',NULL,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (70,'Main Pump Disconnect',NULL,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (71,'Wave Machine',NULL,48); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (72,'Kelley Steam','s',4444); INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (73,'Nash Steam','s',4444); -INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (75,'Test Meter',0,2); -INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (76,'Test Meter',0,2); -INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (77,'Valley Library Electric',0,48); -INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (78,'Red Lion',0,4444); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (75,'Test Meter',NULL,2); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (76,'Test Meter',NULL,2); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (77,'Valley Library Electric',NULL,48); +INSERT INTO `` (`id`,`name`,`type`,`class`) VALUES (78,'Red Lion',NULL,4444); From c6674aecc6c6bf580908487df40479244968df63 Mon Sep 17 00:00:00 2001 From: solderq35 Date: Tue, 23 Jan 2024 15:21:48 -0800 Subject: [PATCH 6/9] script regex for meter_group_relation --- .../meter_group_relation_insert.sql | 292 +++++++++--------- 1 file changed, 146 insertions(+), 146 deletions(-) diff --git a/backend/tests/assertedData/meter_group_relation_insert.sql b/backend/tests/assertedData/meter_group_relation_insert.sql index 56c508f1..3f0aac1f 100644 --- a/backend/tests/assertedData/meter_group_relation_insert.sql +++ b/backend/tests/assertedData/meter_group_relation_insert.sql @@ -1,146 +1,146 @@ -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (160,8,9); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (161,9,9); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (166,40,11); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (167,2,12); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (168,6,12); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (169,6,13); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (171,39,15); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (172,38,16); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (175,41,19); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (176,43,20); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (177,13,21); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (178,15,22); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (179,10,23); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (180,3,24); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (181,33,25); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (182,34,25); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (183,30,26); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (185,46,28); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (186,55,29); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (191,5,14); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (192,42,18); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (193,31,30); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (194,32,30); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (195,35,31); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (197,45,32); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (198,47,33); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (199,7,14); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (200,29,26); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (201,51,34); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (202,52,34); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (203,18,35); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (204,49,36); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (205,28,37); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (206,53,16); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (209,20,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (210,21,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (211,22,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (212,23,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (213,25,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (214,26,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (215,56,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (216,57,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (217,58,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (218,59,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (219,60,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (220,61,29,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (221,67,38); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (222,66,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (223,65,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (224,64,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (225,63,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (226,62,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (227,68,39); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (228,69,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (229,70,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (230,71,38,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (231,72,25); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (232,73,30); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (246,3,NULL); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (249,4,NULL); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (289,45,54); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (290,3,55); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (293,36,10); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (294,37,10); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (296,46,58); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (298,45,59); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (300,1,8); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (301,44,27); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (302,4,17); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (307,5,56); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (308,7,60); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (310,10,61); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (314,13,62); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (317,38,63); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (318,53,63); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (324,41,65); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (325,15,66); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (327,47,67); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (329,18,68); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (331,39,69); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (333,51,64); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (334,52,70); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (336,28,71); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (338,55,72); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (339,33,52); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (340,34,52); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (341,72,73); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (344,2,74); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (345,6,74); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (347,6,75); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (350,49,76); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (354,31,77); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (355,32,77); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (356,73,78); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (357,43,79); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (360,30,80); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (361,29,81); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (363,35,82); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (365,42,83); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (411,2,129); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (412,8,130); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (413,9,131); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (414,11,132); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (415,12,133); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (416,14,134); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (417,16,135); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (418,17,136); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (419,19,137); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (420,20,138); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (421,21,139); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (422,22,140); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (423,23,141); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (424,24,142); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (425,25,143); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (426,26,144); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (427,27,145); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (428,31,146); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (429,32,147); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (430,33,148); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (431,34,149); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (432,36,150); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (433,37,151); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (434,38,152); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (435,48,153); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (436,50,154); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (437,53,155); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (438,54,156); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (439,56,157); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (440,57,158); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (441,58,159); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (442,59,160); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (443,60,161); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (444,61,162); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (445,62,163); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (446,63,164); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (447,64,165); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (448,65,166); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (449,66,167); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (450,67,168); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (451,68,169); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (452,69,170); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (453,70,171); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (454,71,172); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (455,75,173); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (456,77,55); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (457,78,174); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (160,8,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (161,9,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (166,40,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (167,2,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (168,6,0); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (169,6,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (171,39,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (172,38,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (175,41,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (176,43,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (177,13,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (178,15,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (179,10,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (180,3,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (181,33,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (182,34,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (183,30,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (185,46,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (186,55,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (191,5,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (192,42,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (193,31,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (194,32,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (195,35,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (197,45,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (198,47,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (199,7,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (200,29,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (201,51,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (202,52,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (203,18,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (204,49,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (205,28,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (206,53,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (209,20,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (210,21,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (211,22,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (212,23,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (213,25,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (214,26,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (215,56,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (216,57,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (217,58,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (218,59,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (219,60,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (220,61,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (221,67,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (222,66,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (223,65,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (224,64,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (225,63,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (226,62,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (227,68,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (228,69,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (229,70,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (230,71,2); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (231,72,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (232,73,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (246,3,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (249,4,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (289,45,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (290,3,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (293,36,0); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (294,37,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (296,46,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (298,45,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (300,1,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (301,44,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (302,4,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (307,5,0); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (308,7,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (310,10,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (314,13,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (317,38,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (318,53,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (324,41,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (325,15,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (327,47,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (329,18,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (331,39,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (333,51,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (334,52,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (336,28,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (338,55,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (339,33,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (340,34,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (341,72,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (344,2,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (345,6,0); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (347,6,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (350,49,0); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (354,31,0); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (355,32,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (356,73,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (357,43,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (360,30,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (361,29,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (363,35,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (365,42,0); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (411,2,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (412,8,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (413,9,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (414,11,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (415,12,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (416,14,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (417,16,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (418,17,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (419,19,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (420,20,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (421,21,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (422,22,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (423,23,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (424,24,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (425,25,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (426,26,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (427,27,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (428,31,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (429,32,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (430,33,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (431,34,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (432,36,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (433,37,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (434,38,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (435,48,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (436,50,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (437,53,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (438,54,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (439,56,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (440,57,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (441,58,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (442,59,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (443,60,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (444,61,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (445,62,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (446,63,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (447,64,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (448,65,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (449,66,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (450,67,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (451,68,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (452,69,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (453,70,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (454,71,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (455,75,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (456,77,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (457,78,1); From 82bd62636bc1ce6b6ac2c185d9ca0b29ff66facb Mon Sep 17 00:00:00 2001 From: solderq35 Date: Mon, 12 Feb 2024 19:32:57 -0800 Subject: [PATCH 7/9] fix meter_group_insert --- .../assertedData/meter_groups_insert.sql | 186 ++++++++++++++---- 1 file changed, 146 insertions(+), 40 deletions(-) diff --git a/backend/tests/assertedData/meter_groups_insert.sql b/backend/tests/assertedData/meter_groups_insert.sql index 7cfe6288..194b3bca 100644 --- a/backend/tests/assertedData/meter_groups_insert.sql +++ b/backend/tests/assertedData/meter_groups_insert.sql @@ -1,40 +1,146 @@ -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (8,'Tebeau Hall',1,1,'Residence','584268951d584135f6a0748626bc67d6',95,1,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (9,'Memorial Union',1,1,'Admin','922154b7b8a9a229c76eb20d6983403c',96,3,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (10,'Milne Computer Center',1,1,'Academics','58a7ffb4218093d3e038bf780207f33b',97,4,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (11,'Dryden Hall',1,1,'Academics','82071b0d3b0ae845fa88319ce2be0794',98,5,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (12,'McNary Dining Hall',1,1,'Dining','9cb388c274209b40a9e86fe496712766',99,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (13,'McNary Hall',1,1,'Residence','d35b0d8dbfc429de70fedb9bc0aa96fd',100,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (14,'Dixon Recreation Center',1,1,'Athletics','9eff96ba5b3cdef1acac62c1657da1a2',101,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (15,'Hawley Hall',1,1,'Residence','981d63f91ded969e11a80acd3dfdea77',102,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (16,'Buxton Hall',1,1,'Residence','ad1a21a7509bb30f214ddd31d56057e0',103,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (17,'Sackett Hall',1,1,'Residence','797a1beeb3d1c9ad6cb39197941db107',104,7,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (18,'Wilson Hall',1,1,'Residence','089c68e82d1eac61cdad527da6c5c43e',105,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (19,'Callahan Hall',1,1,'Residence','971b0b6c5024c12deedccf0185ca1f81',106,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (20,'Poling Hall',1,1,'Residence','f2854e2285c4759f90394419de277e6b',107,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (21,'Bloss Hall',1,1,'Residence','4e799425f228a0b1d1ca0d7cb5d6fd81',108,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (22,'Finley Hall',1,1,'Residence','2108daaaf70cfa47ac5a568327456671',109,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (23,'Arnold Dining Center',1,1,'Dining','238ebe39f163e35a9681206cf6e27b3b',110,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (24,'Valley Library',1,1,'Academics','d409d908ecc6010a04a3b0387f063145',111,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (25,'Kelley Engineering Center',1,1,'Academics','9489be9deebdfbeb59e44d1260b3f3fc',112,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (26,'Student Experience Center',1,1,'Admin','1b34c7f17c78fcdd675b749d673a8a52',113,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (27,'West Hall',1,1,'Residence','11',114,11,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (28,'West Dining Hall',1,1,'Dining','59cef307445631b2d35b23c1a3a4f412',115,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (29,'Johnson Hall',1,1,'Academics','0857185ec0627dd932753df4ade6e5fa',116,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (30,'Nash Hall',1,1,'Academics','c00592e4044cb41eae1dc7d1fd826c37',117,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (31,'Weniger Hall',1,1,'Academics','5acc05b69decf4c4b7bdd21b218ff215',118,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (32,'Cauthorn Hall',1,1,'Residence','3e3cb88fb8607c619e3b350bf21f9744',119,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (33,'Gill Coliseum',1,1,'Athletics','cf6e802927cc01ec45f5f77b2f85a18a',120,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (34,'CH2MHill Alumni Center',1,1,'Admin','4f96c31aadc3f17eb2b112065d8dfb88',122,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (35,'Halsell Hall',1,1,'Residence','1d5e7491ec6667d1cf878a407ef9852c',123,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (36,'Milam Hall',1,1,'Academics','df9bc161ae9ea91775974e16b07cd8fe',124,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (37,'ILLC',1,1,'Residence','597624b05c3e21222a79e63eff75ad9f',125,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (38,'Wave Lab',1,1,'Academics','3161379164d0a3ce96aff7cfd83766de',279,2,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (39,'Orchard Court',1,0,'Residence','1',NULL,NULL,NULL); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (52,'Kelley Engineering Center',NULL,NULL,NULL,NULL,NULL,6,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (54,'Cauthorn Hall',NULL,NULL,NULL,NULL,NULL,8,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (55,'Valley Library',NULL,NULL,NULL,NULL,NULL,9,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (56,'Dixon Rec Center',NULL,NULL,NULL,NULL,NULL,10,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (58,'West Dining Hall',NULL,NULL,NULL,NULL,NULL,12,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (59,'Cauthorn',NULL,NULL,NULL,NULL,NULL,13,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (60,'Dixon Steam',NULL,NULL,NULL,NULL,NULL,10,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (61,'Arnold Electric',NULL,NULL,NULL,NULL,NULL,14,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (160,8,9); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (161,9,9); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (166,40,11); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (167,2,12); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (168,6,12); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (169,6,13); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (171,39,15); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (172,38,16); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (175,41,19); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (176,43,20); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (177,13,21); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (178,15,22); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (179,10,23); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (180,3,24); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (181,33,25); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (182,34,25); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (183,30,26); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (185,46,28); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (186,55,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (191,5,14); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (192,42,18); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (193,31,30); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (194,32,30); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (195,35,31); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (197,45,32); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (198,47,33); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (199,7,14); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (200,29,26); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (201,51,34); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (202,52,34); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (203,18,35); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (204,49,36); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (205,28,37); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (206,53,16); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (209,20,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (210,21,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (211,22,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (212,23,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (213,25,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (214,26,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (215,56,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (216,57,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (217,58,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (218,59,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (219,60,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (220,61,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (221,67,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (222,66,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (223,65,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (224,64,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (225,63,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (226,62,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (227,68,39); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (228,69,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (229,70,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (230,71,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (231,72,25); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (232,73,30); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (246,3,NULL); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (249,4,NULL); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (289,45,54); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (290,3,55); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (293,36,10); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (294,37,10); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (296,46,58); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (298,45,59); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (300,1,8); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (301,44,27); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (302,4,17); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (307,5,56); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (308,7,60); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (310,10,61); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (314,13,62); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (317,38,63); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (318,53,63); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (324,41,65); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (325,15,66); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (327,47,67); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (329,18,68); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (331,39,69); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (333,51,64); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (334,52,70); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (336,28,71); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (338,55,72); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (339,33,52); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (340,34,52); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (341,72,73); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (344,2,74); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (345,6,74); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (347,6,75); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (350,49,76); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (354,31,77); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (355,32,77); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (356,73,78); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (357,43,79); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (360,30,80); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (361,29,81); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (363,35,82); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (365,42,83); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (411,2,129); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (412,8,130); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (413,9,131); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (414,11,132); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (415,12,133); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (416,14,134); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (417,16,135); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (418,17,136); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (419,19,137); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (420,20,138); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (421,21,139); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (422,22,140); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (423,23,141); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (424,24,142); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (425,25,143); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (426,26,144); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (427,27,145); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (428,31,146); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (429,32,147); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (430,33,148); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (431,34,149); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (432,36,150); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (433,37,151); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (434,38,152); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (435,48,153); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (436,50,154); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (437,53,155); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (438,54,156); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (439,56,157); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (440,57,158); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (441,58,159); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (442,59,160); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (443,60,161); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (444,61,162); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (445,62,163); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (446,63,164); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (447,64,165); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (448,65,166); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (449,66,167); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (450,67,168); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (451,68,169); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (452,69,170); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (453,70,171); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (454,71,172); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (455,75,173); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (456,77,55); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (457,78,174); \ No newline at end of file From 06c808d2a2ad369be137cae26de46f3728b99ce8 Mon Sep 17 00:00:00 2001 From: solderq35 Date: Mon, 12 Feb 2024 19:40:06 -0800 Subject: [PATCH 8/9] edited wrong file, whoops. Now is meter_group_relation --- .../meter_group_relation_insert.sql | 292 +++++++++--------- .../assertedData/meter_groups_insert.sql | 186 +++-------- 2 files changed, 186 insertions(+), 292 deletions(-) diff --git a/backend/tests/assertedData/meter_group_relation_insert.sql b/backend/tests/assertedData/meter_group_relation_insert.sql index 3f0aac1f..7da86143 100644 --- a/backend/tests/assertedData/meter_group_relation_insert.sql +++ b/backend/tests/assertedData/meter_group_relation_insert.sql @@ -1,146 +1,146 @@ -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (160,8,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (161,9,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (166,40,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (167,2,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (168,6,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (169,6,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (171,39,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (172,38,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (175,41,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (176,43,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (177,13,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (178,15,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (179,10,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (180,3,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (181,33,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (182,34,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (183,30,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (185,46,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (186,55,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (191,5,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (192,42,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (193,31,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (194,32,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (195,35,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (197,45,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (198,47,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (199,7,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (200,29,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (201,51,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (202,52,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (203,18,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (204,49,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (205,28,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (206,53,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (209,20,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (210,21,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (211,22,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (212,23,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (213,25,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (214,26,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (215,56,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (216,57,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (217,58,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (218,59,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (219,60,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (220,61,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (221,67,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (222,66,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (223,65,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (224,64,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (225,63,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (226,62,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (227,68,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (228,69,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (229,70,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (230,71,2); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (231,72,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (232,73,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (246,3,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (249,4,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (289,45,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (290,3,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (293,36,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (294,37,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (296,46,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (298,45,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (300,1,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (301,44,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (302,4,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (307,5,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (308,7,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (310,10,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (314,13,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (317,38,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (318,53,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (324,41,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (325,15,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (327,47,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (329,18,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (331,39,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (333,51,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (334,52,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (336,28,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (338,55,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (339,33,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (340,34,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (341,72,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (344,2,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (345,6,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (347,6,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (350,49,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (354,31,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (355,32,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (356,73,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (357,43,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (360,30,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (361,29,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (363,35,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (365,42,0); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (411,2,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (412,8,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (413,9,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (414,11,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (415,12,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (416,14,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (417,16,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (418,17,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (419,19,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (420,20,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (421,21,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (422,22,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (423,23,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (424,24,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (425,25,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (426,26,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (427,27,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (428,31,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (429,32,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (430,33,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (431,34,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (432,36,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (433,37,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (434,38,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (435,48,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (436,50,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (437,53,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (438,54,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (439,56,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (440,57,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (441,58,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (442,59,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (443,60,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (444,61,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (445,62,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (446,63,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (447,64,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (448,65,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (449,66,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (450,67,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (451,68,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (452,69,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (453,70,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (454,71,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (455,75,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (456,77,1); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (457,78,1); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (160,8,9); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (161,9,9); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (166,40,11); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (167,2,12); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (168,6,12); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (169,6,13); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (171,39,15); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (172,38,16); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (175,41,19); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (176,43,20); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (177,13,21); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (178,15,22); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (179,10,23); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (180,3,24); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (181,33,25); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (182,34,25); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (183,30,26); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (185,46,28); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (186,55,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (191,5,14); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (192,42,18); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (193,31,30); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (194,32,30); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (195,35,31); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (197,45,32); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (198,47,33); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (199,7,14); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (200,29,26); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (201,51,34); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (202,52,34); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (203,18,35); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (204,49,36); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (205,28,37); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (206,53,16); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (209,20,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (210,21,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (211,22,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (212,23,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (213,25,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (214,26,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (215,56,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (216,57,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (217,58,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (218,59,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (219,60,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (220,61,29); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (221,67,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (222,66,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (223,65,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (224,64,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (225,63,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (226,62,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (227,68,39); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (228,69,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (229,70,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (230,71,38); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (231,72,25); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (232,73,30); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (246,3,NULL); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (249,4,NULL); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (289,45,54); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (290,3,55); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (293,36,10); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (294,37,10); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (296,46,58); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (298,45,59); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (300,1,8); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (301,44,27); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (302,4,17); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (307,5,56); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (308,7,60); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (310,10,61); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (314,13,62); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (317,38,63); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (318,53,63); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (324,41,65); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (325,15,66); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (327,47,67); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (329,18,68); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (331,39,69); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (333,51,64); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (334,52,70); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (336,28,71); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (338,55,72); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (339,33,52); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (340,34,52); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (341,72,73); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (344,2,74); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (345,6,74); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (347,6,75); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (350,49,76); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (354,31,77); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (355,32,77); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (356,73,78); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (357,43,79); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (360,30,80); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (361,29,81); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (363,35,82); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (365,42,83); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (411,2,129); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (412,8,130); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (413,9,131); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (414,11,132); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (415,12,133); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (416,14,134); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (417,16,135); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (418,17,136); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (419,19,137); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (420,20,138); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (421,21,139); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (422,22,140); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (423,23,141); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (424,24,142); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (425,25,143); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (426,26,144); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (427,27,145); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (428,31,146); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (429,32,147); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (430,33,148); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (431,34,149); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (432,36,150); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (433,37,151); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (434,38,152); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (435,48,153); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (436,50,154); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (437,53,155); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (438,54,156); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (439,56,157); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (440,57,158); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (441,58,159); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (442,59,160); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (443,60,161); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (444,61,162); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (445,62,163); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (446,63,164); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (447,64,165); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (448,65,166); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (449,66,167); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (450,67,168); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (451,68,169); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (452,69,170); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (453,70,171); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (454,71,172); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (455,75,173); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (456,77,55); +INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (457,78,174); \ No newline at end of file diff --git a/backend/tests/assertedData/meter_groups_insert.sql b/backend/tests/assertedData/meter_groups_insert.sql index 194b3bca..21a85d28 100644 --- a/backend/tests/assertedData/meter_groups_insert.sql +++ b/backend/tests/assertedData/meter_groups_insert.sql @@ -1,146 +1,40 @@ -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (160,8,9); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (161,9,9); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (166,40,11); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (167,2,12); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (168,6,12); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (169,6,13); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (171,39,15); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (172,38,16); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (175,41,19); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (176,43,20); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (177,13,21); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (178,15,22); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (179,10,23); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (180,3,24); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (181,33,25); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (182,34,25); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (183,30,26); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (185,46,28); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (186,55,29); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (191,5,14); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (192,42,18); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (193,31,30); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (194,32,30); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (195,35,31); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (197,45,32); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (198,47,33); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (199,7,14); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (200,29,26); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (201,51,34); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (202,52,34); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (203,18,35); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (204,49,36); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (205,28,37); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (206,53,16); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (209,20,29); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (210,21,29); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (211,22,29); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (212,23,29); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (213,25,29); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (214,26,29); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (215,56,29); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (216,57,29); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (217,58,29); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (218,59,29); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (219,60,29); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (220,61,29); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (221,67,38); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (222,66,38); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (223,65,38); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (224,64,38); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (225,63,38); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (226,62,38); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (227,68,39); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (228,69,38); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (229,70,38); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (230,71,38); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (231,72,25); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (232,73,30); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (246,3,NULL); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (249,4,NULL); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (289,45,54); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (290,3,55); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (293,36,10); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (294,37,10); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (296,46,58); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (298,45,59); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (300,1,8); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (301,44,27); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (302,4,17); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (307,5,56); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (308,7,60); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (310,10,61); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (314,13,62); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (317,38,63); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (318,53,63); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (324,41,65); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (325,15,66); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (327,47,67); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (329,18,68); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (331,39,69); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (333,51,64); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (334,52,70); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (336,28,71); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (338,55,72); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (339,33,52); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (340,34,52); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (341,72,73); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (344,2,74); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (345,6,74); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (347,6,75); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (350,49,76); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (354,31,77); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (355,32,77); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (356,73,78); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (357,43,79); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (360,30,80); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (361,29,81); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (363,35,82); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (365,42,83); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (411,2,129); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (412,8,130); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (413,9,131); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (414,11,132); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (415,12,133); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (416,14,134); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (417,16,135); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (418,17,136); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (419,19,137); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (420,20,138); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (421,21,139); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (422,22,140); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (423,23,141); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (424,24,142); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (425,25,143); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (426,26,144); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (427,27,145); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (428,31,146); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (429,32,147); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (430,33,148); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (431,34,149); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (432,36,150); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (433,37,151); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (434,38,152); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (435,48,153); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (436,50,154); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (437,53,155); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (438,54,156); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (439,56,157); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (440,57,158); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (441,58,159); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (442,59,160); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (443,60,161); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (444,61,162); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (445,62,163); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (446,63,164); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (447,64,165); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (448,65,166); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (449,66,167); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (450,67,168); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (451,68,169); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (452,69,170); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (453,70,171); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (454,71,172); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (455,75,173); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (456,77,55); -INSERT INTO `` (`id`,`meter_id`,`group_id`) VALUES (457,78,174); \ No newline at end of file +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (8,'Tebeau Hall',1,1,'Residence','584268951d584135f6a0748626bc67d6',95,1,1); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (9,'Memorial Union',1,1,'Admin','922154b7b8a9a229c76eb20d6983403c',96,3,1); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (10,'Milne Computer Center',1,1,'Academics','58a7ffb4218093d3e038bf780207f33b',97,4,1); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (11,'Dryden Hall',1,1,'Academics','82071b0d3b0ae845fa88319ce2be0794',98,5,1); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (12,'McNary Dining Hall',1,1,'Dining','9cb388c274209b40a9e86fe496712766',99,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (13,'McNary Hall',1,1,'Residence','d35b0d8dbfc429de70fedb9bc0aa96fd',100,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (14,'Dixon Recreation Center',1,1,'Athletics','9eff96ba5b3cdef1acac62c1657da1a2',101,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (15,'Hawley Hall',1,1,'Residence','981d63f91ded969e11a80acd3dfdea77',102,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (16,'Buxton Hall',1,1,'Residence','ad1a21a7509bb30f214ddd31d56057e0',103,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (17,'Sackett Hall',1,1,'Residence','797a1beeb3d1c9ad6cb39197941db107',104,7,1); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (18,'Wilson Hall',1,1,'Residence','089c68e82d1eac61cdad527da6c5c43e',105,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (19,'Callahan Hall',1,1,'Residence','971b0b6c5024c12deedccf0185ca1f81',106,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (20,'Poling Hall',1,1,'Residence','f2854e2285c4759f90394419de277e6b',107,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (21,'Bloss Hall',1,1,'Residence','4e799425f228a0b1d1ca0d7cb5d6fd81',108,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (22,'Finley Hall',1,1,'Residence','2108daaaf70cfa47ac5a568327456671',109,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (23,'Arnold Dining Center',1,1,'Dining','238ebe39f163e35a9681206cf6e27b3b',110,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (24,'Valley Library',1,1,'Academics','d409d908ecc6010a04a3b0387f063145',111,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (25,'Kelley Engineering Center',1,1,'Academics','9489be9deebdfbeb59e44d1260b3f3fc',112,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (26,'Student Experience Center',1,1,'Admin','1b34c7f17c78fcdd675b749d673a8a52',113,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (27,'West Hall',1,1,'Residence','11',114,11,1); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (28,'West Dining Hall',1,1,'Dining','59cef307445631b2d35b23c1a3a4f412',115,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (29,'Johnson Hall',1,1,'Academics','0857185ec0627dd932753df4ade6e5fa',116,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (30,'Nash Hall',1,1,'Academics','c00592e4044cb41eae1dc7d1fd826c37',117,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (31,'Weniger Hall',1,1,'Academics','5acc05b69decf4c4b7bdd21b218ff215',118,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (32,'Cauthorn Hall',1,1,'Residence','3e3cb88fb8607c619e3b350bf21f9744',119,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (33,'Gill Coliseum',1,1,'Athletics','cf6e802927cc01ec45f5f77b2f85a18a',120,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (34,'CH2MHill Alumni Center',1,1,'Admin','4f96c31aadc3f17eb2b112065d8dfb88',122,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (35,'Halsell Hall',1,1,'Residence','1d5e7491ec6667d1cf878a407ef9852c',123,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (36,'Milam Hall',1,1,'Academics','df9bc161ae9ea91775974e16b07cd8fe',124,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (37,'ILLC',1,1,'Residence','597624b05c3e21222a79e63eff75ad9f',125,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (38,'Wave Lab',1,1,'Academics','3161379164d0a3ce96aff7cfd83766de',279,2,1); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (39,'Orchard Court',1,0,'Residence','1',NULL,NULL,NULL); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (52,'Kelley Engineering Center',NULL,NULL,NULL,NULL,NULL,6,1); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (54,'Cauthorn Hall',NULL,NULL,NULL,NULL,NULL,8,1); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (55,'Valley Library',NULL,NULL,NULL,NULL,NULL,9,1); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (56,'Dixon Rec Center',NULL,NULL,NULL,NULL,NULL,10,1); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (58,'West Dining Hall',NULL,NULL,NULL,NULL,NULL,12,1); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (59,'Cauthorn',NULL,NULL,NULL,NULL,NULL,13,1); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (60,'Dixon Steam',NULL,NULL,NULL,NULL,NULL,10,1); +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (61,'Arnold Electric',NULL,NULL,NULL,NULL,NULL,14,1); \ No newline at end of file From eb798cb3d4375fb725aec4f87972eba367469935 Mon Sep 17 00:00:00 2001 From: solderq35 Date: Mon, 12 Feb 2024 19:41:24 -0800 Subject: [PATCH 9/9] fix wrong diff --- backend/tests/assertedData/meter_groups_insert.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/tests/assertedData/meter_groups_insert.sql b/backend/tests/assertedData/meter_groups_insert.sql index 21a85d28..7cfe6288 100644 --- a/backend/tests/assertedData/meter_groups_insert.sql +++ b/backend/tests/assertedData/meter_groups_insert.sql @@ -37,4 +37,4 @@ INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`, INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (58,'West Dining Hall',NULL,NULL,NULL,NULL,NULL,12,1); INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (59,'Cauthorn',NULL,NULL,NULL,NULL,NULL,13,1); INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (60,'Dixon Steam',NULL,NULL,NULL,NULL,NULL,10,1); -INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (61,'Arnold Electric',NULL,NULL,NULL,NULL,NULL,14,1); \ No newline at end of file +INSERT INTO `` (`id`,`name`,`user_id`,`is_building`,`affiliation`,`building_id`,`story_id`,`building_id_2`,`default`) VALUES (61,'Arnold Electric',NULL,NULL,NULL,NULL,NULL,14,1);