PeopleForBikes · rgreinho · Dec 27, 2024 · Dec 13, 2024 · Dec 27, 2024
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,6 +42,7 @@ serde_with = "3.11.0"
 thiserror = "2.0.3"
 time = "0.3.37"
 tokio = "1.41.0"
+tower-http = "0.6.2"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", default-features = false }
 url = "2.3.1"
@@ -68,3 +69,4 @@ tokio = { workspace = true }
 bnacore = { workspace = true }
 csv = { workspace = true }
 itertools = { workspace = true }
+time = { workspace = true, features = ["formatting"] }
diff --git a/effortless/src/api.rs b/effortless/src/api.rs
@@ -211,7 +211,15 @@ impl Default for PaginationParameters {
 
 impl PaginationParameters {
     pub fn page_size(&self) -> u64 {
-        self.page_size.unwrap_or(DEFAULT_PAGE_SIZE)
+        // self.page_size.unwrap_or(DEFAULT_PAGE_SIZE)
+        match self.page_size {
+            Some(value) => match value {
+                0 => 1,
+                1..=MAX_PAGE_SIZE => value,
+                _ => MAX_PAGE_SIZE,
+            },
+            None => DEFAULT_PAGE_SIZE,
+        }
     }
 }
 
@@ -237,7 +245,7 @@ pub fn extract_pagination_parameters(
         match page_size.parse::<u64>() {
             Ok(page_size) => {
                 pagination.page_size = match page_size {
-                    0..=MAX_PAGE_SIZE => Some(page_size),
+                    1..=MAX_PAGE_SIZE => Some(page_size),
                     _ => Some(MAX_PAGE_SIZE),
                 }
             }

diff --git a/examples/seeder.rs b/examples/seeder.rs
@@ -14,6 +14,7 @@ use entity::{
 use sea_orm::{prelude::Uuid, ActiveValue, Database, EntityTrait};
 use serde::Deserialize;
 use std::collections::{HashMap, HashSet};
+use time::format_description::well_known;
 
 const US_STATE_COUNT: usize = 51; // w/ Puerto Rico
 const CHUNK_SIZE: usize = 1000;
@@ -82,11 +83,11 @@ async fn main() -> Result<(), Report> {
         let version = Calver::try_from_ubuntu(&calver).unwrap();
 
         // Get the records creation date.
-        let created_at = scorecard
+        let created_at_str = scorecard
             .creation_date
-            .to_string()
-            .parse::<DateTime<FixedOffset>>()
+            .format(&well_known::Iso8601::DEFAULT)
             .unwrap();
+        let created_at = created_at_str.parse::<DateTime<FixedOffset>>().unwrap();
 
         // Get the City UUID.
         let city_uuid = Uuid::parse_str(&scorecard.bna_id).unwrap();

diff --git a/justfile b/justfile
@@ -103,3 +103,11 @@ generate-client:
       --interface builder \
       --license-name MIT \
       -v 1.0.0
+
+# Start the Axum server locally in watch mode.
+debug-axum:
+  BNA_API_LOG_LEVEL=debug \
+  BNA_API_STANDALONE=1 \
+  DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres \
+  cargo watch -x \
+    'run -p lambdas --bin axumed'
diff --git a/lambdas/Cargo.toml b/lambdas/Cargo.toml
@@ -31,6 +31,7 @@ serde_json = { workspace = true }
 serde_plain = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["macros"] }
+tower-http = { workspace = true, features = ["trace"] }
 tracing = { workspace = true, features = ["log"] }
 tracing-subscriber = { workspace = true, features = ["fmt"] }
 url = { workspace = true }

diff --git a/lambdas/requests.rest b/lambdas/requests.rest
@@ -11,6 +11,11 @@
 # Query the first page of the bnas.
 GET {{host}}/ratings
 
+
+###
+# Query the first page of the bnas.
+GET {{host}}/ratings?page_size=1257596201
+
 ###
 # Query a specific bna run.
 GET {{host}}/ratings/{{rating_id}}

diff --git a/lambdas/src/bin/ratings/patch-ratings-analysis.rs b/lambdas/src/bin/ratings/patch-ratings-analysis.rs
@@ -2,10 +2,11 @@ use dotenv::dotenv;
 use effortless::{
     api::{missing_parameter, parse_path_parameter, parse_request_body},
     error::APIErrors,
+    fragment::BnaRequestExt,
 };
 use entity::wrappers::bna_pipeline::BNAPipelinePatch;
 use lambda_http::{run, service_fn, Body, Error, IntoResponse, Request, Response};
-use lambdas::core::resource::ratings::adaptor::patch_ratings_analysis_adaptor;
+use lambdas::{core::resource::ratings::adaptor::patch_ratings_analysis_adaptor, Context};
 use sea_orm::prelude::Uuid;
 use tracing::info;
 
@@ -27,8 +28,16 @@ async fn function_handler(event: Request) -> Result<Response<Body>, Error> {
         },
         Err(e) => return Ok(e.into()),
     };
+    let ctx = Context::new(
+        event.apigw_request_id(),
+        event
+            .uri()
+            .path_and_query()
+            .expect("to have a path and optional query parameters")
+            .to_string(),
+    );
 
-    match patch_ratings_analysis_adaptor(wrapper, analysis_id).await {
+    match patch_ratings_analysis_adaptor(wrapper, analysis_id, ctx).await {
         Ok(v) => Ok(v.into_response().await),
         Err(e) => Ok(APIErrors::from(e).into()),
     }

diff --git a/lambdas/src/core/resource/ratings/adaptor.rs b/lambdas/src/core/resource/ratings/adaptor.rs
@@ -13,7 +13,7 @@ use entity::{
         bna_pipeline::{BNAPipelinePatch, BNAPipelinePost},
     },
 };
-use sea_orm::{ActiveModelTrait, ActiveValue, IntoActiveModel};
+use sea_orm::{ActiveModelTrait, ActiveValue, DbErr, IntoActiveModel};
 use serde_json::{json, Value};
 use tracing::info;
 use uuid::Uuid;
@@ -164,6 +164,7 @@ pub async fn post_ratings_analysis_adaptor(
 pub async fn patch_ratings_analysis_adaptor(
     bna_pipeline: BNAPipelinePatch,
     analysis_id: Uuid,
+    ctx: Context,
 ) -> Result<Value, ExecutionError> {
     // Set the database connection.
     let db = database_connect(Some("DATABASE_URL_SECRET_ID")).await?;
@@ -173,7 +174,22 @@ pub async fn patch_ratings_analysis_adaptor(
     active_model.state_machine_id = ActiveValue::Unchanged(analysis_id);
 
     // Update the entry.
-    let model = active_model.update(&db).await?;
+    info!("Tartiflette!");
+    let model = match active_model.update(&db).await {
+        Ok(m) => m,
+        Err(db_err) => {
+            dbg!(&db_err);
+            match db_err {
+                DbErr::RecordNotUpdated => {
+                    match get_ratings_analysis_adaptor(analysis_id, ctx).await {
+                        Ok(_) => return Err(ExecutionError::DatabaseError(db_err)),
+                        Err(exec_err) => return Err(exec_err),
+                    }
+                }
+                _ => return Err(ExecutionError::DatabaseError(db_err)),
+            }
+        }
+    };
     Ok(json!(model))
 }
 

diff --git a/lambdas/src/core/resource/ratings/endpoint.rs b/lambdas/src/core/resource/ratings/endpoint.rs
@@ -108,13 +108,20 @@ async fn patch_ratings_analysis(
     Path(analysis_id): Path<Uuid>,
     Json(bna_pipeline): Json<BNAPipelinePatch>,
 ) -> Result<Json<Value>, ExecutionError> {
-    patch_ratings_analysis_adaptor(bna_pipeline, analysis_id)
-        .await
-        .map_err(|e| {
-            debug!("{e}");
-            e
-        })
-        .map(Json)
+    patch_ratings_analysis_adaptor(
+        bna_pipeline,
+        analysis_id,
+        Context {
+            request_id: None,
+            source: format!("/ratings/analyses/{analysis_id}"),
+        },
+    )
+    .await
+    .map_err(|e| {
+        debug!("{e}");
+        e
+    })
+    .map(Json)
 }
 
 async fn post_ratings(

diff --git a/lambdas/src/main.rs b/lambdas/src/main.rs
@@ -3,6 +3,7 @@ use axum::Router;
 use lambda_http::{run, tracing, Error};
 use lambdas::core::resource::{cities, price, ratings};
 use std::env::{self, set_var};
+use tower_http::trace::TraceLayer;
 
 #[tokio::main]
 async fn main() -> Result<(), Error> {
@@ -37,7 +38,8 @@ async fn main() -> Result<(), Error> {
     let app = Router::new()
         .merge(cities::endpoint::routes())
         .merge(price::endpoint::routes())
-        .merge(ratings::endpoint::routes());
+        .merge(ratings::endpoint::routes())
+        .layer(TraceLayer::new_for_http());
 
     // Lookup for the  standalone flag.
     let standalone = env::var("BNA_API_STANDALONE")

diff --git a/lambdas/tests/.python-version b/lambdas/tests/.python-version
@@ -0,0 +1 @@
+3.13
diff --git a/lambdas/tests/README.md b/lambdas/tests/README.md
diff --git a/lambdas/tests/justfile b/lambdas/tests/justfile
@@ -1,16 +1,14 @@
 set positional-arguments
 
 # Define variables.
-venv := ".venv"
-venv_bin := venv / "bin"
-activate := venv_bin / "activate"
 top_dir := `git rev-parse --show-toplevel`
 
 # Setup the project.
 setup:
-    uv venv \
-      && uv pip install --upgrade pip setuptools \
-      && uv pip install -r requirements.txt
+    uv venv
+    uv pip install --upgrade pip setuptools
+    uv pip install -r requirements.txt
+    uv sync
 
 # Export the OpenAPI specification.
 openapi-export:
@@ -35,17 +33,23 @@ test-smoke-readonly *env:
 
 # Run the schemathesis tests locally again the openapi schema.
 test-localhost-schemathesis:
+  RUST_BACKTRACE=1 \
   uv run st run \
-    {{top_dir}}/openapi.yaml \
+    --base-url http://localhost:3000/ \
+    --cassette-path cassette.yaml \
+    -vvv \
+    -x \
+    --show-trace \
+    --generation-allow-x00 false \
     --exclude-method 'POST' \
-    --exclude-method 'PATCH \
-    --base-url http://localhost:3000/
+    --exclude-method 'PATCH' \
+    {{top_dir}}/openapi.yaml
 
 # Run the schemathesis tests again the openapi schema.
 test-staging-schemathesis:
   uv run st run \
     {{top_dir}}/openapi.yaml \
     --exclude-method 'POST' \
-    --exclude-method 'PATCH \
+    --exclude-method 'PATCH' \
     --base-url https://api.peopleforbikes.xyz/
 
diff --git a/lambdas/tests/pyproject.toml b/lambdas/tests/pyproject.toml
@@ -0,0 +1,7 @@
+[project]
+name = "test"
+version = "0.1.0"
+description = "Integration tests for the BNA API"
+readme = "README.md"
+requires-python = ">=3.13"
+dependencies = ["schemathesis==3.38.10"]
diff --git a/lambdas/tests/requirements.txt b/lambdas/tests/requirements.txt