Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PR] Revamp sec scraper backend #269

Merged
merged 5 commits into from
Oct 20, 2023
Merged

[PR] Revamp sec scraper backend #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f6878c
poc done but css needs work
solderq35 Oct 3, 2023
433562a
final mobile test then feature done
solderq35 Oct 5, 2023
e82afbb
remove comments, console logs, reset env
solderq35 Oct 5, 2023
3d9834f
update backend for revamped webscraper
solderq35 Oct 20, 2023
4f27497
Merge branch 'master' into revamp-sec-scraper-backend
solderq35 Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/app/meter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ exports.upload = async (event, context) => {
return response
}

let query_string = `INSERT INTO Solar_Meters (\`time\`, \`time_seconds\`, \`energy_change\`, \`tableid\`) VALUES ('${meter_data.time}', '${meter_data.time_seconds}', '${meter_data.totalYieldYesterday}', '${meter_data.tableID}');`
let query_string = `INSERT INTO Solar_Meters (\`time\`, \`time_seconds\`, \`energy_change\`, \`MeterID\`, \`MeterName\`) VALUES ('${meter_data.time}', '${meter_data.time_seconds}', '${meter_data.totalYieldYesterday}', '${meter_data.meterID}', '${meter_data.meterName}');`

try {
await DB.query(query_string)
Expand Down
15 changes: 6 additions & 9 deletions backend/dependencies/nodejs/models/meter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,6 @@ class Meter {
if (String(meterClass).startsWith('999')) {
// get table name from meter table
let [{ name: meter_table_name }] = await DB.query('SELECT `name` FROM meters WHERE id = ?', [this.id])
const meterLookupTable = {
121: 'SEC_OSU_Op_Lube',
122: 'SEC_OSU_Op',
123: 'SEC_Solar',
124: 'OSU_Operations_Total'
}
if (meter_table_name.startsWith('M')) {
return DB.query(
'SELECT ' +
Expand All @@ -161,16 +155,19 @@ class Meter {
' WHERE time_seconds >= ? AND time_seconds <= ?',
[startTime, endTime]
)
} else {
}

// may have to modify the below to be else-if, if we are going to have multiple custom webscraper tables (Solar_Meters, etc)
else {
return DB.query(
'SELECT ' +
point +
", time_seconds AS time, '" +
this.id +
"' as id FROM " +
meter_table_name +
' WHERE time_seconds >= ? AND time_seconds <= ? AND tableID = ?',
[startTime, endTime, meterLookupTable[this.id]]
' WHERE time_seconds >= ? AND time_seconds <= ? AND MeterID = ?',
[startTime, endTime, this.id]
)
}
}
Expand Down
Loading