Merge branch 'main' into refactor/fix-clippy-warnings

Author: lsipii

.env

@@ -3,4 +3,6 @@ USER_STATUS_INFO_PRODUCTIZER_ENDPOINT = "https://gateway.testbed.fi/test/lsipii/
 USER_STATUS_INFO_WRITE_PRODUCTIZER_ENDPOINT="https://gateway.testbed.fi/test/lsipii/User/StatusInfo/Write?source=access_to_finland:vfd"
 POPULATION_FIGURE_PRODUCTIZER_ENDPOINT = "https://gateway.testbed.fi/test/lsipii/Figure/Population?source=virtual_finland"
 JOB_POSTING_PRODUCTIZER_ENDPOINTS = "https://gateway.testbed.fi/test/lassipatanen/Job/JobPosting?source=tyomarkkinatori, https://gateway.testbed.fi/test/lassipatanen/Job/JobPosting?source=jobs_in_finland"
-JMF_SKILL_RECOMMENDATIONS_ENDPOINT = "https://tyomarkkinatori.fi/hakupalvelu/api/1.0/skillrecommendation/skillrecommendation/"
+JMF_SKILL_RECOMMENDATIONS_ENDPOINT = "https://tyomarkkinatori.fi/hakupalvelu/api/1.0/skillrecommendation/skillrecommendation/"
+TESTBED_BASE_URL = "https://gateway.testbed.fi"
+TESTBED_ENVIRONMENT = "development"

.env.staging

@@ -1,3 +1,4 @@
 USER_PROFILE_PRODUCTIZER_ENDPOINT = "https://gateway.testbed.fi/test/lassipatanen/User/Profile?source=access_to_finland__staging"
 USER_STATUS_INFO_PRODUCTIZER_ENDPOINT="https://gateway.testbed.fi/test/lsipii/User/StatusInfo?source=access_to_finland__staging:vfd"
 USER_STATUS_INFO_WRITE_PRODUCTIZER_ENDPOINT="https://gateway.testbed.fi/test/lsipii/User/StatusInfo/Write?source=access_to_finland__staging:vfd"
+TESTBED_ENVIRONMENT = "staging"

.gitignore

@@ -13,3 +13,6 @@ Cargo.lock
 infra/build/*
 !infra/build/.gitkeep
 .cargo_home
+
+# idea
+.idea

README.md

@@ -13,6 +13,16 @@ A backend service for frontend client calls to testbed
 - Docker: https://docs.docker.com/get-docker/
 - make: https://www.gnu.org/software/make/ (optional)
 
+#### Docker requirements
+
+If using docker compose, the following network must be created: `vfd-network`.
+
+Create the network with the following command:
+
+```
+docker network create vfd-network
+```
+
 ### Run with docker with hot reloading
 
 with docker-compose:

docker-compose.yml

@@ -19,3 +19,10 @@ services:
       - 3003:3003
     extra_hosts:
       - "host.docker.internal:host-gateway"
+    networks:
+      - vfd-network
+
+networks:
+  vfd-network:
+    driver: bridge
+    external: true

src/lib/api_app/src/api/routes/mod.rs

@@ -1,4 +1,4 @@
-use super::{ responses::{ APIRoutingResponse, APIRoutingError }, utils::ParsedRequest };
+use super::{responses::{APIRoutingError, APIRoutingResponse}, utils::ParsedRequest};
 
 pub mod application;
 pub mod testbed;
@@ -9,12 +9,8 @@ pub mod jmf;
  */
 pub async fn exec_router_request(parsed_request: ParsedRequest) -> APIRoutingResponse {
     match get_router_response(parsed_request).await {
-        Ok(response) => {
-            response
-        }
-        Err(e) => {
-            APIRoutingResponse::from_routing_error(e)
-        }
+        Ok(response) => { response }
+        Err(e) => { APIRoutingResponse::from_routing_error(e) }
     }
 }
 
@@ -50,6 +46,16 @@ pub async fn get_router_response(
             testbed::productizers::user::update_user_status_info(parsed_request).await
         }
         ("POST", "/jmf/recommendations") => { jmf::fetch_jmf_recommendations(parsed_request).await }
+        
+        ("GET", "/testbed/productizer/person/basic-information") => 
+            { testbed::productizers::person::basic_information::get_basic_information(parsed_request).await }
+        ("POST", "/testbed/productizer/person/basic-information") => 
+            { testbed::productizers::person::basic_information::write_basic_information(parsed_request).await }
+        ("GET", "/testbed/productizer/person/job-applicant-information") => 
+            { testbed::productizers::person::job_applicant_profile::get_job_applicant_profile(parsed_request).await }
+        ("POST", "/testbed/productizer/person/job-applicant-information") => 
+            { testbed::productizers::person::job_applicant_profile::post_job_applicant_profile(parsed_request).await }
+
         _ => { application::not_found(parsed_request).await }
     }
