Skip to content

Commit

Permalink
Added pacific power meters to Meter class and API (#333)
Browse files Browse the repository at this point in the history 
* Added pacific power meters to Meter class and API

* Update tests to account for pacific_power_id field

* Remove extra spaces in test data insertions
  • Loading branch information
@s-egge
s-egge committed Jun 10, 2024
1 parent 9c02d7b commit 4e27862
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 82 deletions.
8 changes: 5 additions & 3 deletions backend/dependencies/nodejs/models/building.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ class Building {
meter_groups.default as meter_group_default,
meters.name as meter_name,
meters.id as meter_id,
meters.class as meter_class
meters.class as meter_class,
meters.pacific_power_id as pacific_power_id
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
Expand Down Expand Up @@ -190,7 +191,8 @@ class Building {

queryJson[row.id].meterGroups[row.meter_group_id].meters[row.meter_id] = {
name: row.meter_name,
classInt: row.meter_class
classInt: row.meter_class,
pacificPowerId: row.pacific_power_id
}
}

Expand All @@ -202,7 +204,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)
meter.set(meterJson.name, meterJson.classInt, meterJson.pacificPowerId)
meters.push(meter)
}

Expand Down
9 changes: 7 additions & 2 deletions backend/dependencies/nodejs/models/meter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class Meter {
this.classInt = 0
this.type = ''
this.points = []
this.pacificPowerID = null
}

async get() {
Expand All @@ -41,13 +42,15 @@ class Meter {
this.name = row[0]['name']
this.address = row[0]['address']
this.classInt = row[0]['class']
this.pacificPowerID = row[0]['pacific_power_id']
this.calcProps()
return this
}

set(name, classInt) {
set(name, classInt, pacificPowerID) {
this.name = name
this.classInt = classInt
this.pacificPowerID = pacificPowerID
this.calcProps()
}

Expand Down Expand Up @@ -126,7 +129,8 @@ class Meter {
address: this.address,
classInt: this.classInt,
type: this.type,
points: this.points
points: this.points,
pacificPowerID: this.pacificPowerID
}
}

Expand Down Expand Up @@ -430,6 +434,7 @@ class Meter {
meter.name = meterQ['name']
meter.address = meterQ['address']
meter.classInt = meterQ['class']
meter.pacificPowerID = meterQ['pacific_power_id']
meter.calcProps()
r.push(meter.data)
}
Expand Down
154 changes: 77 additions & 77 deletions backend/tests/assertedData/meters_insert.sql
View file
Original file line number Diff line number Diff line change
@@ -1,77 +1,77 @@
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',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',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',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',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',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,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);
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',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',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);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (1,'Tebeau Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (2,'McNary Complex Master Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (3,'Valley Library Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (4,'Sackett Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (5,'Dixon Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (6,'McNary Hall Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (7,'Dixon Steam','s',4444,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (8,'Memorial Union West Electricity (2000A)','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (9,'Memorial Union East Electricity (1000A)','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (10,'Arnold Dining Electrical Main','e',5,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (11,'Central feeder distribution panel (SDP-1)','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (12,'My New Device','e',4025,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (13,'Bloss Hall Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (14,'West mechanical room distribution panel (SD-W)','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (15,'Filnley Hall Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (16,'Arnold Dining Chiller Electricity','e',2,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (17,'My New Device','e',4025,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (18,'Halsell Hall Electricity','e',4045,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (19,'Internal I/O','e',27,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (20,'4M-1A','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (21,'X-3','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (22,'4L-1A','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (23,'4M-PHA','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (24,'ATS-LS','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (25,'SPARE 100A','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (26,'SPARE 225A','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (27,'Internal I/O','e',27,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (28,'ILLC Electricity','e',82,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (29,'Student Experience Center Steam','s',4444,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (30,'Student Experience Center Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (31,'Nash 1500 Amp Electrical','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (32,'Nash 3000 Amp Electrical','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (33,'4000A service','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (34,'2000A Service','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (35,'Weniger South Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (36,'Milne South Electrical','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (37,'Milne North Electrical','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (38,'Buxton Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (39,'Hawley Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (40,'Dryden Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (41,'Callahan Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (42,'Wilson Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (43,'Poling Electricity','e',4045,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (44,'West Hall Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (45,'Cauthorn Hall Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (46,'West Dining','e',2,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (47,'Gill','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (48,'Internal I/O','e',27,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (49,'Milam Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (50,'CH2MHill Alumni Center Electricity Old','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (51,'CH2MHill Alumni Center Electricity New','e',2,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (52,'CH2MHill Alumni Center Modhopper','g',17,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (53,'Buxton Electricity','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (54,NULL,NULL,NULL,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (55,'Main Johnson Hall','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (56,'X-7','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (57,'X-9','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (58,'S4P-PHA','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (59,'X-10','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (60,'S4P-1A','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (61,'SPARE 200A','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (62,'Wave Tank # 1','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (63,'Wave Tank # 2','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (64,'Wave Tank # 3','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (65,'Wave Tank # 4','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (66,'Wave Tank HVAC','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (67,'Building Main','e',48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (68,'Orchard Court',NULL,48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (69,'West Side Wave Tank',NULL,48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (70,'Main Pump Disconnect',NULL,48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (71,'Wave Machine',NULL,48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (72,'Kelley Steam','s',4444,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (73,'Nash Steam','s',4444,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (75,'Test Meter',NULL,2,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (76,'Test Meter',NULL,2,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (77,'Valley Library Electric',NULL,48,null);
INSERT INTO `` (`id`,`name`,`type`,`class`,`pacific_power_id`) VALUES (78,'Red Lion',NULL,4444,null);
1 change: 1 addition & 0 deletions backend/tests/buildTestDatabase.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ DB.beginTransaction(err => {
\`address\` char(16) DEFAULT NULL,
\`type\` TEXT,
\`class\` INTEGER,
\`pacific_power_id\` INTEGER,
PRIMARY KEY (\`id\`)
);`

Expand Down

0 comments on commit 4e27862

Please sign in to comment.