From 310d1eaad80300202dafe90d78f3dc19b29d294c Mon Sep 17 00:00:00 2001
From: Ben Sherriff <bsherriffj@gmail.com>
Date: Tue, 3 Sep 2024 17:15:48 -0400
Subject: [PATCH] Renamed service to api

---
 .env                                          |  6 +-
 Makefile                                      |  4 +-
 README.md                                     |  2 +-
 {service => api}/Cargo.lock                   | 62 +++++++++----------
 {service => api}/Cargo.toml                   |  2 +-
 {service => api}/Dockerfile                   |  6 +-
 {service => api}/diesel.toml                  |  0
 .../migrations/000000_airports/down.sql       |  0
 .../migrations/000000_airports/up.sql         |  0
 .../migrations/000001_metars/down.sql         |  0
 .../migrations/000001_metars/up.sql           |  0
 .../000002_airport_metar_cache/down.sql       |  0
 .../000002_airport_metar_cache/up.sql         |  0
 .../migrations/000003_users/down.sql          |  0
 .../migrations/000003_users/up.sql            |  0
 {service => api}/rust-toolchain.toml          |  0
 {service => api}/rustfmt.toml                 |  0
 {service => api}/src/airports/mod.rs          |  0
 {service => api}/src/airports/model.rs        |  0
 {service => api}/src/airports/routes.rs       |  0
 {service => api}/src/auth/mod.rs              |  0
 {service => api}/src/auth/model.rs            |  0
 {service => api}/src/auth/routes.rs           |  0
 {service => api}/src/auth/session.rs          |  0
 {service => api}/src/db/mod.rs                |  0
 {service => api}/src/db/schema.rs             |  0
 {service => api}/src/error.rs                 |  0
 {service => api}/src/main.rs                  |  6 +-
 {service => api}/src/metars/mod.rs            |  0
 {service => api}/src/metars/model.rs          |  0
 {service => api}/src/metars/routes.rs         |  0
 {service => api}/src/scheduler.rs             |  0
 {service => api}/src/users/mod.rs             |  0
 {service => api}/src/users/model.rs           |  0
 {service => api}/src/users/routes.rs          |  0
 docker-compose.yml                            |  4 +-
 36 files changed, 46 insertions(+), 46 deletions(-)
 rename {service => api}/Cargo.lock (99%)
 rename {service => api}/Cargo.toml (98%)
 rename {service => api}/Dockerfile (86%)
 rename {service => api}/diesel.toml (100%)
 rename {service => api}/migrations/000000_airports/down.sql (100%)
 rename {service => api}/migrations/000000_airports/up.sql (100%)
 rename {service => api}/migrations/000001_metars/down.sql (100%)
 rename {service => api}/migrations/000001_metars/up.sql (100%)
 rename {service => api}/migrations/000002_airport_metar_cache/down.sql (100%)
 rename {service => api}/migrations/000002_airport_metar_cache/up.sql (100%)
 rename {service => api}/migrations/000003_users/down.sql (100%)
 rename {service => api}/migrations/000003_users/up.sql (100%)
 rename {service => api}/rust-toolchain.toml (100%)
 rename {service => api}/rustfmt.toml (100%)
 rename {service => api}/src/airports/mod.rs (100%)
 rename {service => api}/src/airports/model.rs (100%)
 rename {service => api}/src/airports/routes.rs (100%)
 rename {service => api}/src/auth/mod.rs (100%)
 rename {service => api}/src/auth/model.rs (100%)
 rename {service => api}/src/auth/routes.rs (100%)
 rename {service => api}/src/auth/session.rs (100%)
 rename {service => api}/src/db/mod.rs (100%)
 rename {service => api}/src/db/schema.rs (100%)
 rename {service => api}/src/error.rs (100%)
 rename {service => api}/src/main.rs (86%)
 rename {service => api}/src/metars/mod.rs (100%)
 rename {service => api}/src/metars/model.rs (100%)
 rename {service => api}/src/metars/routes.rs (100%)
 rename {service => api}/src/scheduler.rs (100%)
 rename {service => api}/src/users/mod.rs (100%)
 rename {service => api}/src/users/model.rs (100%)
 rename {service => api}/src/users/routes.rs (100%)

diff --git a/.env b/.env
index 176cd15..c8cf136 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-RUST_LOG=warn,service=info
+RUST_LOG=warn,api=info
 
 DATABASE_CONTAINER=aviation-db
 DATABASE_USER=aviation
@@ -16,8 +16,8 @@ MINIO_HOST=localhost
 MINIO_PORT=9000
 MINIO_PORT_INTERNAL=9001
 
-SERVICE_HOST=localhost
-SERVICE_PORT=5000
+API_HOST=localhost
+API_PORT=5000
 UI_PORT=3000
 NODE_ENV=development
 
diff --git a/Makefile b/Makefile
index 89f64dc..6e75499 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ help: ## This info
 	@echo
 
 format: ## Format code
-	@cd service && cargo fmt
+	@cd api && cargo fmt
 	@cd ui && npm run format
 
 backend-up: ## Start Docker containers
