Merge branch 'main' into feat/automatic-openapi-specs

Author: lsipii

.env

@@ -1,8 +1,6 @@
-USER_PROFILE_PRODUCTIZER_ENDPOINT = "https://gateway.testbed.fi/test/lassipatanen/User/Profile?source=access_to_finland"
-USER_STATUS_INFO_PRODUCTIZER_ENDPOINT = "https://gateway.testbed.fi/test/lsipii/User/StatusInfo?source=access_to_finland:vfd"
-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/"
 TESTBED_BASE_URL = "https://gateway.testbed.fi"
 TESTBED_ENVIRONMENT = "development"
+
+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/"

.env.local

@@ -1,6 +1,8 @@
-USER_PROFILE_PRODUCTIZER_ENDPOINT=http://host.docker.internal:5001/productizer/test/lassipatanen/User/Profile
-USER_STATUS_INFO_PRODUCTIZER_ENDPOINT=http://host.docker.internal:5747/productizers/test/lsipii/User/StatusInfo
-USER_STATUS_INFO_WRITE_PRODUCTIZER_ENDPOINT=http://host.docker.internal:5747/productizers/test/lsipii/User/StatusInfo/Write
+# @TODO: needs a local testbed product gw router sim
+USER_PROFILE_PRODUCTIZER_ENDPOINT=http://host.docker.internal:5001/productizer
+USER_STATUS_INFO_PRODUCTIZER_ENDPOINT=http://host.docker.internal:5747/productizers
+
+# All good for these endpoints
 USERS_API_ENDPOINT_ORIGIN=http://host.docker.internal:5001
 AUTHENTICATION_GW_ENDPOINT_ORIGIN=https://virtualfinland-authgw.localhost
 TMT_PRODUCTIZER_ENDPOINT_ORIGIN=http://host.docker.internal:5286

.env.staging

@@ -1,4 +1 @@
-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"

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

@@ -1,6 +1,6 @@
-use http::{HeaderMap, HeaderValue};
-
-use crate::api::{responses::APIRoutingError, utils::ParsedRequest};
+use std::env;
+use http::{ HeaderMap, HeaderValue };
+use crate::api::{ responses::{ APIRoutingError }, utils::{ ParsedRequest, get_stage } };
 
 pub mod figure;
 pub mod job;
@@ -19,10 +19,10 @@ fn parse_testbed_request_headers(request: ParsedRequest) -> Result<HeaderMap, AP
         request
             .headers
             .get("authorization")
-            .ok_or_else(|| {
+            .ok_or_else(||
                 APIRoutingError::UnprocessableEntity("No authorization header".to_string())
-            })?
-            .clone(),
+            )?
+            .clone()
     );
 
     if request.headers.contains_key("x-consent-token") {
@@ -41,3 +41,42 @@ fn parse_testbed_request_headers(request: ParsedRequest) -> Result<HeaderMap, AP
     }
     Ok(request_headers)
 }
+
+/**
+ * Builds the URI for the testbed data product
+ */
+fn build_data_product_uri(data_product: &str, data_source: &str) -> String {
+    let mut 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");
+
+    if get_stage() == "local" {
+        // @TODO: needs a local testbed data product gw simulation
+        match data_product {
+            "test/lassipatanen/User/Profile" => {
+                testbed_base_url = env
+                    ::var("USER_PROFILE_PRODUCTIZER_ENDPOINT")
+                    .expect("USER_PROFILE_PRODUCTIZER_ENDPOINT must be set");
+            }
+            "test/lsipii/User/StatusInfo" => {
+                testbed_base_url = env
+                    ::var("USER_STATUS_INFO_PRODUCTIZER_ENDPOINT")
+                    .expect("USER_STATUS_INFO_PRODUCTIZER_ENDPOINT must be set");
+            }
+            "test/lsipii/User/StatusInfo/Write" => {
+                testbed_base_url = env
+                    ::var("USER_STATUS_INFO_PRODUCTIZER_ENDPOINT")
+                    .expect("USER_STATUS_INFO_PRODUCTIZER_ENDPOINT must be set");
+            }
+            _ => {}
+        }
+    }
+
+    // Remove trailing slash from base url
+    if testbed_base_url.ends_with('/') {
+        testbed_base_url.pop();
+    }
+
+    format!("{testbed_base_url}/{data_product}?source={data_source}:{testbed_environment}")
+}

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

