Correct account lookup bug

This reverts commit 6d2150d1b2.

.dockerignore

@@ -28,6 +28,7 @@
 **/values.dev.yaml
 /bin
 /target
+!/target/**/monzo-ingestion
 /.idea
 LICENSE
 README.md

.env

@@ -1 +1 @@
-DATABASE_URL=postgres://postgres@localhost/logos_neu
+DATABASE_URL=postgres://postgres@localhost/monzo_development

.github/workflows/build.yml

@@ -1,33 +1,102 @@
-name: Build and Publish Docker Container
+name: Build and Publish
 
 on:
   push:
-    branches:
-      - main
+    branches: [ main ]
+
+env:
+  CARGO_TERM_COLOR: always
+  RUST_BINARY_NAME: monzo-ingestion
 
 jobs:
   build:
+    name: Build and Test
     runs-on: ubuntu-latest
-    container:
-      image: catthehacker/ubuntu:act-latest
+    container: catthehacker/ubuntu:act-latest
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
+          components: rustfmt, clippy
+
+      - name: Add ARM64 target
+        run: rustup target add aarch64-unknown-linux-musl
+
+      - name: Install ARM64 toolchain
+        run: |
+          apt-get update
+          apt-get install -y gcc-aarch64-linux-gnu build-essential musl-tools
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo
+            target/
+          key: "${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}"
+          restore-keys: |
+            ${{ runner.os }}-cargo-            
+
+      - name: Build (x86_64)
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --release --all-features
+
+      - name: Build (ARM64)
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --release --all-features --target aarch64-unknown-linux-musl
+        env:
+          CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-gnu-gcc
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
-      - name: Login to Docker
-        uses: docker/login-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
         with:
           registry: git.joshuacoles.me
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build and Push Docker image
-        uses: docker/build-push-action@master
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: binaries
+          path: |
+            target/release/${{ env.RUST_BINARY_NAME }}
+            target/aarch64-unknown-linux-musl/release/${{ env.RUST_BINARY_NAME }}            
+
+#      # The target directory is kept in the .dockerignore file, so allow these to be copied in we need to move them to a
+#      # new directory.
+#      - run: mv target docker-binaries
+
+      - name: Build and push multi-arch Docker image
+        uses: docker/build-push-action@v4
         with:
           context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
           push: true
-          tags: git.joshuacoles.me/personal/monzo-ingestion:latest
+          tags: git.joshuacoles.me/${{ github.repository }}:${{ github.sha }},git.joshuacoles.me/${{ github.repository }}:latest
+          build-args: |
+            BINARY_NAME=${{ env.RUST_BINARY_NAME }}
+
+      - uses: robiningelbrecht/ntfy-action@v1.0.0
+        name: Notify via ntfy.sh
+        if: always()
+        with:
+          url: ${{ secrets.NTFY_URL }}
+          topic: ${{ secrets.NTFY_TOPIC }}
+          job_status: ${{ job.status }}

Cargo.toml

@@ -7,29 +7,31 @@ edition = "2021"
 entity = { path = "entity" }
 migration = { path = "migration" }
 
-axum = { version = "0.7.5", features = ["multipart"] }
-tokio = { version = "1.37.0", features = ["full"] }
-sea-orm = { version = "1.0.0-rc.4", features = [
+axum = { version = "0.8.8", features = ["multipart"] }
+tokio = { version = "1.48.0", features = ["full"] }
+sea-orm = { version = "1.1.0", features = [
     "sqlx-postgres",
     "runtime-tokio-rustls",
     "macros"
 ] }
 
-serde = { version = "1.0.203", features = ["derive"] }
-serde_json = "1.0.117"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
 tracing-subscriber = "0.3.18"
 tracing = "0.1.40"
-anyhow = "1.0.86"
-thiserror = "1.0.61"
-http = "1.1.0"
-chrono = { version = "0.4.38", features = ["serde"] }
-num-traits = "0.2.19"
+anyhow = { version = "1.0", features = ["backtrace"] }
+thiserror = "2.0"
+http = "1.1"
+chrono = { version = "0.4", features = ["serde"] }
+num-traits = "0.2"
 csv = "1.3.0"
-clap = "4.5.4"
-testcontainers = "0.17.0"
-testcontainers-modules = { version = "0.5.0", features = ["postgres"] }
-sqlx = { version = "0.7.4", features = ["postgres"] }
-tower-http = { version = "0.5.2", features = ["trace"] }
+clap = "4.5"
+testcontainers = "0.26"
+testcontainers-modules = { version = "0.14", features = ["postgres"] }
+sqlx = { version = "0.8", features = ["postgres"] }
+tower-http = { version = "0.6", features = ["trace"] }
+bytes = "1.7"
+once_cell = "1.19"
 
 [workspace]
 members = [".", "migration", "entity"]

Dockerfile

@@ -1,78 +1,14 @@
-# syntax=docker/dockerfile:1
+FROM busybox AS platform_determiner
+ARG TARGETPLATFORM
+ARG BINARY_NAME
 
-# Comments are provided throughout this file to help you get started.
-# If you need more help, visit the Dockerfile reference guide at
-# https://docs.docker.com/engine/reference/builder/
+COPY /target /target
+RUN case "$TARGETPLATFORM" in \
+      "linux/amd64") BINARY_PATH="/target/release/${BINARY_NAME}" ;; \
+      "linux/arm64") BINARY_PATH="/target/aarch64-unknown-linux-musl/release/${BINARY_NAME}" ;; \
+      *) exit 1 ;; \
+    esac && mv "$BINARY_PATH" "/usr/bin/monzo-ingestion" && chmod +x "/usr/bin/monzo-ingestion"
 