@@ -29,7 +29,7 @@ backend-down: ## Stop Docker containers
 down-backend: backend-down
 
 run: ## Run the api
-	@cd service && cargo run
+	@cd api && cargo run
 
 frontend-up: ## Start Docker containers
 	@docker compose --profile frontend up -d
diff --git a/README.md b/README.md
index 4cc19ee..24276d0 100755
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 1. Copy `.env.TEMPLATE` to `.env`
 2. Generate JWT RS256 (RSA Signature with SHA-256) Private/Public keys with `make generate`
-3. Build the service and ui images with `make build`
+3. Build the api and ui images with `make build`
 4. Run the application with `make up`
 
 ## Decoding METARS
diff --git a/service/Cargo.lock b/api/Cargo.lock
similarity index 99%
rename from service/Cargo.lock
rename to api/Cargo.lock
index 2815c58..7d2141b 100644
--- a/service/Cargo.lock
+++ b/api/Cargo.lock
@@ -369,6 +369,37 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "api"
+version = "0.1.0"
+dependencies = [
+ "actix-cors",
+ "actix-multipart",
+ "actix-web",
+ "actix-web-httpauth",
+ "argon2",
+ "chrono",
+ "diesel",
+ "diesel_migrations",
+ "dotenv",
+ "env_logger",
+ "futures-util",
+ "lazy_static",
+ "log",
+ "postgis_diesel",
+ "r2d2",
+ "rand",
+ "rand_chacha",
+ "redis",
+ "regex",
+ "reqwest",
+ "rust-s3",
+ "serde",
+ "serde_json",
+ "tokio",
+ "uuid",
+]
+
 [[package]]
 name = "arc-swap"
 version = "1.7.1"
@@ -2252,37 +2283,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "service"
-version = "0.1.0"
-dependencies = [
- "actix-cors",
- "actix-multipart",
- "actix-web",
- "actix-web-httpauth",
- "argon2",
- "chrono",
- "diesel",
- "diesel_migrations",
- "dotenv",
- "env_logger",
- "futures-util",
- "lazy_static",
- "log",
- "postgis_diesel",
- "r2d2",
- "rand",
- "rand_chacha",
- "redis",
- "regex",
- "reqwest",
- "rust-s3",
- "serde",
- "serde_json",
- "tokio",
- "uuid",
-]
-
 [[package]]
 name = "sha1"
 version = "0.10.5"
diff --git a/service/Cargo.toml b/api/Cargo.toml
similarity index 98%
rename from service/Cargo.toml
rename to api/Cargo.toml
index fc4b953..a4058c5 100644
--- a/service/Cargo.toml
+++ b/api/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "service"
+name = "api"
 version = "0.1.0"
 edition = "2021"
 authors = ["Ben Sherriff <hello@bensherriff.com>"]
diff --git a/service/Dockerfile b/api/Dockerfile
similarity index 86%
rename from service/Dockerfile
rename to api/Dockerfile
index 7aba9cf..5885be3 100644
--- a/service/Dockerfile
+++ b/api/Dockerfile
@@ -27,10 +27,10 @@ RUN openssl rsa -in refresh.pem -pubout -outform PEM -out refresh.pem.pub
 #  Runtime
 # =========
 FROM keys as runtime
-WORKDIR /service
+WORKDIR /api
 USER root
 
-COPY --from=builder /builder/target/release/service /usr/local/bin/service
+COPY --from=builder /builder/target/release/api /usr/local/bin/api
 COPY --from=keys /keys /keys
 
