refactor!: ground up rewrite

KZGlobalTeam · Dec 13, 2023 · f2be2dd · f2be2dd
1 parent 53fd97f
commit f2be2dd
Show file tree

Hide file tree

Showing 128 changed files with 7,068 additions and 6,397 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,2 +1,5 @@
 [build]
 rustdocflags = "-D warnings"
+
+[profile.dev.package."*"]
+opt-level = 3
diff --git a/.clippy.toml b/.clippy.toml
diff --git a/.dockerignore b/.dockerignore
diff --git a/.editorconfig b/.editorconfig
@@ -1,14 +1,13 @@
-# Editor-agnostic settings.
-#
-# See <https://editorconfig.org/> for more information.
+# https://editorconfig.org
 
 root = true
 
 [*]
 charset = utf-8
 end_of_line = lf
+insert_final_newline = true
 indent_style = tab
 
-[*.{nix,toml,yml,md}]
+[*.{md,toml,yml,nix}]
 indent_style = space
 indent_size = 2
diff --git a/.env.docker b/.env.docker
@@ -0,0 +1,8 @@
+# These are overrides necessary for docker.
+# If the API is going to run in a container, it needs to reference the other container by its name
+# rather than IP and also use the default database port.
+#
+# These will be added to the database container automatically and you should not need to change
+# them.
+DATABASE_PORT=3306
+DATABASE_URL=mysql://kz:csgo-kz-is-dead-boys@cs2kz-database:3306/cs2kz
diff --git a/.env.example b/.env.example
@@ -1,8 +1,13 @@
-API_IP=127.0.0.1
-API_PORT=42069
-API_PUBLIC_URL=http://127.0.0.1:42069
+# Database
+DATABASE_PORT=8070
 
-DATABASE_URL=mysql://kz:csgo-kz-is-dead-boys@127.0.0.1:8070/cs2kz-api
+# Note: we cannot interpolate `$DATABASE_PORT` here because Rust will not recursively evaluate
+#       nested environment variables when loading them with `std::env::var`.
+DATABASE_URL=mysql://kz:csgo-kz-is-dead-boys@127.0.0.1:8070/cs2kz
 
-# For docker
-# DATABASE_URL=mysql://kz:csgo-kz-is-dead-boys@cs2kz-database:3306/cs2kz-api
+# API
+RUST_LOG=cs2kz_api=trace,sqlx=debug,axum=trace,warn
+KZ_API_IP=127.0.0.1
+KZ_API_PORT=42069
+KZ_API_URL=https://cs2.kz
+KZ_API_JWT_SECRET=Y3Nnby1rei1pcy1kZWFkLWJveXMK
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: CS2KZ API CI
+name: CS2KZ API
 
 on:
   push:
@@ -9,39 +9,32 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  lint:
-    name: Clippy
+  compile:
+    name: Compilation and Linting
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: moonrepo/setup-rust@v1
         with:
           components: clippy
-      - run: make lint
+      - run: cargo clippy --all-features --workspace -- -D warnings
 
   format:
-    name: RustFmt
+    name: Formatting
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: moonrepo/setup-rust@v1
         with:
           channel: nightly
           components: rustfmt
-      - run: make format-check
+      - run: cargo +nightly fmt --all
 
   docs:
     name: Documentation
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: moonrepo/setup-rust@v1
-      - run: make docs
-
-  spech-check:
-    name: OpenAPI Spec Check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: moonrepo/setup-rust@v1
-      - run: make spec-check
+      - run: cargo doc --all-features --workspace --document-private-items --no-deps
+      - run: cargo run --package cs2kz-api-spec-generator -- --check api-spec.json
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-.direnv
 target
-database/volumes/**
+database/volumes
+.direnv
 .env
diff --git a/.rustfmt.toml b/.rustfmt.toml
@@ -1,5 +1,3 @@
-# For details on what these mean visit this website:
-#
 # https://rust-lang.github.io/rustfmt?version=v1.7.0
 
 edition = "2021"

diff --git a/.sqlx/query-046458783491cdd6f89ff80367a53bd591228b383e5331ba448224c027ee69d5.json b/.sqlx/query-046458783491cdd6f89ff80367a53bd591228b383e5331ba448224c027ee69d5.json
diff --git a/...6d4ddb6bbece7e8e30dc4d591cf3a40fee70.json → ...bcac3f7e20d6cd67b8f8270ffaa89d935114.json b/...6d4ddb6bbece7e8e30dc4d591cf3a40fee70.json → ...bcac3f7e20d6cd67b8f8270ffaa89d935114.json
diff --git a/...5cb04c2e489955aca628122ec88818f97ff0.json → ...59286eaf98983318382b773e5560d5411adf.json b/...5cb04c2e489955aca628122ec88818f97ff0.json → ...59286eaf98983318382b773e5560d5411adf.json
diff --git a/.sqlx/query-182e362fc0d45c02e44d00b1cb0d00ff74e4b784a5a23e0e32816f33fe3764a3.json b/.sqlx/query-182e362fc0d45c02e44d00b1cb0d00ff74e4b784a5a23e0e32816f33fe3764a3.json
diff --git a/.sqlx/query-35b9e8385138cb7f0c93d5ac40a21e9d661bc7e32f07f8ecd9ea94133782e427.json b/.sqlx/query-35b9e8385138cb7f0c93d5ac40a21e9d661bc7e32f07f8ecd9ea94133782e427.json
diff --git a/...b8f2be65a94abd957e475fea6422777ac9ad.json → ...4bc33c6102d28b0df88a0d59b87b54411589.json b/...b8f2be65a94abd957e475fea6422777ac9ad.json → ...4bc33c6102d28b0df88a0d59b87b54411589.json
diff --git a/.sqlx/query-4887cce6d919a53a20a328cc046bfa59313f7c3ba69bf08e1cb8d6920f6d3416.json b/.sqlx/query-4887cce6d919a53a20a328cc046bfa59313f7c3ba69bf08e1cb8d6920f6d3416.json
diff --git a/...bf3968395c54a3dd2196eb6f88141c328426.json → ...0786343f52169cd062f39be2c3c201b5190b.json b/...bf3968395c54a3dd2196eb6f88141c328426.json → ...0786343f52169cd062f39be2c3c201b5190b.json
diff --git a/.sqlx/query-593ee65905a23b06c90a282677b85342c3390ca2302616c1aa8bead264b16382.json b/.sqlx/query-593ee65905a23b06c90a282677b85342c3390ca2302616c1aa8bead264b16382.json
diff --git a/.sqlx/query-63d7e54f5ca876705cea175021002bf6e50216b6827a612b31aba66be6a9af8b.json b/.sqlx/query-63d7e54f5ca876705cea175021002bf6e50216b6827a612b31aba66be6a9af8b.json
diff --git a/.sqlx/query-65b67a5f8d3cada0ff9fe32fc21cd5647ff879bf3e8712bff570573c3baedeb6.json b/.sqlx/query-65b67a5f8d3cada0ff9fe32fc21cd5647ff879bf3e8712bff570573c3baedeb6.json
diff --git a/.sqlx/query-79a77c5871de83bee8bd93d932edd95c7603117e22cb60012502007305bbae80.json b/.sqlx/query-79a77c5871de83bee8bd93d932edd95c7603117e22cb60012502007305bbae80.json
diff --git a/.sqlx/query-7a2686ac9af843886162c8ed825706986c21d7973ad851ad6cf4cbd2936badfd.json b/.sqlx/query-7a2686ac9af843886162c8ed825706986c21d7973ad851ad6cf4cbd2936badfd.json