🔵 Better names

Author: isaac1024

exercises/tiered_pricing/solutions/isaac1024_baby-steps/src/main.rs

@@ -1,5 +1,5 @@
-mod routes;
 mod health_check;
+mod routes;
 mod tiered_pricing;
 
 use actix_web::{App, HttpServer};
@@ -14,17 +14,13 @@ fn get_address() -> String {
 
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
-    let server = HttpServer::new( || {
-            App::new()
-                .configure(routes)
-        })
-        .bind(get_address());
+    let server = HttpServer::new(|| App::new().configure(routes)).bind(get_address());
 
     match server {
         Ok(server) => {
             println!("🚀 Server running at {}", get_address());
             server.run().await
         }
-        Err(_) => panic!("🔥 Coul not start the server at {}", get_address())
+        Err(_) => panic!("🔥 Could not start the server at {}", get_address()),
     }
 }

exercises/tiered_pricing/solutions/isaac1024_baby-steps/src/routes.rs

@@ -3,6 +3,6 @@ use crate::tiered_pricing::tiered_pricing;
 use actix_web::web;
 
 pub fn routes(cfg: &mut web::ServiceConfig) {
-    cfg.route("/health-check", web::get().to(health_check));
-    cfg.route("/pricing", web::get().to(tiered_pricing));
+    cfg.route("/health-check", web::get().to(health_check))
+        .route("/pricing", web::get().to(tiered_pricing));
 }

exercises/tiered_pricing/solutions/isaac1024_baby-steps/src/tiered_pricing.rs

@@ -3,25 +3,23 @@ use serde::{Deserialize, Serialize};
 use std::fmt;
 
 #[derive(Deserialize)]
-pub struct Pricing {
+pub struct TieredPricingQuery {
     subscriptions: u32,
 }
 
 #[derive(Serialize, Deserialize)]
-struct Subscriptions {
-    pricing: u32,
+struct TieredPricingResponse {
+    total_price: u32,
 }
 
 #[derive(Serialize, Deserialize)]
 struct BadRequestMessage {
     error_message: String,
 }
 
-pub async fn tiered_pricing(pricing: web::Query<Pricing>) -> impl Responder {
+pub async fn tiered_pricing(pricing: web::Query<TieredPricingQuery>) -> impl Responder {
     match get_total_subscription_price(pricing.subscriptions) {
-        Ok(total_price) => HttpResponse::Ok().json(Subscriptions {
-            pricing: total_price,
-        }),
+        Ok(total_price) => HttpResponse::Ok().json(TieredPricingResponse { total_price }),
         Err(error) => HttpResponse::BadRequest().json(BadRequestMessage {
             error_message: error.to_string(),
         }),
@@ -147,9 +145,9 @@ mod tests {
             .uri(format!("/pricing?subscriptions={}", number_of_subscriptions).as_str())
             .to_request();
 
-        let response: Subscriptions = test::call_and_read_body_json(&app, request).await;
+        let response: TieredPricingResponse = test::call_and_read_body_json(&app, request).await;
 
-        assert_eq!(number_of_subscriptions * 149, response.pricing);
+        assert_eq!(number_of_subscriptions * 149, response.total_price);
     }
 
     #[actix_web::test]