Skip to content

refactor: add london date column #94

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

Merged
rars merged 1 commit into from
Jul 1, 2026
Merged

refactor: add london date column #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src-tauri/migrations/2026-07-01-124959-0000_add_london_date/down.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
-- This file should undo anything in `up.sql`
DROP INDEX IF EXISTS idx_electricity_consumption_london_date_id;
DROP INDEX IF EXISTS idx_gas_consumption_london_date_id;

ALTER TABLE electricity_consumption DROP COLUMN london_date_id;
ALTER TABLE gas_consumption DROP COLUMN london_date_id;
6 changes: 6 additions & 0 deletions src-tauri/migrations/2026-07-01-124959-0000_add_london_date/up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

ALTER TABLE electricity_consumption ADD COLUMN london_date_id INTEGER;
ALTER TABLE gas_consumption ADD COLUMN london_date_id INTEGER;

CREATE INDEX idx_electricity_consumption_london_date_id ON electricity_consumption(london_date_id);
CREATE INDEX idx_gas_consumption_london_date_id ON gas_consumption(london_date_id);
198 changes: 118 additions & 80 deletions src-tauri/src/data/consumption.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use std::collections::BTreeMap;
use std::sync::{Arc, Mutex, MutexGuard};

use chrono::{Datelike, NaiveDate, NaiveDateTime};
use chrono_tz::Europe::London;
use chrono::{NaiveDate, NaiveDateTime};
use diesel::dsl::sql;
use diesel::insert_into;
use diesel::SqliteConnection;
use diesel::{prelude::*, upsert::excluded};
Expand All @@ -11,11 +10,13 @@ use rust_decimal::prelude::ToPrimitive;
use rust_decimal::Decimal;

use crate::schema::{electricity_consumption, gas_consumption};
use crate::utils::london_midnight_as_utc;
use crate::utils::london_date_id_to_naive_date;
use crate::utils::{
london_midnight_as_utc, naive_date_to_london_date_id, utc_timestamp_to_london_date_id,
};

use super::RepositoryError;

const ENERGY_CONSUMPTION_KWH_ERROR_CODE: f64 = 16777.215f64;
const ENERGY_CONSUMPTION_WH_ERROR_CODE: i64 = 16777215i64;

const KWH_TO_WH_SCALE: Decimal = Decimal::ONE_THOUSAND;
Expand All @@ -35,82 +36,35 @@ pub struct GasConsumptionValue {
struct NewElectricityConsumption {
timestamp: NaiveDateTime,
energy_consumption_wh: i64,
london_date_id: i32,
}

#[derive(Insertable)]
#[diesel(table_name = gas_consumption)]
struct NewGasConsumption {
timestamp: NaiveDateTime,
energy_consumption_wh: i64,
london_date_id: i32,
}

#[derive(Queryable)]
pub struct ElectricityConsumptionRecord {
pub electricity_consumption_id: i32,
pub timestamp: NaiveDateTime,
pub energy_consumption_wh: i64,
pub london_date_id: Option<i32>,
}

#[derive(Queryable)]
pub struct GasConsumptionRecord {
pub gas_consumption_id: i32,
pub timestamp: NaiveDateTime,
pub energy_consumption_wh: i64,
pub london_date_id: Option<i32>,
}

type RepositoryResult<T> = Result<T, RepositoryError>;

fn group_raw_by_london_day<T, F, G>(
raw_data_utc: &Vec<T>,
proj_date_time: F,
proj_energy: G,
) -> Vec<(NaiveDate, i64)>
where
F: Fn(&T) -> &NaiveDateTime,
G: Fn(&T) -> i64,
{
let mut energy_by_day: BTreeMap<NaiveDate, i64> = BTreeMap::new();

for elem in raw_data_utc {
let date_time = proj_date_time(elem);
let energy = proj_energy(elem);

let london_date = date_time.and_utc().with_timezone(&London).date_naive();

*energy_by_day.entry(london_date).or_insert(0) += energy;
}

energy_by_day.into_iter().collect()
}

fn group_raw_by_london_month<T, F, G>(
raw_data_utc: &Vec<T>,
proj_date_time: F,
proj_energy: G,
) -> Vec<(NaiveDate, i64)>
where
F: Fn(&T) -> &NaiveDateTime,
G: Fn(&T) -> i64,
{
let mut energy_by_month: BTreeMap<NaiveDate, i64> = BTreeMap::new();

for elem in raw_data_utc {
let date_time = proj_date_time(elem);
let energy = proj_energy(elem);

let london_first_of_month = date_time
.and_utc()
.with_timezone(&London)
.date_naive()
.with_day(1)
.expect("Every month should have 1st of the month");

*energy_by_month.entry(london_first_of_month).or_insert(0) += energy;
}

energy_by_month.into_iter().collect()
}

pub trait ConsumptionRepository<T, U> {
fn insert(&self, records: Vec<T>) -> RepositoryResult<()>;

Expand Down Expand Up @@ -156,6 +110,7 @@ impl ConsumptionRepository<ElectricityConsumptionValue, ElectricityConsumptionRe
energy_consumption_wh: (x.value * KWH_TO_WH_SCALE)
.to_i64()
.expect("Electricity consumption to fit in 64-bit integer"),
london_date_id: utc_timestamp_to_london_date_id(&x.timestamp),
})
.collect();