@@ -1,5 +1,3 @@
-use std::env;
-
 use serde_json::{json, Value as JSONValue};
 
 use crate::api::{
@@ -8,25 +6,12 @@ use crate::api::{
     utils::ParsedRequest,
 };
 
-use super::parse_testbed_request_headers;
+use super::{parse_testbed_request_headers, build_data_product_uri};
 
 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> {
+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>(
@@ -38,13 +23,8 @@ pub async fn get_data_product(
     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!({}));
+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_else(|_| json!({}));
     let request_headers = parse_testbed_request_headers(request)?;
     let response = post_json_request::<JSONValue, JSONValue>(
         build_data_product_uri(data_product, data_source),

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

@@ -1,5 +1,4 @@
 use std::env;
-
 use serde_json::{json, Value as JSONValue};
 
 use super::parse_testbed_request_headers;
@@ -8,6 +7,7 @@ use crate::api::{
     responses::{APIRoutingError, APIRoutingResponse},
     utils::ParsedRequest,
 };
+use super::{ parse_testbed_request_headers, build_data_product_uri };
 
 #[utoipa::path(
     post,
@@ -35,12 +35,14 @@ use crate::api::{
 pub async fn fetch_user_profile(
     request: ParsedRequest,
 ) -> Result<APIRoutingResponse, APIRoutingError> {
-    let endpoint_url = env::var("USER_PROFILE_PRODUCTIZER_ENDPOINT")
-        .expect("USER_PROFILE_PRODUCTIZER_ENDPOINT must be set");
+    let endpoint_url = build_data_product_uri(
+        "test/lassipatanen/User/Profile",
+        "access_to_finland"
+    );
     let request_input = json!({}); // Empty body
     let request_headers = parse_testbed_request_headers(request)?;
     let response = post_json_request::<JSONValue, JSONValue>(
-        endpoint_url.to_string(),
+        endpoint_url,
         &request_input,
         request_headers,
     )
@@ -74,10 +76,8 @@ pub async fn fetch_user_profile(
 pub async fn fetch_user_status_info(
     request: ParsedRequest,
 ) -> Result<APIRoutingResponse, APIRoutingError> {
-    let endpoint_url = env::var("USER_STATUS_INFO_PRODUCTIZER_ENDPOINT")
-        .expect("USER_STATUS_INFO_PRODUCTIZER_ENDPOINT must be set");
-    let request_input: JSONValue =
-        serde_json::from_str(request.body.as_str()).unwrap_or_else(|_| json!({})); // Pass through body
+    let endpoint_url = build_data_product_uri("test/lsipii/User/StatusInfo", "virtual_finland");
+    let request_input: JSONValue = serde_json::from_str(request.body.as_str()).unwrap_or_else(|_| json!({})); // Pass through body
     let request_headers = parse_testbed_request_headers(request)?;
     let response = post_json_request::<JSONValue, JSONValue>(
         endpoint_url.to_string(),
@@ -114,10 +114,12 @@ pub async fn fetch_user_status_info(
 pub async fn update_user_status_info(
     request: ParsedRequest,
 ) -> Result<APIRoutingResponse, APIRoutingError> {
-    let endpoint_url = env::var("USER_STATUS_INFO_WRITE_PRODUCTIZER_ENDPOINT")
-        .expect("USER_STATUS_INFO_WRITE_PRODUCTIZER_ENDPOINT must be set");
-    let request_input: JSONValue =
-        serde_json::from_str(request.body.as_str()).unwrap_or_else(|_| json!({})); // Pass through body
+    let endpoint_url = build_data_product_uri(
+        "test/lsipii/User/StatusInfo/Write",
+        "virtual_finland"
+    );
+
+    let request_input: JSONValue = serde_json::from_str(request.body.as_str()).unwrap_or_else(|_| json!({})); // Pass through body
     let request_headers = parse_testbed_request_headers(request)?;
     let response = post_json_request::<JSONValue, JSONValue>(
         endpoint_url.to_string(),

src/lib/api_app/src/api/utils.rs

@@ -123,3 +123,7 @@ pub mod strings {
         result
     }
 }
+
+pub fn get_stage() -> String {
+    std::env::var("STAGE").unwrap_or_else(|_| "local".to_string())
+}