minor query updates; bug fixes

Author: jsoneaday

deploy/prod_data.sql

@@ -0,0 +1,50 @@
+insert into country (name) values ('United States');
+
+insert into prog_language (name) values ('Cobol');
+insert into prog_language (name) values ('Nim');
+insert into prog_language (name) values ('Crystal');
+insert into prog_language (name) values ('Elixir');
+insert into prog_language (name) values ('F#');
+insert into prog_language (name) values ('Haskell');
+insert into prog_language (name) values ('OCaml');
+insert into prog_language (name) values ('Erlang');
+insert into prog_language (name) values ('Clojure');
+insert into prog_language (name) values ('Racket');
+insert into prog_language (name) values ('Elm');
+insert into prog_language (name) values ('Lua');
+insert into prog_language (name) values ('Zig');
+insert into prog_language (name) values ('Pony');
+insert into prog_language (name) values ('Idris');
+insert into prog_language (name) values ('PureScript');
+insert into prog_language (name) values ('Pharo');
+insert into prog_language (name) values ('Forth');
+insert into prog_language (name) values ('J');
+insert into prog_language (name) values ('Prolog');
+insert into prog_language (name) values ('Mercury');
+insert into prog_language (name) values ('Reason');
+insert into prog_language (name) values ('Mojo');
+insert into prog_language (name) values ('Oberon');
+insert into prog_language (name) values ('Coq');
+insert into prog_language (name) values ('D');
+insert into prog_language (name) values ('Hack');
+insert into prog_language (name) values ('R');
+insert into prog_language (name) values ('Q');
+insert into prog_language (name) values ('Alice');
+insert into prog_language (name) values ('Eiffel');
+insert into prog_language (name) values ('Ceylon');
+insert into prog_language (name) values ('Bend');
+
+insert into industry (name) values ('AI/ML');
+insert into industry (name) values ('Blockchain/Web3');
+insert into industry (name) values ('Finance');
+insert into industry (name) values ('Food and Beverage');
+insert into industry (name) values ('Games');
+insert into industry (name) values ('Insurance');
+insert into industry (name) values ('IT');
+insert into industry (name) values ('Legal');
+insert into industry (name) values ('Other');
+
+insert into salary (base) values (200000);
+insert into salary (base) values (300000);
+insert into salary (base) values (400000);
+insert into salary (base) values (500000);

server/src/common/repository/base.rs

@@ -82,7 +82,7 @@ async fn get_conn_pool() -> Pool<Postgres> {
     let postgres_url = format!(
         "postgres://{postgres_user}:{postgres_password}@{postgres_host}/{postgres_db}{ssl_mode}"
     );
-    info!("connection string {}", postgres_url);
+    //info!("connection string {}", postgres_url);
 
     let conn = sqlx::postgres::PgPool::connect(&postgres_url).await.unwrap();
     let result = sqlx::query_as::<_, Version>(r"

server/src/common/repository/industries/repo.rs

@@ -8,7 +8,7 @@ mod internal {
     use super::*;    
 
     pub async fn query_all_industries(conn: &Pool<Postgres>) -> Result<Vec<Industry>, Error> {
-        query_as::<_, Industry>("select * from industry").fetch_all(conn).await
+        query_as::<_, Industry>("select * from industry order by name").fetch_all(conn).await
     }
 }
 

server/src/common/repository/languages/repo.rs

@@ -8,7 +8,7 @@ mod internal {
     use super::*;    
 
     pub async fn query_all_languages(conn: &Pool<Postgres>) -> Result<Vec<Language>, Error> {
-        query_as::<_, Language>("select * from prog_language").fetch_all(conn).await
+        query_as::<_, Language>("select * from prog_language order by name").fetch_all(conn).await
     }
 }
 

server/src/lib.rs

@@ -115,6 +115,7 @@ use actix_web::{HttpServer, http::header, App, middleware::Logger, web};
 use common::authentication::auth_keys_service::{init_auth_keys, AuthService};
 use common::emailer::emailer::Emailer;
 use common::repository::base::{DbRepo, Repository};
+use log::info;
 use routes::application::routes::{create_application, developer_applied};
 use routes::authentication::routes::{login, refresh_access_token};
 use routes::developers::routes::{get_developer_by_email, update_developer};
@@ -148,12 +149,13 @@ fn ssl_builder() -> SslAcceptorBuilder {
 }
 
 pub async fn run() -> std::io::Result<()> {
-    env_logger::init_from_env(env_logger::Env::new().default_filter_or("debug"));
+    env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
 
     dotenv().ok();
     let host = env::var("HOST").unwrap();
     let port = env::var("PORT").unwrap().parse::<u16>().unwrap();
     let allowed_origin1 = env::var("ALLOWED_ORIGIN1").unwrap();
+    info!("ALLOWED_ORIGIN1 {}", &allowed_origin1);
 
     let app_data = actix_web::web::Data::new(AppState{
         repo: DbRepo::init().await,

webclient/.env.production

@@ -0,0 +1 @@
+VITE_API_URL=http://localhost:4003/v1/

webclient/src/domain/repository/Api.ts

@@ -1,4 +1,5 @@
-export const API_ROOT_URL = "http://localhost:4003/v1/";
+export const API_ROOT_URL = import.meta.env.VITE_API_URL;
+console.log("VITE_API_URL", import.meta.env.VITE_API_URL);
 export const SALARIES_URL = `${API_ROOT_URL}salaries`;
 export const APPLY_JOB_URL = `${API_ROOT_URL}apply_job`;
 export const DEV_APPLIED_JOB_URL = `${API_ROOT_URL}developer_applied`;