Merge pull request #31 from Virtual-Finland-Development/feat/use-codesets-service-in-job-codes

feat: use codesets service instead of built-in resources in job searc…

Author: lsipii

.env.local

@@ -7,4 +7,5 @@ PRH_MOCK_PRODUCTIZER_ENDPOINT=http://host.docker.internal:5059
 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
-JOBS_IN_FINLAND_PRODUCTIZER_ENDPOINT_ORIGIN=http://host.docker.internal:80
+JOBS_IN_FINLAND_PRODUCTIZER_ENDPOINT_ORIGIN=http://host.docker.internal:80
+CODESETS_BASE_URL=http://host.docker.internal:3166

Cargo.toml

@@ -16,7 +16,7 @@ lambda_http = "^0.7.1"
 futures = "^0.3.18"
 itertools = "^0.10.5"
 libmath = "^0.2.1"
-stopwatch = "^0.0.7"
+stopwatch = { git = "https://github.com/jwpjrdev/rust-stopwatch.git", branch="master" }
 utoipa = "3"
 tokio = { version = "^1.21.2", features = ["full"] }
 

infra/builder.dockerfile

@@ -9,7 +9,7 @@ FROM amazonlinux:2 as builder
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.64.0
+    RUST_VERSION=1.68.0
 
 RUN yum install -y gcc gcc-c++ openssl-devel zip; \
     curl https://sh.rustup.rs -sSf | sh -s -- --no-modify-path --profile minimal --default-toolchain $RUST_VERSION -y; \

infra/main.py

@@ -40,7 +40,9 @@
 jobsInFinlandProductizerLambdaEndpoint = pulumi.StackReference(
     f"{organization}/jobs-in-finland-productizer/dev"
 ).get_output("ApplicationUrl")
-
+codesetsBaseUrl = pulumi.StackReference(f"{organization}/codesets/{stage}").get_output(
+    "url"
+)
 
 #
 # Lambda function
@@ -87,6 +89,7 @@
             "USERS_API_ENDPOINT_ORIGIN": usersApiLambdaEndpoint,
             "TMT_PRODUCTIZER_ENDPOINT_ORIGIN": tmtProductizerLambdaEndpoint,
             "JOBS_IN_FINLAND_PRODUCTIZER_ENDPOINT_ORIGIN": jobsInFinlandProductizerLambdaEndpoint,
+            "CODESETS_BASE_URL": codesetsBaseUrl,
             "STAGE": stage,
         }
     ),

src/lib/api_app/Cargo.toml

@@ -21,6 +21,8 @@ stopwatch = { workspace = true }
 utoipa = { workspace = true }
 tokio = { workspace = true }
 lazy_static = "1.4.0"
+memory-cache-rs = "0.2.0"
+mockito = "1.0.0"
 
 app = { path = "./src/lib/app" }
 utils = { path = "./src/lib/utils" }