Add server skeleton

Cargo.toml

@@ -3,6 +3,7 @@
 members = [
     "common",
     "lambdas",
+    "server",
     "solver",
 ]
 

README.md

@@ -5,7 +5,17 @@ another Rust project which implements a rich VRP solver functionality, you can f
 
 # Overview
 
-## Architecture
+This repo contains two implementations of REST API:
+
+* `server` a traditional server approach built using [actix-web framework](https://github.com/actix/actix-web)
+* `serverless` a serverless approach using AWS lambdas
+
+## Server approach
+
+
+## Serverless approach
+
+### Architecture
 
 On API level, there are two public endpoints:
 
@@ -42,7 +52,8 @@ so another logic might be needed here and it is better to avoid coupling problem
 
 - __Rust code__:
     - `./common`: contains shared code used by different crates in the project
-    - `./lambdas`: contains code for AWS lambda functions
+    - `./lambdas`: contains code for AWS lambda functions used by `serverless` approach
+    - `./server`: contains code for server approach
     - `./solver`: contains a binary crate for solving VRP problem
 - __Build & Deployment & Test__
     - `./terraform`: terraform configuration to deploy AWS resources
@@ -109,7 +120,7 @@ It builds rust code and copies build artifacts into `artifacts` folder.
   terraform apply -var-file="private.tfvars"
 ```
 
-## Test
+## Test serverless
 
 If you decided to use different AWS region, adjust url in tests scripts according to
 [AWS documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-call-api.html).

lambdas/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 common =  { path = "../common" }
-vrp-pragmatic = "1.2.4"
+vrp-pragmatic = "1.4.2"
 
 lambda_runtime = "0.2.1"
 aws_lambda_events="0.3.0"

lambdas/src/gateway/poll/main.rs

@@ -3,7 +3,7 @@ use common::aws::download_from_s3;
 use common::models::{AppError, Context, Progress};
 use common::runtime::{get_async_runtime, get_solution_key, get_state};
 use lambda_runtime::{error::HandlerError, lambda};
-use lambdas::common::{conflict, internal_server_error, no_content, not_found, ok, bad_request};
+use lambdas::common::{bad_request, conflict, internal_server_error, no_content, not_found, ok};
 use std::error::Error;
 
 fn main() -> Result<(), Box<dyn Error>> {
@@ -25,26 +25,32 @@ fn get_solution_response(
     let submit_id = request.query_string_parameters.get("submit_id").cloned();
 
     if submit_id.is_none() {
-        return Ok(bad_request(Some("no submit_id specified in query string parameters".to_string())))
+        return Ok(bad_request(Some(
+            "no submit_id specified in query string parameters".to_string(),
+        )));
     }
 
     let ctx = Context::new(submit_id.expect("invalid submit id"))?;
 
     get_async_runtime()?.block_on(async move {
         let state = get_state(&ctx).await;
 
-        Ok(match state.as_ref().ok().and_then(|state| state.progress()) {
-            Some(progress) if is_not_yet_solved(progress.clone()) => {
-                // TODO based on progress and algorithm termination settings, we can provide more
-                //      information about when to expect solution to be ready
-                no_content(None)
-            }
-            Some(progress) if progress == Progress::Success => ok(Some(get_solution(&ctx).await?)),
-            Some(progress) if progress == Progress::Failed => {
-                conflict(state.ok().and_then(|s| s.payload()))
-            }
-            _ => not_found(None),
-        })
+        Ok(
+            match state.as_ref().ok().and_then(|state| state.progress()) {
+                Some(progress) if is_not_yet_solved(progress.clone()) => {
+                    // TODO based on progress and algorithm termination settings, we can provide more
+                    //      information about when to expect solution to be ready
+                    no_content(None)
+                }
+                Some(progress) if progress == Progress::Success => {
+                    ok(Some(get_solution(&ctx).await?))
+                }
+                Some(progress) if progress == Progress::Failed => {
+                    conflict(state.ok().and_then(|s| s.payload()))
+                }
+                _ => not_found(None),
+            },
+        )
     })
 }
 

server/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "server"
+version = "0.1.0"
+authors = ["reinterpretcat <ilya.builuk@gmail.com>"]
+edition = "2018"
+
+
+[dependencies]
+common =  { path = "../common" }
+vrp-pragmatic = "1.4.2"
+
+actix-web = "3.0.0-beta.3"

server/src/main.rs

@@ -0,0 +1,14 @@
+use actix_web::{get, web, App, HttpServer, Responder};
+
+#[get("/{id}/{name}/index.html")]
+async fn index(web::Path((id, name)): web::Path<(u32, String)>) -> impl Responder {
+    format!("Hello {}! id:{}", name, id)
+}
+
+#[actix_web::main]
+async fn main() -> std::io::Result<()> {
+    HttpServer::new(|| App::new().service(index))
+        .bind("127.0.0.1:8080")?
+        .run()
+        .await
+}