Expand Down Expand Up @@ -199,27 +154,68 @@ impl ConsumptionRepository<ElectricityConsumptionValue, ElectricityConsumptionRe
start: NaiveDate,
end: NaiveDate,
) -> RepositoryResult<Vec<(NaiveDate, i64)>> {
let raw_data = self.get_raw(start, end)?;
use crate::schema::electricity_consumption::dsl::*;

let mut conn = self.get_connection()?;

Ok(group_raw_by_london_day(
&raw_data,
|x| &x.timestamp,
|x| x.energy_consumption_wh,
))
let start_london_date_id = naive_date_to_london_date_id(&start);
let end_london_date_id = naive_date_to_london_date_id(&end);

let daily_consumption = electricity_consumption
.filter(london_date_id.is_not_null())
.filter(london_date_id.ge(start_london_date_id))
.filter(london_date_id.lt(end_london_date_id))
.select((
london_date_id.assume_not_null(),
sql::<diesel::sql_types::BigInt>("COALESCE(SUM(energy_consumption_wh), 0)"),
))
.group_by(london_date_id)
.order(london_date_id)
.load::<(i32, i64)>(&mut *conn)?;

Ok(daily_consumption
.iter()
.map(|(date_id, energy)| {
let date = london_date_id_to_naive_date(*date_id);
(date, *energy)
})
.collect())
}

fn get_monthly(
&self,
start: NaiveDate,
end: NaiveDate,
) -> RepositoryResult<Vec<(NaiveDate, i64)>> {
let raw_data = self.get_raw(start, end)?;
use crate::schema::electricity_consumption::dsl::*;

let mut conn = self.get_connection()?;

Ok(group_raw_by_london_month(
&raw_data,
|x| &x.timestamp,
|x| x.energy_consumption_wh,
))
let start_london_date_id = naive_date_to_london_date_id(&start);
let end_london_date_id = naive_date_to_london_date_id(&end);

let london_month_id =
sql::<diesel::sql_types::Integer>("london_date_id - (london_date_id % 100) + 1");

let monthly_consumption = electricity_consumption
.filter(london_date_id.is_not_null())
.filter(london_date_id.ge(start_london_date_id))
.filter(london_date_id.lt(end_london_date_id))
.select((
london_month_id.clone().assume_not_null(),
sql::<diesel::sql_types::BigInt>("COALESCE(SUM(energy_consumption_wh), 0)"),
))
.group_by(london_month_id.clone())
.order(london_month_id)
.load::<(i32, i64)>(&mut *conn)?;

Ok(monthly_consumption
.iter()
.map(|(date_id, energy)| {
let date = london_date_id_to_naive_date(*date_id);
(date, *energy)
})
.collect())
}
}

Expand Down Expand Up @@ -250,6 +246,7 @@ impl ConsumptionRepository<GasConsumptionValue, GasConsumptionRecord>
energy_consumption_wh: (x.value * KWH_TO_WH_SCALE)
.to_i64()
.expect("Gas consumption to fit in i64"),
london_date_id: utc_timestamp_to_london_date_id(&x.timestamp),
})
.collect();