-################################################################################
-# Create a stage for building the application.
-
-ARG RUST_VERSION=1.76.0
-ARG APP_NAME=monzo-ingestion
-FROM rust:${RUST_VERSION}-slim-bullseye AS build
-ARG APP_NAME
-WORKDIR /app
-
-# Build the application.
-# Leverage a cache mount to /usr/local/cargo/registry/
-# for downloaded dependencies and a cache mount to /app/target/ for 
-# compiled dependencies which will speed up subsequent builds.
-# Leverage a bind mount to the src directory to avoid having to copy the
-# source code into the container. Once built, copy the executable to an
-# output directory before the cache mounted /app/target is unmounted.
-RUN --mount=type=bind,source=src,target=src \
-    --mount=type=bind,source=entity,target=entity \
-    --mount=type=bind,source=migration,target=migration \
-    --mount=type=bind,source=Cargo.toml,target=Cargo.toml \
-    --mount=type=bind,source=Cargo.lock,target=Cargo.lock \
-    --mount=type=cache,target=/app/target/ \
-    --mount=type=cache,target=/usr/local/cargo/registry/ \
-    <<EOF
-set -e
-cargo build --locked --release
-cp ./target/release/$APP_NAME /bin/server
-EOF
-
-################################################################################
-# Create a new stage for running the application that contains the minimal
-# runtime dependencies for the application. This often uses a different base
-# image from the build stage where the necessary files are copied from the build
-# stage.
-#
-# The example below uses the debian bullseye image as the foundation for running the app.
-# By specifying the "bullseye-slim" tag, it will also use whatever happens to be the
-# most recent version of that tag when you build your Dockerfile. If
-# reproducability is important, consider using a digest
-# (e.g., debian@sha256:ac707220fbd7b67fc19b112cee8170b41a9e97f703f588b2cdbbcdcecdd8af57).
-FROM debian:bullseye-slim AS final
-
-RUN set -ex; \
-    apt-get update && \
-    apt-get -y install --no-install-recommends \
-        ca-certificates curl && \
-    rm -rf /var/lib/apt/lists/*
-
-# Create a non-privileged user that the app will run under.
-# See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#user
-ARG UID=10001
-RUN adduser \
-    --disabled-password \
-    --gecos "" \
-    --home "/nonexistent" \
-    --shell "/sbin/nologin" \
-    --no-create-home \
-    --uid "${UID}" \
-    appuser
-USER appuser
-
-# Copy the executable from the "build" stage.
-COPY --from=build /bin/server /bin/
-
-# Expose the port that the application listens on.
-EXPOSE 3000
-
-HEALTHCHECK --interval=5s --timeout=3s --retries=3 \
-    CMD curl -f http://localhost:3000/health || exit 1
-
-# What the container should run when it is started.
-CMD ["/bin/server"]
+FROM --platform=$TARGETPLATFORM debian:bookworm-slim
+COPY --from=platform_determiner /usr/bin/monzo-ingestion /usr/local/bin/monzo-ingestion
+ENTRYPOINT ["/usr/local/bin/monzo-ingestion"]

entity/Cargo.toml

@@ -9,5 +9,5 @@ name = "entity"
 path = "src/lib.rs"
 
 [dependencies]
-sea-orm = { version = "1.0.0-rc.4" }
+sea-orm = { version = "1.1.0" }
 serde = { version = "1.0.203", features = ["derive"] }

entity/src/account.rs

@@ -0,0 +1,26 @@
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "account")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: i32,
+    pub name: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::transaction::Entity")]
+    Transaction,
+}
+
+impl Related<super::transaction::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Transaction.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}

entity/src/expenditure.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -14,6 +14,21 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::transaction::Entity",
+        from = "Column::TransactionId",
+        to = "super::transaction::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Transaction,
+}
+
+impl Related<super::transaction::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Transaction.def()
+    }
+}
 
 impl ActiveModelBehavior for ActiveModel {}

entity/src/lib.rs

@@ -1,6 +1,7 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 pub mod prelude;
 
+pub mod account;
 pub mod expenditure;
 pub mod transaction;

entity/src/prelude.rs

@@ -1,4 +1,5 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
+pub use super::account::Entity as Account;
 pub use super::expenditure::Entity as Expenditure;
 pub use super::transaction::Entity as Transaction;

entity/src/transaction.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -18,9 +18,33 @@ pub struct Model {
     pub description: Option<String>,
     #[sea_orm(unique)]
     pub identity_hash: Option<i64>,
+    pub account_id: Option<i32>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::account::Entity",
+        from = "Column::AccountId",
+        to = "super::account::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Account,
+    #[sea_orm(has_many = "super::expenditure::Entity")]
+    Expenditure,
+}
+
+impl Related<super::account::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Account.def()
+    }
+}
+
+impl Related<super::expenditure::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Expenditure.def()
+    }
+}
 
 impl ActiveModelBehavior for ActiveModel {}

migration/Cargo.toml

@@ -12,7 +12,7 @@ path = "src/lib.rs"
 async-std = { version = "1", features = ["attributes", "tokio1"] }
 
 [dependencies.sea-orm-migration]
-version = "1.0.0-rc.4"
+version = "1.1.0"
 features = [
    "runtime-tokio-rustls",  # `ASYNC_RUNTIME` feature
    "sqlx-postgres",         # `DATABASE_DRIVER` feature

migration/src/lib.rs

@@ -3,6 +3,9 @@ pub use sea_orm_migration::prelude::*;
 pub mod m20230904_141851_create_monzo_tables;
 mod m20240529_195030_add_transaction_identity_hash;
 mod m20240603_162500_make_title_optional;
+mod m20241015_195220_add_account_to_transactions;
+mod m20241015_200222_add_expenditure_transaction_fk;
+mod m20241015_200652_add_accounts;
 
 pub struct Migrator;
 
@@ -17,6 +20,9 @@ impl MigratorTrait for Migrator {
             Box::new(m20230904_141851_create_monzo_tables::Migration),
             Box::new(m20240529_195030_add_transaction_identity_hash::Migration),
             Box::new(m20240603_162500_make_title_optional::Migration),
+            Box::new(m20241015_195220_add_account_to_transactions::Migration),
+            Box::new(m20241015_200222_add_expenditure_transaction_fk::Migration),
+            Box::new(m20241015_200652_add_accounts::Migration),
         ]
     }
 }

migration/src/m20240603_162500_make_title_optional.rs

@@ -6,37 +6,51 @@ pub struct Migration;
 #[async_trait::async_trait]
 impl MigrationTrait for Migration {
     async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-        manager.alter_table(
-            TableAlterStatement::new()
-                .table(Transaction::Table)
-                .modify_column(ColumnDef::new(Transaction::Title).string().null())
-                .to_owned()
-        ).await?;
+        manager
+            .alter_table(
+                TableAlterStatement::new()
+                    .table(Transaction::Table)
+                    .modify_column(ColumnDef::new(Transaction::Title).string().null())
+                    .to_owned(),
+            )
+            .await?;
 
         // Set all empty string titles to null
-        manager.get_connection().execute_unprepared(r#"
+        manager
+            .get_connection()
+            .execute_unprepared(
+                r#"
             update transaction
             set title = null
             where title = ''
-        "#).await?;
+        "#,
+            )
+            .await?;
 
         Ok(())
     }
 
     async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
         // Set all null titles to empty string when reverting
-        manager.get_connection().execute_unprepared(r#"
+        manager
+            .get_connection()
+            .execute_unprepared(
+                r#"
             update transaction
             set title = ''
             where title is null
-        "#).await?;
+        "#,
+            )
+            .await?;
 
-        manager.alter_table(
-            TableAlterStatement::new()
-                .table(Transaction::Table)
-                .modify_column(ColumnDef::new(Transaction::Title).string().not_null())
-                .to_owned()
-        ).await
+        manager
+            .alter_table(
+                TableAlterStatement::new()
+                    .table(Transaction::Table)
+                    .modify_column(ColumnDef::new(Transaction::Title).string().not_null())
+                    .to_owned(),
+            )
+            .await
     }
 }
 

migration/src/m20241015_195220_add_account_to_transactions.rs

@@ -0,0 +1,76 @@
+use sea_orm_migration::{prelude::*, schema::*};
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .create_table(
+                Table::create()
+                    .table(Account::Table)
+                    .if_not_exists()
+                    .col(
+                        ColumnDef::new(Account::Id)
+                            .integer()
+                            .auto_increment()
+                            .not_null()
+                            .primary_key(),
+                    )
+                    .col(
+                        ColumnDef::new(Account::Name)
+                            .string()
+                            .not_null(),
+                    )
+                    .to_owned(),
+            )
+            .await?;
+
+        manager.alter_table(
+            TableAlterStatement::new()
+                .table(Transaction::Table)
+                .add_column(ColumnDef::new(Transaction::AccountId).integer())
+                .to_owned(),
+        ).await?;
+
+        manager
+            .create_foreign_key(
+                ForeignKey::create()
+                    .name("fk_transaction_account_id")
+                    .from(Transaction::Table, Transaction::AccountId)
+                    .to(Account::Table, Account::Id)
+                    .on_delete(ForeignKeyAction::Cascade)
+                    .to_owned(),
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager.alter_table(
+            TableAlterStatement::new()
+                .table(Transaction::Table)
+                .drop_column(Transaction::AccountId)
+                .to_owned(),
+        ).await?;
+
+        manager.drop_table(Table::drop().table(Account::Table).to_owned()).await?;
+
+        Ok(())
+    }
+}
+
+#[derive(DeriveIden)]
+enum Account {
+    Table,
+    Id,
+    Name,
+}
+
+#[derive(DeriveIden)]
+enum Transaction {
+    Table,
+    AccountId,
+}

migration/src/m20241015_200222_add_expenditure_transaction_fk.rs

@@ -0,0 +1,40 @@
+use sea_orm_migration::{prelude::*, schema::*};
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .create_foreign_key(
+                ForeignKey::create()
+                    .name("fk_expenditure_transaction_id")
+                    .from(Expenditure::Table, Expenditure::TransactionId)
+                    .to(Transaction::Table, Transaction::Id)
+                    .on_delete(ForeignKeyAction::Cascade)
+                    .to_owned(),
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager.drop_foreign_key(ForeignKey::drop().name("fk_expenditure_transaction_id").to_owned()).await?;
+
+        Ok(())
+    }
+}
+
+#[derive(DeriveIden)]
+enum Transaction {
+    Table,
+    Id,
+}
+
+#[derive(DeriveIden)]
+enum Expenditure {
+    Table,
+    TransactionId,
+}

migration/src/m20241015_200652_add_accounts.rs

@@ -0,0 +1,53 @@
+use sea_orm_migration::{prelude::*, schema::*};
+use crate::sea_orm::sqlx;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager.exec_stmt(
+            InsertStatement::new()
+                .into_table(Account::Table)
+                .columns(vec![Account::Name])
+                .values_panic(["Monzo".into()])
+                .values_panic(["Flex".into()])
+                .to_owned()
+        ).await?;
+
+        let id: i32 = manager.get_connection().query_one(
+            sea_orm::Statement::from_string(
+                manager.get_database_backend(),
+                "SELECT id FROM account WHERE name = 'Monzo'",
+            )
+        ).await?.expect("Monzo account not found").try_get_by_index(0)?;
+
+        manager.exec_stmt(
+            UpdateStatement::new()
+                .table(Transaction::Table)
+                .values([(Transaction::AccountId, id.into())])
+                .to_owned()
+        ).await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        // This is a data creation migration, so we do not roll back the migration
+        Ok(())
+    }
+}
+
+#[derive(DeriveIden)]
+enum Account {
+    Table,
+    Id,
+    Name,
+}
+
+#[derive(DeriveIden)]
+enum Transaction {
+    Table,
+    AccountId,
+}

src/error.rs

@@ -6,25 +6,33 @@ use tracing::log::error;
 #[derive(thiserror::Error, Debug)]
 pub enum AppError {
     /// SeaORM error, separated for ease of use allowing us to `?` db operations.
-    #[error("Internal error")]
+    #[error("Database error: {0}")]
     DbError(#[from] DbErr),
 
     #[error("Invalid request {0}")]
     BadRequest(anyhow::Error),
 
     /// Catch all for error we don't care to expose publicly.
-    #[error("Internal error")]
+    #[error("An error occurred: {0}")]
     Anyhow(#[from] anyhow::Error),
 }
 
+impl AppError {
+    fn to_response_string(&self) -> String {
+        match self {
+            AppError::BadRequest(e) => e.to_string(),
+            _ => "Internal server error".to_string(),
+        }
+    }
+}
+
 impl IntoResponse for AppError {
     fn into_response(self) -> Response {
-        error!("Internal server error: {self:?}");
-
         let status_code = match self {
+            AppError::BadRequest(_) => StatusCode::BAD_REQUEST,
             _ => StatusCode::INTERNAL_SERVER_ERROR,
         };
 
-        (status_code, self.to_string()).into_response()
+        (status_code, self.to_response_string()).into_response()
     }
 }

src/ingestion/db.rs

@@ -4,7 +4,7 @@ use anyhow::anyhow;
 use entity::{expenditure, transaction};
 use sea_orm::sea_query::OnConflict;
 use sea_orm::{
-    ColumnTrait, DatabaseConnection, EntityTrait, Iterable, QuerySelect, TransactionTrait,
+    ColumnTrait, DatabaseConnection, DbErr, EntityTrait, Iterable, QuerySelect, TransactionTrait,
 };
 use sea_orm::{ConnectionTrait, DatabaseTransaction, QueryFilter};
 
@@ -20,18 +20,23 @@ pub struct Insertion {
 pub async fn insert(
     db: &DatabaseConnection,
     monzo_rows: Vec<MonzoRow>,
+    account_id: i32,
 ) -> Result<Vec<String>, AppError> {
     let mut new_transaction_ids = Vec::new();
     let insertions = monzo_rows
         .into_iter()
-        .map(MonzoRow::into_insertion)
+        .map(|row| MonzoRow::into_insertion(row, account_id))
         .collect::<Result<Vec<_>, _>>()?;
 
-    for insertions in insertions.chunks(400) {
-        let tx = db.begin().await?;
+    for insertions in insertions.chunks(200) {
         let (new_or_updated_insertions, inserted_transaction_ids) =
-            whittle_insertions(insertions, &tx).await?;
+            whittle_insertions(insertions, db).await?;
 
+        if new_or_updated_insertions.is_empty() {
+            continue;
+        }
+
+        let tx = db.begin().await?;
         update_transactions(&tx, &new_or_updated_insertions).await?;
         update_expenditures(&tx, &new_or_updated_insertions, &inserted_transaction_ids).await?;
         tx.commit().await?;
@@ -52,6 +57,10 @@ async fn update_expenditures(
     new_or_updated_insertions: &[&Insertion],
     inserted_transaction_ids: &[String],
 ) -> Result<(), AppError> {
+    if new_or_updated_insertions.is_empty() {
+        return Ok(());
+    }
+
     // Expenditures can change as we re-categorise them, so we delete all the old ones and
     // insert an entirely new set to ensure we don't end up leaving old ones around.
     expenditure::Entity::delete_many()
@@ -61,7 +70,7 @@ async fn update_expenditures(
 
     expenditure::Entity::insert_many(
         new_or_updated_insertions
-            .into_iter()
+            .iter()
             .flat_map(|i| &i.contained_expenditures)
             .cloned(),
     )
@@ -81,7 +90,11 @@ async fn update_expenditures(
 async fn update_transactions(
     tx: &DatabaseTransaction,
     new_or_updated_insertions: &[&Insertion],
-) -> Result<(), AppError> {
+) -> Result<(), DbErr> {
+    if new_or_updated_insertions.is_empty() {
+        return Ok(());
+    }
+
     let transactions = new_or_updated_insertions
         .iter()
         .map(|i| &i.transaction)
@@ -100,7 +113,7 @@ async fn update_transactions(
 
 async fn whittle_insertions<'a>(
     insertions: &'a [Insertion],
-    tx: &DatabaseTransaction,
+    tx: &DatabaseConnection,
 ) -> Result<(Vec<&'a Insertion>, Vec<String>), AppError> {
     let existing_hashes = transaction::Entity::find()
         .select_only()
@@ -110,10 +123,12 @@ async fn whittle_insertions<'a>(
         .all(tx)
         .await?;
 
+    tracing::debug!("Found existing entries: {existing_hashes:?}");
+
     // We will only update those where the hash is different to avoid unnecessary updates and
     // notifications.
     let new_or_updated_insertions = insertions
-        .into_iter()
+        .iter()
         .filter(|i| {
             let hash = i.identity_hash;
             !existing_hashes
@@ -143,23 +158,29 @@ async fn notify_new_transactions(
 }
 
 mod tests {
-    use super::notify_new_transactions;
+    use super::{insert, notify_new_transactions, update_expenditures, update_transactions};
+    use crate::ingestion::ingestion_logic::from_json_row;
     use anyhow::Error;
+    use entity::account;
     use migration::MigratorTrait;
-    use sea_orm::DatabaseConnection;
+    use sea_orm::{ActiveModelTrait, DatabaseConnection, TransactionTrait};
+    use serde_json::Value;
     use sqlx::postgres::PgListener;
-    use sqlx::PgPool;
+    use sqlx::{Executor, PgPool};
     use testcontainers::runners::AsyncRunner;
     use testcontainers::ContainerAsync;
+    use tokio::sync::OnceCell;
 
-    async fn initialise() -> Result<
-        (
-            ContainerAsync<testcontainers_modules::postgres::Postgres>,
-            DatabaseConnection,
-            PgPool,
-        ),
-        Error,
-    > {
+    #[derive(Debug)]
+    struct DatabaseInstance {
+        container: ContainerAsync<testcontainers_modules::postgres::Postgres>,
+        db: DatabaseConnection,
+        pool: PgPool,
+    }
+
+    static INSTANCE: OnceCell<DatabaseInstance> = OnceCell::const_new();
+
+    async fn initialise_db() -> Result<DatabaseInstance, Error> {
         let container = testcontainers_modules::postgres::Postgres::default()
             .start()
             .await?;
@@ -174,14 +195,46 @@ mod tests {
         migration::Migrator::up(&db, None).await?;
 
         let pool = PgPool::connect(connection_string).await?;
+        let instance = DatabaseInstance {
+            container,
+            db,
+            pool,
+        };
 
-        Ok((container, db, pool))
+        Ok(instance)
+    }
+
+    async fn get_or_initialize_db_instance() -> Result<&'static DatabaseInstance, Error> {
+        Ok(INSTANCE
+            .get_or_init(|| async { initialise_db().await.unwrap() })
+            .await)
+    }
+
+    async fn create_test_account(db: &DatabaseConnection) -> Result<i32, Error> {
+        let new_account = account::ActiveModel {
+            id: sea_orm::ActiveValue::NotSet,
+            name: sea_orm::ActiveValue::Set("Test Account".to_string()),
+        };
+        let inserted = new_account.insert(db).await?;
+        Ok(inserted.id)
+    }
+
+    #[tokio::test]
+    async fn test_empty_insertion_list() -> Result<(), Error> {
+        let db = get_or_initialize_db_instance().await?;
+        let insertions = vec![];
+        let tx = db.db.begin().await?;
+        update_transactions(&tx, &insertions).await?;
+        update_expenditures(&tx, &insertions, &vec![]).await?;
+        tx.commit().await?;
+
+        Ok(())
     }
 
     #[tokio::test]
     async fn test_notify() -> Result<(), Error> {
-        let (_container, db, pool) = initialise().await?;
-        let mut listener = PgListener::connect_with(&pool).await?;
+        let dbi = get_or_initialize_db_instance().await?;
+        let mut listener = PgListener::connect_with(&dbi.pool).await?;
         listener.listen("monzo_new_transactions").await?;
 
         let ids = vec![
@@ -190,7 +243,7 @@ mod tests {
             "test3".to_string(),
         ];
 
-        notify_new_transactions(&db, &ids).await?;
+        notify_new_transactions(&dbi.db, &ids).await?;
 
         let notification = listener.recv().await?;
         let payload = notification.payload();
@@ -203,4 +256,81 @@ mod tests {
 
         Ok(())
     }
+
+    #[tokio::test]
+    async fn test_notify_on_insert() -> Result<(), Error> {
+        let dbi = get_or_initialize_db_instance().await?;
+        let account_id = create_test_account(&dbi.db).await?;
+        let mut listener = PgListener::connect_with(&dbi.pool).await?;
+        listener.listen("monzo_new_transactions").await?;
+
+        let json = include_str!("../../fixtures/transactions.json");
+        let json: Vec<Vec<Value>> = serde_json::from_str(json).unwrap();
+        let data = json
+            .iter()
+            .map(|row| from_json_row(row))
+            .collect::<Result<Vec<_>, anyhow::Error>>()?;
+
+        insert(&dbi.db, data.clone(), account_id).await?;
+        let notification = listener.recv().await?;
+        let payload = notification.payload();
+        let mut payload = serde_json::from_str::<Vec<String>>(&payload)?;
+        payload.sort();
+
+        let mut ids = data
+            .iter()
+            .map(|row| row.transaction_id.clone())
+            .collect::<Vec<_>>();
+
+        ids.sort();
+
+        assert_eq!(payload, ids, "Inserted IDs do not match");
+
+        insert(&dbi.db, data.clone(), account_id).await?;
+        let notification = listener.recv().await?;
+        let payload = notification.payload();
+        let payload = serde_json::from_str::<Vec<String>>(&payload)?;
+        assert_eq!(
+            payload,
+            Vec::<String>::new(),
+            "Re-inserting identical rows triggered double notification"
+        );
+
+        let mut altered_data = data.clone();
+        altered_data[0].description = Some("New description".to_string());
+
+        assert_ne!(
+            altered_data[0].compute_hash(),
+            data[0].compute_hash(),
+            "Alterations have the same hash"
+        );
+
+        insert(&dbi.db, altered_data.clone(), account_id).await?;
+        let notification = listener.recv().await?;
+        let payload = notification.payload();
+        let payload = serde_json::from_str::<Vec<String>>(&payload)?;
+        assert_eq!(
+            payload,
+            vec![altered_data[0].transaction_id.clone()],
+            "Re-inserting altered row failed to re-trigger notification"
+        );
+
+        Ok(())
+    }
+}
+
+pub(crate) async fn get_account_id(
+    p0: &DatabaseConnection,
+    p1: Option<String>,
+) -> Result<i32, AppError> {
+    let p1 = p1.unwrap_or("Monzo".to_string());
+
+    entity::prelude::Account::find()
+        .filter(entity::account::Column::Name.eq(p1))
+        .select_only()
+        .column(entity::account::Column::Id)
+        .into_tuple::<i32>()
+        .one(p0)
+        .await?
+        .ok_or(AppError::BadRequest(anyhow!("Account not found")))
 }

src/ingestion/flex.rs

@@ -0,0 +1,9 @@
+#[allow(dead_code)]
+pub mod headings {
+    #[allow(unused_imports)]
+    pub use super::super::ingestion_logic::headings::*;
+
+    // Additional Flex headings
+    pub const MONEY_OUT: usize = 16;
+    pub const MONEY_IN: usize = 17;
+}

src/ingestion/ingestion_logic.rs

@@ -9,9 +9,10 @@ use sea_orm::prelude::Decimal;
 use sea_orm::IntoActiveModel;
 use serde_json::Value;
 use std::hash::Hash;
+use crate::ingestion::flex;
 
 #[allow(dead_code)]
-mod headings {
+pub(crate) mod headings {
     pub const TRANSACTION_ID: usize = 0;
     pub const DATE: usize = 1;
     pub const TIME: usize = 2;
@@ -30,19 +31,19 @@ mod headings {
     pub const CATEGORY_SPLIT: usize = 15;
 }
 
-#[derive(Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Hash, Clone)]
 pub struct MonzoRow {
-    category_split: Option<String>,
-    primary_category: String,
-    total_amount: Decimal,
-    receipt: Option<String>,
-    notes: Option<String>,
-    emoji: Option<String>,
-    description: Option<String>,
-    transaction_type: String,
-    title: Option<String>,
-    timestamp: NaiveDateTime,
-    transaction_id: String,
+    pub category_split: Option<String>,
+    pub primary_category: String,
+    pub total_amount: Decimal,
+    pub receipt: Option<String>,
+    pub notes: Option<String>,
+    pub emoji: Option<String>,
+    pub description: Option<String>,
+    pub transaction_type: String,
+    pub title: Option<String>,
+    pub timestamp: NaiveDateTime,
+    pub transaction_id: String,
 }
 
 impl MonzoRow {
@@ -77,7 +78,7 @@ impl MonzoRow {
         hasher.finish() as i64
     }
 
-    pub fn into_insertion(self) -> Result<Insertion, anyhow::Error> {
+    pub fn into_insertion(self, account_id: i32) -> Result<Insertion, anyhow::Error> {
         let identity_hash = self.compute_hash();
 
         let expenditures: Vec<_> = match &self.category_split {
@@ -106,6 +107,7 @@ impl MonzoRow {
                 total_amount: self.total_amount,
                 description: self.description,
                 identity_hash: Some(identity_hash),
+                account_id: Some(account_id),
             }
             .into_active_model(),
 
@@ -138,7 +140,7 @@ fn parse_timestamp(date: &str, time: &str) -> anyhow::Result<NaiveDateTime> {
     Ok(date.and_time(time))
 }
 
-pub fn from_json_row(row: Vec<Value>) -> anyhow::Result<MonzoRow> {
+pub fn from_json_row(row: &[Value]) -> anyhow::Result<MonzoRow> {
     let date = DateTime::parse_from_rfc3339(row[headings::DATE].as_str().context("No date")?)
         .context("Failed to parse date")?;
 
@@ -174,12 +176,14 @@ fn test_json() {
     let json: Vec<Vec<Value>> = serde_json::from_str(json).unwrap();
     let mut csv_reader = csv::Reader::from_reader(csv.as_bytes());
 
-    let json_rows = json.iter()
-        .map(|row| from_json_row(row.clone()))
+    let json_rows = json
+        .iter()
+        .map(|row| from_json_row(&row))
         .collect::<Result<Vec<_>, anyhow::Error>>()
         .unwrap();
 
-    let csv_rows = csv_reader.records()
+    let csv_rows = csv_reader
+        .records()
         .map(|record| from_csv_row(record.unwrap()))
         .collect::<Result<Vec<_>, anyhow::Error>>()
         .unwrap();
@@ -188,7 +192,12 @@ fn test_json() {
 
     for (i, (json_row, csv_row)) in json_rows.iter().zip(csv_rows.iter()).enumerate() {
         assert_eq!(json_row, csv_row, "Row {} is different", i);
-        assert_eq!(json_row.compute_hash(), csv_row.compute_hash(), "Row {} hash are different", i);
+        assert_eq!(
+            json_row.compute_hash(),
+            csv_row.compute_hash(),
+            "Row {} hash are different",
+            i
+        );
     }
 }
 

src/ingestion/mod.rs

@@ -1,3 +1,4 @@
 pub mod db;
 pub mod ingestion_logic;
+pub mod flex;
 pub mod routes;

src/ingestion/routes.rs

@@ -2,66 +2,133 @@ use crate::error::AppError;
 use crate::ingestion::db;
 use crate::ingestion::ingestion_logic::{from_csv_row, from_json_row};
 use anyhow::anyhow;
+use axum::extract::multipart::MultipartError;
 use axum::extract::{Extension, Json, Multipart};
+use bytes::Bytes;
 use sea_orm::DatabaseConnection;
 use serde_json::Value;
 use std::io::Cursor;
 
-pub async fn monzo_updated(
-    Extension(db): Extension<DatabaseConnection>,
-    Json(row): Json<Vec<Value>>,
-) -> Result<&'static str, AppError> {
-    db::insert(&db, vec![from_json_row(row)?]).await.unwrap();
+#[derive(serde::Deserialize, Debug)]
+#[serde(untagged)]
+pub enum MonzoBatchedJsonInput {
+    Legacy(Vec<Vec<Value>>),
+    New {
+        account_id: Option<u8>,
+        rows: Vec<Vec<Value>>,
+    },
+}
 
-    Ok("Ok")
+impl MonzoBatchedJsonInput {
+    fn account_id(&self) -> Option<u8> {
+        match self {
+            MonzoBatchedJsonInput::Legacy(_) => None,
+            MonzoBatchedJsonInput::New { account_id, .. } => *account_id,
+        }
+    }
+
+    fn rows(&self) -> &[Vec<Value>] {
+        match self {
+            MonzoBatchedJsonInput::Legacy(rows) => rows,
+            MonzoBatchedJsonInput::New { rows, .. } => rows,
+        }
+    }
 }
 
 pub async fn monzo_batched_json(
     Extension(db): Extension<DatabaseConnection>,
-    Json(data): Json<Vec<Vec<Value>>>,
+    Json(data): Json<MonzoBatchedJsonInput>,
 ) -> Result<&'static str, AppError> {
-    let insertions = data
-        .into_iter()
-        .skip(1)
-        .map(|row| from_json_row(row))
+    let rows = data
+        .rows()
+        .iter()
+        .skip_while(|row| row[0] == Value::String("Transaction ID".to_string()))
+        .map(|row| from_json_row(row.as_ref()))
         .collect::<Result<_, _>>()?;
 
-    db::insert(&db, insertions).await.unwrap();
+    // We default to the main account for JSON ingestion for now.
+    db::insert(&db, rows, data.account_id().unwrap_or(1) as i32).await?;
+
+    Ok("Ok")
+}
+
+async fn extract_csv_and_account_name(
+    mut multipart: Multipart,
+) -> Result<(Option<Bytes>, Option<String>), MultipartError> {
+    let mut csv = None;
+    let mut account_name = None;
+
+    while let Some(field) = multipart.next_field().await? {
+        match field.name() {
+            Some("csv") => {
+                csv = Some(field.bytes().await?);
+            }
+
+            Some("account_id") => {
+                account_name = Some(field.text().await?);
+            }
+
+            _ => {}
+        }
+
+        if csv.is_some() && account_name.is_some() {
+            break;
+        }
+    }
+
+    Ok((csv, account_name))
+}
+
+#[derive(serde::Deserialize, Debug, Clone)]
+pub struct ShortcutBody {
+    pub body: String,
+    pub account_name: String,
+}
+
+pub async fn shortcuts_csv(
+    Extension(db): Extension<DatabaseConnection>,
+    Json(shortcut_body): Json<ShortcutBody>,
+) -> Result<&'static str, AppError> {
+    let account_id = db::get_account_id(&db, Some(shortcut_body.account_name)).await?;
+
+    let csv = Cursor::new(shortcut_body.body.as_bytes());
+    let mut csv = csv::Reader::from_reader(csv);
+    let data = csv.records();
+    let data = data
+        .filter_map(|f| f.ok())
+        .map(from_csv_row)
+        .collect::<Result<_, _>>()?;
+
+    db::insert(&db, data, account_id).await?;
 
     Ok("Ok")
 }
 
 pub async fn monzo_batched_csv(
     Extension(db): Extension<DatabaseConnection>,
-    mut multipart: Multipart,
+    multipart: Multipart,
 ) -> Result<&'static str, AppError> {
-    let csv = loop {
-        match multipart.next_field().await.unwrap() {
-            Some(field) if field.name() == Some("csv") => {
-                break Some(field.bytes().await.unwrap());
-            }
+    static CSV_MISSING_ERR_MSG: &str = "No CSV file provided. Expected a multipart request with a `csv` field containing the contents of the CSV.";
 
-            Some(_) => {}
-            None => break None,
-        }
-    };
+    let (csv, account_name) = extract_csv_and_account_name(multipart)
+        .await
+        .map_err(|e| AppError::BadRequest(anyhow!(e)))?;
 
     let Some(csv) = csv else {
-        return Err(AppError::BadRequest(anyhow!("No CSV file provided")));
+        return Err(AppError::BadRequest(anyhow!(CSV_MISSING_ERR_MSG)));
     };
 
+    let account_id = db::get_account_id(&db, account_name).await?;
+
     let csv = Cursor::new(csv);
     let mut csv = csv::Reader::from_reader(csv);
     let data = csv.records();
+    let data = data
+        .filter_map(|f| f.ok())
+        .map(from_csv_row)
+        .collect::<Result<_, _>>()?;
 
-    db::insert(
-        &db,
-        data.filter_map(|f| f.ok())
-            .map(from_csv_row)
-            .collect::<Result<_, _>>()?,
-    )
-    .await
-    .unwrap();
+    db::insert(&db, data, account_id).await?;
 
     Ok("Ok")
 }

src/main.rs

@@ -2,29 +2,64 @@ mod error;
 mod ingestion;
 
 use crate::error::AppError;
-use crate::ingestion::routes::{monzo_batched_csv, monzo_batched_json, monzo_updated};
+use crate::ingestion::db;
+use crate::ingestion::ingestion_logic::from_csv_row;
+use crate::ingestion::routes::{monzo_batched_csv, monzo_batched_json, shortcuts_csv};
 use axum::routing::{get, post};
 use axum::{Extension, Router};
-use clap::Parser;
+use clap::{Parser, Subcommand};
 use migration::{Migrator, MigratorTrait};
 use sea_orm::{ConnectionTrait, DatabaseConnection};
+use std::fs::File;
 use std::net::SocketAddr;
+use std::path::PathBuf;
 use tower_http::trace::TraceLayer;
 use tracing::log::LevelFilter;
 
+#[derive(Debug, Subcommand)]
+enum Commands {
+    /// Manually run database migrations.
+    Migrate {
+        /// Number of migration steps to perform. If not provided, all migrations will be run.
+        #[arg(long)]
+        steps: Option<u32>,
+
+        /// If we should perform migration down.
+        #[arg(long)]
+        down: bool,
+    },
+
+    /// Start web app for to the google-sheets app script
+    Serve {
+        /// If we should perform migration at startup.
+        #[clap(short, long, env, default_value_t = true)]
+        migrate: bool,
+
+        /// The server address to bind to.
+        #[clap(short, long, env, default_value = "0.0.0.0:3000")]
+        addr: SocketAddr,
+    },
+
+    /// Ingest a google-sheets CSV export into the database.
+    Csv {
+        /// The path of the CSV file to ingest.
+        csv_file: PathBuf,
+
+        /// The name of the account to ingest the CSV for.
+        #[clap(long, short)]
+        account: String,
+    },
+}
+
+/// Ingest and manage monzo transactions from the Monzo Plus auto-export feature
 #[derive(Debug, clap::Parser)]
-struct Config {
-    /// If we should perform migration on startup.
-    #[clap(short, long, env, default_value_t = true)]
-    migrate: bool,
-
-    /// The server address to bind to.
-    #[clap(short, long, env, default_value = "0.0.0.0:3000")]
-    addr: SocketAddr,
-
+struct Cli {
     /// URL to PostgreSQL database.
     #[clap(short, long = "db", env)]
     database_url: String,
+
+    #[command(subcommand)]
+    command: Commands,
 }
 
 async fn health_check(
@@ -37,29 +72,60 @@ async fn health_check(
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    let config: Config = Config::parse();
-    let connection = sea_orm::ConnectOptions::new(&config.database_url)
+    tracing_subscriber::fmt::init();
+
+    let cli: Cli = Cli::parse();
+    let connection = sea_orm::ConnectOptions::new(&cli.database_url)
         .sqlx_logging_level(LevelFilter::Debug)
         .to_owned();
 
     let connection = sea_orm::Database::connect(connection).await?;
 
-    if config.migrate {
-        Migrator::up(&connection, None).await?;
+    match cli.command {
+        Commands::Migrate { steps, down } => {
+            if down {
+                Migrator::down(&connection, steps).await?;
+            } else {
+                Migrator::up(&connection, steps).await?
+            }
+        }
+
+        Commands::Serve { migrate, addr } => {
+            if migrate {
+                Migrator::up(&connection, None).await?;
+            }
+
+            serve_web(addr, connection).await?;
+        }
+
+        Commands::Csv { csv_file, account: account_name } => {
+            let mut csv = csv::Reader::from_reader(File::open(csv_file)?);
+            let data = csv.records();
+            let data = data
+                .filter_map(|f| f.ok())
+                .map(from_csv_row)
+                .collect::<Result<_, _>>()?;
+
+            let account_id = db::get_account_id(&connection, Some(account_name)).await?;
+            db::insert(&connection, data, account_id).await?;
+        }
     }
 
-    tracing_subscriber::fmt::init();
+    Ok(())
+}
+
+async fn serve_web(address: SocketAddr, connection: DatabaseConnection) -> anyhow::Result<()> {
     let app = Router::new()
         .route("/health", get(health_check))
-        .route("/monzo-updated", post(monzo_updated))
         .route("/monzo-batch-export", post(monzo_batched_json))
         .route("/monzo-csv-ingestion", post(monzo_batched_csv))
+        .route("/shortcuts-csv-import", post(shortcuts_csv))
         .layer(Extension(connection.clone()))
         .layer(TraceLayer::new_for_http());
 
-    tracing::debug!("listening on {}", &config.addr);
-    let listener = tokio::net::TcpListener::bind(&config.addr).await.unwrap();
-    axum::serve(listener, app).await.unwrap();
+    tracing::info!("listening on {}", &address);
+    let listener = tokio::net::TcpListener::bind(&address).await?;
+    axum::serve(listener, app).await?;
 
     Ok(())
 }