-}
+}

src/lib/api_app/src/api/routes/testbed/productizers/mod.rs

@@ -5,9 +5,10 @@ use crate::api::{ responses::APIRoutingError, utils::ParsedRequest };
 pub mod figure;
 pub mod job;
 pub mod user;
+pub mod person;
 
 /**
- * Parses the authorization headers fromn the input request
+ * Parses the authorization headers from the input request
  */
 fn parse_testbed_request_headers(request: ParsedRequest) -> Result<HeaderMap, APIRoutingError> {
     // Prep auth header forwarding
@@ -33,4 +34,4 @@ fn parse_testbed_request_headers(request: ParsedRequest) -> Result<HeaderMap, AP
         );
     }
     Ok(request_headers)
-}
+}

src/lib/api_app/src/api/routes/testbed/productizers/person/basic_information/mod.rs

@@ -0,0 +1,18 @@
+use crate::api::{
+    responses::{APIRoutingError, APIRoutingResponse},
+    utils::ParsedRequest,
+};
+
+pub async fn get_basic_information(request: ParsedRequest) -> Result<APIRoutingResponse, APIRoutingError> {
+    let data_product = "draft/Person/BasicInformation";
+    let data_source = "virtualfinland";
+    let result = super::get_data_product(data_product, data_source, request).await?;
+    Ok(result)
+}
+
+pub async fn write_basic_information(request: ParsedRequest) -> Result<APIRoutingResponse, APIRoutingError> {
+    let data_product = "draft/Person/BasicInformation/Write";
+    let data_source = "virtualfinland";
+    let result = super::write_data_product(data_product, data_source, request).await?;
+    Ok(result)
+}

src/lib/api_app/src/api/routes/testbed/productizers/person/job_applicant_profile/mod.rs

@@ -0,0 +1,19 @@
+use crate::api::{
+    responses::{APIRoutingError, APIRoutingResponse},
+    utils::ParsedRequest,
+};
+
+pub async fn get_job_applicant_profile(request: ParsedRequest) -> Result<APIRoutingResponse, APIRoutingError> {
+    let data_product = "draft/Person/JobApplicantProfile";
+    let data_source = "virtualfinland";
+    let result = super::get_data_product(data_product, data_source, request).await?;
+    Ok(result)
+}
+
+pub async fn post_job_applicant_profile(request: ParsedRequest) -> Result<APIRoutingResponse, APIRoutingError> {
+    let data_product = "draft/Person/JobApplicantProfile/Write";
+    let data_source = "virtualfinland";
+    let result = super::write_data_product(data_product, data_source, request).await?;
+    Ok(result)
+}
+

src/lib/api_app/src/api/routes/testbed/productizers/person/mod.rs

@@ -0,0 +1,45 @@
+use std::env;
+
+use serde_json::{json, Value as JSONValue};
+
+use crate::{
+    api::{
+        requests::post_json_request,
+        responses::{APIRoutingError, APIRoutingResponse},
+        utils::ParsedRequest,
+    }
+};
+
+use super::parse_testbed_request_headers;
+
+pub mod basic_information;
+pub mod job_applicant_profile;
+
+fn build_data_product_uri(data_product: &str, data_source: &str) -> String {
+    let testbed_base_url = env::var("TESTBED_BASE_URL").expect("TESTBED_BASE_URL must be set");
+    let testbed_environment = env::var("TESTBED_ENVIRONMENT").expect("TESTBED_ENVIRONMENT must be set");
+    let formatted_path = format!("{testbed_base_url}/{data_product}?source={data_source}:{testbed_environment}");
+    formatted_path
+}
+
+pub async fn get_data_product(data_product: &str, data_source: &str, request: ParsedRequest) -> Result<APIRoutingResponse, APIRoutingError> {
+    let request_input = json!({});
+    let request_headers = parse_testbed_request_headers(request)?;
+    let response = post_json_request::<JSONValue, JSONValue>(
+        build_data_product_uri(data_product, data_source),
+        &request_input,
+        request_headers,
+    ).await?;
+    Ok(response)
+}
+
+pub async fn write_data_product(data_product: &str, data_source: &str, request: ParsedRequest) -> Result<APIRoutingResponse, APIRoutingError> {
+    let request_input: JSONValue = serde_json::from_str(request.body.as_str()).unwrap_or(json!({}));
+    let request_headers = parse_testbed_request_headers(request)?;
+    let response = post_json_request::<JSONValue, JSONValue>(
+        build_data_product_uri(data_product, data_source),
+        &request_input,
+        request_headers,
+    ).await?;
+    Ok(response)
+}