refactor: re-organize models/controllers and get started on v3 of the API

Author: ilyvion

Cargo.lock

@@ -13,8 +13,9 @@ database = { path = "./database" }
 shared = { path = "./shared" }
 
 chrono = { workspace = true }
-tracing = { workspace = true }
 futures = { workspace = true }
+sqlx = { workspace = true }
+tracing = { workspace = true }
 
 actix-files = "0.6.0-beta.7"
 actix-http = "3.2"
@@ -57,6 +58,14 @@ members = ["database", "shared"]
 [workspace.dependencies]
 chrono = { version = "0.4", features = ["serde"] }
 futures = "0.3"
+sqlx = { version = "0.7.1", features = [
+    "runtime-tokio-native-tls",
+    "mysql",
+    "macros",
+    "migrate",
+    "uuid",
+    "chrono",
+] }
 tracing = "0.1.37"
 
 [profile.release]

Cargo.toml

@@ -12,12 +12,4 @@ shared = { path = "../shared" }
 chrono = { workspace = true }
 futures = { workspace = true }
 tracing = { workspace = true }
-
-sqlx = { version = "0.7.1", features = [
-    "runtime-tokio-native-tls",
-    "mysql",
-    "macros",
-    "migrate",
-    "uuid",
-    "chrono",
-] }
+sqlx = { workspace = true }

database/Cargo.toml

@@ -0,0 +1,11 @@
+use actix_web::web;
+
+mod v1;
+mod v2;
+mod v3;
+
+pub fn configure(cfg: &mut web::ServiceConfig) {
+    cfg.service(web::scope("/v2").configure(v2::configure_v2));
+    cfg.service(web::scope("/v3").configure(v3::configure_v3));
+    cfg.service(web::scope("").configure(v1::configure_v1));
+}

src/api.rs

@@ -0,0 +1,4 @@
+mod controllers;
+mod models;
+
+pub(super) use controllers::configure as configure_v1;

src/api/v1.rs

@@ -1,8 +1,8 @@
 use actix_web::web;
 
-pub(in crate::controllers) mod comic;
-pub(in crate::controllers) mod item;
-pub(in crate::controllers) mod log;
+mod comic;
+mod item;
+mod log;
 
 pub fn configure(cfg: &mut web::ServiceConfig) {
     cfg.service(web::scope("/comicdata").configure(comic::configure));

src/controllers/v2/api.rs src/api/v1/controllers.rssrc/controllers/v2/api.rs renamed to src/api/v1/controllers.rs

@@ -1,17 +1,16 @@
 use actix_web::web;
 
-use crate::controllers::v2::api::comic::remove_item;
+pub(super) mod navigation_data;
 
-pub(crate) mod navigation_data;
-
-pub(in crate::controllers) mod add_item;
-pub(in crate::controllers) mod all;
-pub(in crate::controllers) mod by_id;
-pub(in crate::controllers) mod editor_data;
-pub(in crate::controllers) mod set_flags;
-pub(in crate::controllers) mod set_publish_date;
-pub(in crate::controllers) mod set_tagline;
-pub(in crate::controllers) mod set_title;
+mod add_item;
+mod all;
+mod by_id;
+mod editor_data;
+mod remove_item;
+mod set_flags;
+mod set_publish_date;
+mod set_tagline;
+mod set_title;
 
 pub fn configure(cfg: &mut web::ServiceConfig) {
     cfg.service(web::resource("/").route(web::get().to(all::all)))

src/controllers/v1/api/comic.rs src/api/v1/controllers/comic.rssrc/controllers/v1/api/comic.rs renamed to src/api/v1/controllers/comic.rs

@@ -1,4 +1,4 @@
-use crate::models::v1::{ComicId, ComicIdInvalidity, Token};
+use crate::models::{ComicId, ComicIdInvalidity, Token};
 use crate::util::{ensure_is_authorized, ensure_is_valid};
 use actix_web::{error, web, HttpResponse, Result};
 use actix_web_grants::permissions::AuthDetails;

src/controllers/v1/api/comic/add_item.rs src/api/v1/controllers/comic/add_item.rssrc/controllers/v1/api/comic/add_item.rs renamed to src/api/v1/controllers/comic/add_item.rs

@@ -1,4 +1,4 @@
-use crate::models::v1::{ComicList, Exclusion};
+use crate::api::v1::models::{ComicList, Exclusion};
 use actix_web::{error, web, HttpResponse, Result};
 use database::models::Comic as DatabaseComic;
 use database::DbPool;

src/controllers/v1/api/comic/all.rs src/api/v1/controllers/comic/all.rssrc/controllers/v1/api/comic/all.rs renamed to src/api/v1/controllers/comic/all.rs

@@ -1,11 +1,12 @@
-use crate::controllers::v1::api::comic::editor_data::fetch_editor_data_for_comic;
-use crate::controllers::v1::api::comic::navigation_data::{
+use crate::api::v1::controllers::comic::editor_data::fetch_editor_data_for_comic;
+use crate::api::v1::controllers::comic::navigation_data::{
     fetch_all_item_navigation_data, fetch_comic_item_navigation_data,
 };
-use crate::models::v1::{
-    Comic, ComicData, ComicId, Exclusion, False, Inclusion, ItemColor, ItemNavigationData,
-    ItemType, MissingComic, PresentComic, True, UnhydratedItemNavigationData,
+use crate::api::v1::models::{
+    Comic, ComicData, Exclusion, Inclusion, ItemColor, ItemNavigationData, ItemType, MissingComic,
+    PresentComic, UnhydratedItemNavigationData,
 };
+use crate::models::{ComicId, False, True};
 use crate::util::NewsUpdater;
 use actix_web::{error, web, HttpResponse, Result};
 use actix_web_grants::permissions::{AuthDetails, PermissionsCheck};