-CMD ["service"]
+CMD ["api"]
diff --git a/service/diesel.toml b/api/diesel.toml
similarity index 100%
rename from service/diesel.toml
rename to api/diesel.toml
diff --git a/service/migrations/000000_airports/down.sql b/api/migrations/000000_airports/down.sql
similarity index 100%
rename from service/migrations/000000_airports/down.sql
rename to api/migrations/000000_airports/down.sql
diff --git a/service/migrations/000000_airports/up.sql b/api/migrations/000000_airports/up.sql
similarity index 100%
rename from service/migrations/000000_airports/up.sql
rename to api/migrations/000000_airports/up.sql
diff --git a/service/migrations/000001_metars/down.sql b/api/migrations/000001_metars/down.sql
similarity index 100%
rename from service/migrations/000001_metars/down.sql
rename to api/migrations/000001_metars/down.sql
diff --git a/service/migrations/000001_metars/up.sql b/api/migrations/000001_metars/up.sql
similarity index 100%
rename from service/migrations/000001_metars/up.sql
rename to api/migrations/000001_metars/up.sql
diff --git a/service/migrations/000002_airport_metar_cache/down.sql b/api/migrations/000002_airport_metar_cache/down.sql
similarity index 100%
rename from service/migrations/000002_airport_metar_cache/down.sql
rename to api/migrations/000002_airport_metar_cache/down.sql
diff --git a/service/migrations/000002_airport_metar_cache/up.sql b/api/migrations/000002_airport_metar_cache/up.sql
similarity index 100%
rename from service/migrations/000002_airport_metar_cache/up.sql
rename to api/migrations/000002_airport_metar_cache/up.sql
diff --git a/service/migrations/000003_users/down.sql b/api/migrations/000003_users/down.sql
similarity index 100%
rename from service/migrations/000003_users/down.sql
rename to api/migrations/000003_users/down.sql
diff --git a/service/migrations/000003_users/up.sql b/api/migrations/000003_users/up.sql
similarity index 100%
rename from service/migrations/000003_users/up.sql
rename to api/migrations/000003_users/up.sql
diff --git a/service/rust-toolchain.toml b/api/rust-toolchain.toml
similarity index 100%
rename from service/rust-toolchain.toml
rename to api/rust-toolchain.toml
diff --git a/service/rustfmt.toml b/api/rustfmt.toml
similarity index 100%
rename from service/rustfmt.toml
rename to api/rustfmt.toml
diff --git a/service/src/airports/mod.rs b/api/src/airports/mod.rs
similarity index 100%
rename from service/src/airports/mod.rs
rename to api/src/airports/mod.rs
diff --git a/service/src/airports/model.rs b/api/src/airports/model.rs
similarity index 100%
rename from service/src/airports/model.rs
rename to api/src/airports/model.rs
diff --git a/service/src/airports/routes.rs b/api/src/airports/routes.rs
similarity index 100%
rename from service/src/airports/routes.rs
rename to api/src/airports/routes.rs
diff --git a/service/src/auth/mod.rs b/api/src/auth/mod.rs
similarity index 100%
rename from service/src/auth/mod.rs
rename to api/src/auth/mod.rs
diff --git a/service/src/auth/model.rs b/api/src/auth/model.rs
similarity index 100%
rename from service/src/auth/model.rs
rename to api/src/auth/model.rs
diff --git a/service/src/auth/routes.rs b/api/src/auth/routes.rs
similarity index 100%
rename from service/src/auth/routes.rs
rename to api/src/auth/routes.rs
diff --git a/service/src/auth/session.rs b/api/src/auth/session.rs
similarity index 100%
rename from service/src/auth/session.rs
rename to api/src/auth/session.rs
diff --git a/service/src/db/mod.rs b/api/src/db/mod.rs
similarity index 100%
rename from service/src/db/mod.rs
rename to api/src/db/mod.rs
diff --git a/service/src/db/schema.rs b/api/src/db/schema.rs
similarity index 100%
rename from service/src/db/schema.rs
rename to api/src/db/schema.rs
diff --git a/service/src/error.rs b/api/src/error.rs
similarity index 100%
rename from service/src/error.rs
rename to api/src/error.rs
diff --git a/service/src/main.rs b/api/src/main.rs
similarity index 86%
rename from service/src/main.rs
rename to api/src/main.rs
index a86e7ce..6d848b6 100644
--- a/service/src/main.rs
+++ b/api/src/main.rs
@@ -19,12 +19,12 @@ mod users;
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
   dotenv().ok();
-  env_logger::init_from_env(env_logger::Env::default().filter_or("RUST_LOG", "warn,service=info"));
+  env_logger::init_from_env(env_logger::Env::default().filter_or("RUST_LOG", "warn,api=info"));
   db::init().await;
   // scheduler::update_airports();
 
-  let host = env::var("SERVICE_HOST").unwrap_or("localhost".to_string());
-  let port = env::var("SERVICE_PORT").unwrap_or("5000".to_string());
+  let host = env::var("API_HOST").unwrap_or("localhost".to_string());
+  let port = env::var("API_PORT").unwrap_or("5000".to_string());
 
   let server = match HttpServer::new(move || {
     let cors = Cors::default()
diff --git a/service/src/metars/mod.rs b/api/src/metars/mod.rs
similarity index 100%
rename from service/src/metars/mod.rs
rename to api/src/metars/mod.rs
diff --git a/service/src/metars/model.rs b/api/src/metars/model.rs
similarity index 100%
rename from service/src/metars/model.rs
rename to api/src/metars/model.rs
diff --git a/service/src/metars/routes.rs b/api/src/metars/routes.rs
similarity index 100%
rename from service/src/metars/routes.rs
rename to api/src/metars/routes.rs
diff --git a/service/src/scheduler.rs b/api/src/scheduler.rs
similarity index 100%
rename from service/src/scheduler.rs
rename to api/src/scheduler.rs
diff --git a/service/src/users/mod.rs b/api/src/users/mod.rs
similarity index 100%
rename from service/src/users/mod.rs
rename to api/src/users/mod.rs
diff --git a/service/src/users/model.rs b/api/src/users/model.rs
similarity index 100%
rename from service/src/users/model.rs
rename to api/src/users/model.rs
diff --git a/service/src/users/routes.rs b/api/src/users/routes.rs
similarity index 100%
rename from service/src/users/routes.rs
rename to api/src/users/routes.rs
diff --git a/docker-compose.yml b/docker-compose.yml
index f308d4f..aa24d11 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,9 +60,9 @@ services:
     container_name: aviation-api
     env_file: *env
     ports:
-      - "${SERVICE_PORT:-5000}:5000"
+      - "${API_PORT:-5000}:5000"
     build:
-      context: service
+      context: api
     depends_on:
       - db
       - redis