Implement Entity Wrappers

Implements entity wrappers to be used in the API instead of using the models directly. Each wrapper also implement the `IntoActiveModel` trait to handle to conversion between the Wrapper and the ActiveModel. Signed-off-by: Rémy Greinhofer <[email protected]>
PeopleForBikes · Jan 6, 2024 · 322f854 · 322f854
1 parent 159b3a5
commit 322f854
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 30 deletions.
diff --git a/entity/src/lib.rs b/entity/src/lib.rs
@@ -1,2 +1,4 @@
 mod entities;
+pub mod wrappers;
+
 pub use entities::{prelude::*, *};
diff --git a/entity/src/wrappers/mod.rs b/entity/src/wrappers/mod.rs
@@ -0,0 +1,57 @@
+use crate::entities::submission;
+use sea_orm::{ActiveValue, IntoActiveModel};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct Submission {
+    pub first_name: String,
+    pub last_name: String,
+    pub title: Option<String>,
+    pub organization: Option<String>,
+    pub email: String,
+    pub country: String,
+    pub city: String,
+    pub region: Option<String>,
+    pub fips_code: String,
+    pub consent: bool,
+}
+
+impl IntoActiveModel<submission::ActiveModel> for Submission {
+    fn into_active_model(self) -> submission::ActiveModel {
+        submission::ActiveModel {
+            id: ActiveValue::NotSet,
+            first_name: ActiveValue::Set(self.first_name),
+            last_name: ActiveValue::Set(self.last_name),
+            title: ActiveValue::Set(self.title),
+            organization: ActiveValue::Set(self.organization),
+            email: ActiveValue::Set(self.email),
+            country: ActiveValue::Set(self.country),
+            city: ActiveValue::Set(self.city),
+            region: ActiveValue::Set(self.region),
+            fips_code: ActiveValue::Set(self.fips_code),
+            consent: ActiveValue::Set(self.consent),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_submission_into_active_model() {
+        let wrapper = Submission {
+            first_name: "John".to_string(),
+            last_name: "Doe".to_string(),
+            title: Some("Director".to_owned()),
+            organization: Some("ACME".to_string()),
+            email: "[email protected]".to_string(),
+            country: "usa".to_string(),
+            city: "austin".to_string(),
+            region: Some("texas".to_string()),
+            fips_code: "0123456".to_string(),
+            consent: true,
+        };
+        let _active_model = wrapper.into_active_model();
+    }
+}
diff --git a/lambdas/src/submissions/post-submissions-city.rs b/lambdas/src/submissions/post-submissions-city.rs
@@ -1,28 +1,14 @@
 use dotenv::dotenv;
 use entity::submission;
+use entity::wrappers::Submission;
 use lambda_http::{
     http::StatusCode, run, service_fn, Body, Error, IntoResponse, Request, Response,
 };
 use lambdas::{database_connect, get_apigw_request_id, APIError, APIErrorSource, APIErrors};
-use sea_orm::{ActiveValue, EntityTrait};
-use serde::{Deserialize, Serialize};
+use sea_orm::{EntityTrait, IntoActiveModel};
 use serde_json::json;
 use tracing::info;
 
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct SubmissionWrapper {
-    pub first_name: String,
-    pub last_name: String,
-    pub title: Option<String>,
-    pub organization: Option<String>,
-    pub email: String,
-    pub country: String,
-    pub city: String,
-    pub region: Option<String>,
-    pub fips_code: String,
-    pub consent: bool,
-}
-
 async fn function_handler(event: Request) -> Result<Response<Body>, Error> {
     dotenv().ok();
 
@@ -34,7 +20,7 @@ async fn function_handler(event: Request) -> Result<Response<Body>, Error> {
     let body = event.body();
     let body_str = std::str::from_utf8(body).expect("invalid utf-8 sequence");
     info!(body_str);
-    let wrapper = match serde_json::from_str::<SubmissionWrapper>(body_str) {
+    let wrapper = match serde_json::from_str::<Submission>(body_str) {
         Ok(model) => model,
         Err(e) => {
             let api_error = APIError::new(
@@ -49,19 +35,7 @@ async fn function_handler(event: Request) -> Result<Response<Body>, Error> {
     };
 
     // Turn the model wrapper into an active model and unset the primary key.
-    let active_submission = submission::ActiveModel {
-        id: ActiveValue::NotSet,
-        first_name: ActiveValue::Set(wrapper.first_name),
-        last_name: ActiveValue::Set(wrapper.last_name),
-        title: ActiveValue::Set(wrapper.title),
-        organization: ActiveValue::Set(wrapper.organization),
-        email: ActiveValue::Set(wrapper.email),
-        country: ActiveValue::Set(wrapper.country),
-        city: ActiveValue::Set(wrapper.city),
-        region: ActiveValue::Set(wrapper.region),
-        fips_code: ActiveValue::Set(wrapper.fips_code),
-        consent: ActiveValue::Set(wrapper.consent),
-    };
+    let active_submission = wrapper.into_active_model();
     info!(
         "inserting Submission into database: {:?}",
         active_submission