Expand Down Expand Up @@ -298,26 +295,67 @@ impl ConsumptionRepository<GasConsumptionValue, GasConsumptionRecord>
start: NaiveDate,
end: NaiveDate,
) -> RepositoryResult<Vec<(NaiveDate, i64)>> {
let raw_data = self.get_raw(start, end)?;
use crate::schema::gas_consumption::dsl::*;

let mut conn = self.get_connection()?;

Ok(group_raw_by_london_day(
&raw_data,
|x| &x.timestamp,
|x| x.energy_consumption_wh,
))
let start_london_date_id = naive_date_to_london_date_id(&start);
let end_london_date_id = naive_date_to_london_date_id(&end);

let daily_consumption = gas_consumption
.filter(london_date_id.is_not_null())
.filter(london_date_id.ge(start_london_date_id))
.filter(london_date_id.lt(end_london_date_id))
.select((
london_date_id.assume_not_null(),
sql::<diesel::sql_types::BigInt>("COALESCE(SUM(energy_consumption_wh), 0)"),
))
.group_by(london_date_id)
.order(london_date_id)
.load::<(i32, i64)>(&mut *conn)?;

Ok(daily_consumption
.iter()
.map(|(date_id, energy)| {
let date = london_date_id_to_naive_date(*date_id);
(date, *energy)
})
.collect())
}

fn get_monthly(
&self,
start: NaiveDate,
end: NaiveDate,
) -> RepositoryResult<Vec<(NaiveDate, i64)>> {
let raw_data = self.get_raw(start, end)?;
use crate::schema::gas_consumption::dsl::*;

let mut conn = self.get_connection()?;

Ok(group_raw_by_london_month(
&raw_data,
|x| &x.timestamp,
|x| x.energy_consumption_wh,
))
let start_london_date_id = naive_date_to_london_date_id(&start);
let end_london_date_id = naive_date_to_london_date_id(&end);

let london_month_id =
sql::<diesel::sql_types::Integer>("london_date_id - (london_date_id % 100) + 1");

let monthly_consumption = gas_consumption
.filter(london_date_id.is_not_null())
.filter(london_date_id.ge(start_london_date_id))
.filter(london_date_id.lt(end_london_date_id))
.select((
london_month_id.clone().assume_not_null(),
sql::<diesel::sql_types::BigInt>("COALESCE(SUM(energy_consumption_wh), 0)"),
))
.group_by(london_month_id.clone())
.order(london_month_id)
.load::<(i32, i64)>(&mut *conn)?;

Ok(monthly_consumption
.iter()
.map(|(date_id, energy)| {
let date = london_date_id_to_naive_date(*date_id);
(date, *energy)
})
.collect())
}
}
84 changes: 83 additions & 1 deletion src-tauri/src/db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
use diesel::{sqlite::SqliteConnection, Connection};
use chrono_tz::Europe::London;
use diesel::prelude::*;
use diesel::{sqlite::SqliteConnection, Connection, ExpressionMethods};
use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
use log::info;

use crate::data::RepositoryError;
use crate::utils::utc_timestamp_to_london_date_id;
use crate::{
schema::electricity_consumption::{london_date_id, table},
AppError,
};

const MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations");

Expand All @@ -19,3 +29,75 @@ pub fn establish_connection(database_url: &str) -> SqliteConnection {
SqliteConnection::establish(&database_url)
.unwrap_or_else(|_| panic!("Error connecting to {}", database_url))
}

pub fn populate_missing_london_date_ids(
conn: &mut SqliteConnection,
) -> Result<(), RepositoryError> {
const BATCH_SIZE: i64 = 5000;

{
use crate::schema::electricity_consumption::dsl::*;

loop {
let records = electricity_consumption
.filter(london_date_id.is_null())
.limit(BATCH_SIZE)
.load::<crate::data::consumption::ElectricityConsumptionRecord>(conn)?;

if records.is_empty() {
break;
}

info!(
"Populating london_date_id for {} electricity consumptionrecords",
records.len()
);

conn.transaction::<_, diesel::result::Error, _>(|transaction_conn| {
for row in records {
let date_id = utc_timestamp_to_london_date_id(&row.timestamp);

diesel::update(electricity_consumption.find(row.electricity_consumption_id))
.set(london_date_id.eq(date_id))
.execute(transaction_conn)?;
}

Ok(())
})?;
}
}

{
use crate::schema::gas_consumption::dsl::*;

loop {
let records = gas_consumption
.filter(london_date_id.is_null())
.limit(BATCH_SIZE)
.load::<crate::data::consumption::GasConsumptionRecord>(conn)?;

if records.is_empty() {
break;
}

info!(
"Populating london_date_id for {} gas consumption records",
records.len()
);

conn.transaction::<_, diesel::result::Error, _>(|transaction_conn| {
for row in records {
let date_id = utc_timestamp_to_london_date_id(&row.timestamp);

diesel::update(gas_consumption.find(row.gas_consumption_id))
.set(london_date_id.eq(date_id))
.execute(transaction_conn)?;
}

Ok(())
})?;
}
}

Ok(())
}
Loading
Loading