fix(fortuna): use query builder and add comprehensive indices

Author: cprussin

apps/fortuna/.sqlx/query-9ab85443388dbac329b8c3031c33aa4767439d43238eb95e8625e377af46ecc1.json

@@ -19,17 +19,20 @@
     flake-utils.lib.eachDefaultSystem
     (
       system: let
-        cli-overlay = nixpkgs.lib.composeExtensions mkCli.overlays.default (_: prev: {
+        cli-overlay = nixpkgs.lib.composeExtensions mkCli.overlays.default (_: prev: let
+          cargo = "cargo --color=always";
+        in {
           cli = prev.lib.mkCli "cli" {
             _noAll = true;
-            start = "cargo sqlx migrate run && cargo sqlx prepare && RUST_LOG=info cargo run run";
+            start = "${cargo} sqlx migrate run && ${cargo} sqlx prepare && RUST_LOG=info ${cargo} watch -x 'run -- run'";
             test = {
-              format = "cargo fmt --check";
-              lint = "cargo clippy";
+              format = "${cargo} fmt --check";
+              lint = "${cargo} sqlx migrate run && ${cargo} sqlx prepare && ${cargo} clippy --color always";
+              unit = "${cargo} sqlx migrate run && ${cargo} sqlx prepare && ${cargo} test -- --color always";
             };
             fix = {
-              format = "cargo fmt";
-              lint = "cargo clippy --fix";
+              format = "${cargo} fmt";
+              lint = "${cargo} sqlx migrate run && ${cargo} sqlx prepare && ${cargo} clippy -- --error-format human --color always --fix";
             };
           };
         });
@@ -51,6 +54,7 @@
             pkgs.sqlx-cli
             pkgs.foundry
             pkgs.sqlite
+            pkgs.cargo-watch
           ];
         };
       }

apps/fortuna/flake.nix

@@ -0,0 +1,22 @@
+-- Add down migration script here
+
+DROP INDEX request__network_id__state__created_at;
+DROP INDEX request__network_id__created_at;
+DROP INDEX request__sender__network_id__state__created_at;
+DROP INDEX request__sender__network_id__created_at;
+DROP INDEX request__sender__state__created_at;
+DROP INDEX request__sender__created_at;
+DROP INDEX request__sequence__network_id__state__created_at;
+DROP INDEX request__sequence__network_id__created_at;
+DROP INDEX request__sequence__state__created_at;
+DROP INDEX request__sequence__created_at;
+DROP INDEX request__state__created_at;
+DROP INDEX request__created_at;
+
+
+CREATE INDEX idx_request_sequence ON request (sequence);
+CREATE INDEX idx_request_network_id_created_at ON request (network_id, created_at);
+CREATE INDEX idx_request_created_at ON request (created_at);
+CREATE INDEX idx_request_request_tx_hash ON request (request_tx_hash) WHERE request_tx_hash IS NOT NULL;
+CREATE INDEX idx_request_reveal_tx_hash ON request (reveal_tx_hash) WHERE reveal_tx_hash IS NOT NULL;
+CREATE INDEX idx_request_sender ON request (sender) WHERE sender IS NOT NULL;

apps/fortuna/migrations/20250605004757_add_indices_for_advanced_search.down.sql

@@ -0,0 +1,22 @@
+-- Add up migration script here
+
+DROP INDEX idx_request_sequence;
+DROP INDEX idx_request_network_id_created_at;
+DROP INDEX idx_request_created_at;
+DROP INDEX idx_request_request_tx_hash;
+DROP INDEX idx_request_reveal_tx_hash;
+DROP INDEX idx_request_sender;
+
+
+CREATE INDEX request__network_id__state__created_at ON request(network_id, state, created_at);
+CREATE INDEX request__network_id__created_at ON request(network_id, created_at);
+CREATE INDEX request__sender__network_id__state__created_at ON request(sender, network_id, state, created_at);
+CREATE INDEX request__sender__network_id__created_at ON request(sender, network_id, created_at);
+CREATE INDEX request__sender__state__created_at ON request(sender, state, created_at);
+CREATE INDEX request__sender__created_at ON request(sender, created_at);
+CREATE INDEX request__sequence__network_id__state__created_at ON request(sequence, network_id, state, created_at);
+CREATE INDEX request__sequence__network_id__created_at ON request(sequence, network_id, created_at);
+CREATE INDEX request__sequence__state__created_at ON request(sequence, state, created_at);
+CREATE INDEX request__sequence__created_at ON request(sequence, created_at);
+CREATE INDEX request__state__created_at ON request(state, created_at);
+CREATE INDEX request__created_at ON request(created_at);

apps/fortuna/migrations/20250605004757_add_indices_for_advanced_search.up.sql

@@ -65,7 +65,9 @@ pub async fn explorer(
     }
     let mut query = state.history.query();
     if let Some(search) = query_params.query {
-        query = query.search(search);
+        query = query
+            .search(search)
+            .map_err(|_| RestError::InvalidQueryString)?;
     }
     if let Some(network_id) = query_params.network_id {
         query = query.network_id(network_id);