Merge pull request #6 from jsoneaday/integrate_neon_pg

Integrate neon pg

Author: jsoneaday

deploy/.dockerignore

@@ -1,2 +1,3 @@
 aws
-awscliv2.zip
+awscliv2.zip
+ssl

deploy/.gitignore

@@ -1,21 +1,31 @@
-FROM rust:1.79 as builder
+FROM rust:1.79 AS builder
 RUN apt-get update && apt-get install -y \
     pkg-config \
     libssl-dev \
+    curl \
     && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /usr/src/syntaxmakersserver
-COPY ./server/. .
-
+COPY server/ /usr/src/syntaxmakersserver/server/
+WORKDIR /usr/src/syntaxmakersserver/server
 RUN cargo build --release
-RUN echo "Searching for syntaxmakers-server..." && find / -name "syntaxmakers-server" 2>/dev/null
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
+    apt-get install -y nodejs
+COPY webclient/ /usr/src/syntaxmakersserver/webclient/
+WORKDIR /usr/src/syntaxmakersserver/webclient
+RUN npm install
+RUN npm run build
 
 FROM debian:stable-slim
-# Install OpenSSL runtime
 RUN apt-get update && \
-    apt-get install -y libssl3 && \
-    apt-get clean
-# Copy the compiled binary from the builder image
+    apt-get install -y \
+    nginx \
+    libssl3 \
+    curl \
+    jq \
+    && apt-get clean
 COPY --from=builder /usr/src/syntaxmakersserver /usr/local/bin/syntaxmakersserver
-WORKDIR /usr/local/bin/syntaxmakersserver
-ENTRYPOINT ["./target/release/syntaxmakers-server"]
+RUN rm /etc/nginx/sites-enabled/default
+EXPOSE 80 443
+RUN mv /usr/local/bin/syntaxmakersserver/webclient/nginx.conf /etc/nginx/conf.d/nginx.conf
+# RUN mv /usr/local/bin/syntaxmakersserver/server/.env.production /usr/local/bin/syntaxmakersserver/server/.env
+WORKDIR /usr/local/bin/syntaxmakersserver/server
+CMD ["sh", "-c", "nginx && ./target/release/syntaxmakers-server"]

deploy/Dockerfile

@@ -1,2 +1,5 @@
-echo build docker container
+docker rmi $(docker images -q) -f
 docker build -f ./Dockerfile -t syntaxmakers:1.0 ..
+docker tag syntaxmakers:1.0 201558611471.dkr.ecr.us-east-2.amazonaws.com/syntaxmakers1
+aws ecr get-login-password --region us-east-2 --profile cli | docker login --username AWS --password-stdin 201558611471.dkr.ecr.us-east-2.amazonaws.com
+docker push 201558611471.dkr.ecr.us-east-2.amazonaws.com/syntaxmakers1

deploy/build.sh

@@ -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);

deploy/prod_data.sql

@@ -1,4 +1,3 @@
 dbdata
 .env
-.env.production
 .env.example

server/.dockerignore

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.79.0"

server/rust-toolchain.toml

@@ -62,16 +62,27 @@ impl ConnGetter for DbRepo {
 
 async fn get_conn_pool() -> Pool<Postgres> {
     dotenv().ok();
-    let postgres_host = env::var("POSTGRES_HOST").unwrap();
+    
     let postgres_port = env::var("POSTGRES_PORT").unwrap().parse::<u16>().unwrap();
     let postgres_password = env::var("POSTGRES_PASSWORD").unwrap();
     let postgres_user = env::var("POSTGRES_USER").unwrap();
     let postgres_db = env::var("POSTGRES_DB").unwrap();
+    let env = env::var("ENV").unwrap();
+    let postgres_host = if env == "production" {
+        env::var("POSTGRES_HOST").unwrap()
+    } else {
+        format!("{}:{}", env::var("POSTGRES_HOST").unwrap(), postgres_port)
+    };
+    let ssl_mode = if env == "production" {
+        "?sslmode=require"
+    } else {
+        ""
+    };
 
     let postgres_url = format!(
-        "postgres://{postgres_user}:{postgres_password}@{postgres_host}:{postgres_port}/{postgres_db}"
+        "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/base.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/industries/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
     }
 }