Rename test modules

Cargo.toml

@@ -40,4 +40,5 @@ entity = { path = "entity" }
 migration = { path = "migration" }
 
 [dev-dependencies]
+mockall = "0.11.3"
 rstest = "0.16.0"

src/controllers/api/animes/index.rs

@@ -4,19 +4,19 @@ use sea_orm::{ActiveModelTrait, ColumnTrait, EntityTrait, QueryFilter};
 use serde::{Deserialize, Serialize};
 
 use crate::app_state::AppState;
-use crate::types::animes::{StrictAnime, StrictAnimes};
+use crate::types::animes::{Anime, Animes};
 use entity::anime::{Column as AnimeColumn, Entity as AnimeEntity};
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct ResponseBody {
-    pub animes: StrictAnimes,
+    pub animes: Animes,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
 struct ErrorResponseBody {
     reason: String,
-    successful_animes: StrictAnimes,
-    failed_anime: StrictAnime,
+    successful_animes: Animes,
+    failed_anime: Anime,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -27,7 +27,7 @@ pub struct PathParams {
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct BodyParams {
-    animes: StrictAnimes,
+    animes: Animes,
 }
 
 type AppData = web::Data<AppState>;
@@ -40,7 +40,7 @@ pub async fn get(data: AppData) -> impl Responder {
         return HttpResponse::InternalServerError().finish();
     }
 
-    let mut animes = StrictAnime::new_by_models(found_animes.unwrap());
+    let mut animes = Anime::new_by_models(found_animes.unwrap());
     animes.sort();
     return HttpResponse::Ok().json(ResponseBody { animes });
 }
@@ -56,7 +56,7 @@ pub async fn get_by_year(data: AppData, path_params: web::Path<PathParams>) -> i
         return HttpResponse::InternalServerError().finish();
     }
 
-    let mut animes = StrictAnime::new_by_models(found_animes.unwrap());
+    let mut animes = Anime::new_by_models(found_animes.unwrap());
     animes.sort();
     return HttpResponse::Ok().json(ResponseBody { animes });
 }
@@ -73,7 +73,7 @@ pub async fn get_by_season(data: AppData, path_params: web::Path<PathParams>) ->
         return HttpResponse::InternalServerError().finish();
     }
 
-    let mut animes = StrictAnime::new_by_models(found_animes.unwrap());
+    let mut animes = Anime::new_by_models(found_animes.unwrap());
     animes.sort();
     return HttpResponse::Ok().json(ResponseBody { animes });
 }
@@ -82,7 +82,7 @@ pub async fn post(data: AppData, body_params: web::Json<BodyParams>) -> impl Res
     let new_animes = &body_params.animes;
     info!("Try to insert animes: {:?}", new_animes);
 
-    let target_option_animes = StrictAnime::to_active_models(new_animes.clone());
+    let target_option_animes = Anime::to_active_models(new_animes.clone());
     let include_none = target_option_animes
         .clone()
         .into_iter()
@@ -140,7 +140,7 @@ pub async fn put(data: AppData, body_params: web::Json<BodyParams>) -> impl Resp
         }
 
         info!("Succeeded to update an anime: {:?}", anime);
-        updated_animes.push(StrictAnime::new_by_model(updated_anime.unwrap()));
+        updated_animes.push(Anime::new_by_model(updated_anime.unwrap()));
     }
 
     return HttpResponse::Ok().json(ResponseBody {

src/controllers/api/animes/scrape.rs

@@ -3,7 +3,7 @@ use log::debug;
 use serde::{Deserialize, Serialize};
 
 use crate::service::anime_scraper::fetch;
-use crate::types::animes::StrictAnimes;
+use crate::types::animes::Animes;
 use crate::types::season::Season;
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -13,7 +13,7 @@ pub struct PathParams {
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct ResponseBody {
-    animes: StrictAnimes,
+    animes: Animes,
 }
 
 pub async fn get(path_params: web::Path<PathParams>) -> impl Responder {

src/service/anime_scraper.rs

@@ -6,13 +6,13 @@ use log::{debug, info};
 use scraper::element_ref::ElementRef;
 use scraper::{Html, Selector};
 
-use crate::types::animes::{Detail, StrictAnime, StrictAnimes};
+use crate::types::animes::{Anime, Animes, Detail};
 use crate::types::season::Season;
 use crate::types::wday::WDay;
 
 const BASE_URL: &str = "https://akiba-souken.com/anime/";
 
-pub async fn fetch(season: Season) -> StrictAnimes {
+pub async fn fetch(season: Season) -> Animes {
     let url = mk_url(&season);
     if url.is_none() {
         return vec![];
@@ -34,8 +34,8 @@ pub async fn fetch(season: Season) -> StrictAnimes {
 
     let animes = anime_items
         .into_iter()
-        .map(|i| StrictAnime::new(parse_title(&i), year, season.clone(), parse_detail(&i)))
-        .collect::<StrictAnimes>();
+        .map(|i| Anime::new(parse_title(&i), year, season.clone(), parse_detail(&i)))
+        .collect::<Animes>();
     info!("fetch animes = {:?}", animes);
 
     return animes;

src/types/animes.rs

@@ -9,7 +9,7 @@ use crate::types::wday::WDay;
 use entity::anime::{ActiveModel as AnimeActiveModel, Model as AnimeModel};
 
 #[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Clone)]
-pub struct StrictAnime {
+pub struct Anime {
     pub id: Option<i32>,
     pub year: Option<i32>,
     pub season: Option<Season>,
@@ -20,9 +20,9 @@ pub struct StrictAnime {
     pub recommend: Option<bool>,
 }
 
-pub type StrictAnimes = Vec<StrictAnime>;
+pub type Animes = Vec<Anime>;
 
-impl StrictAnime {
+impl Anime {
     pub fn new(title: String, year: i32, season: Season, detail: Detail) -> Self {
         return Self {
             id: None,
@@ -49,8 +49,8 @@ impl StrictAnime {
         };
     }
 
-    pub fn new_by_models(animes: Vec<AnimeModel>) -> StrictAnimes {
-        return animes.into_iter().map(StrictAnime::new_by_model).collect();
+    pub fn new_by_models(animes: Vec<AnimeModel>) -> Animes {
+        return animes.into_iter().map(Anime::new_by_model).collect();
     }
 
     pub fn to_active_model(self) -> Option<AnimeActiveModel> {
@@ -83,13 +83,13 @@ impl StrictAnime {
     }
 }
 
-impl PartialOrd for StrictAnime {
+impl PartialOrd for Anime {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         return Some(self.cmp(other));
     }
 }
 
-impl Ord for StrictAnime {
+impl Ord for Anime {
     fn cmp(&self, other: &Self) -> Ordering {
         if self.year != other.year {
             return self.year.cmp(&other.year);

tests/controllers/api/animes/mod.rs

@@ -1 +1 @@
-pub mod index;
+pub mod index_test;

tests/controllers/api/mod.rs

@@ -1,3 +1,3 @@
 pub mod animes;
-pub mod echo;
-pub mod index;
+pub mod echo_test;
+pub mod index_test;

tests/controllers/auth/mod.rs

@@ -1 +1 @@
-pub mod logout;
+pub mod logout_test;

tests/controllers/health_check/mod.rs

@@ -1 +1 @@
-pub mod index;
+pub mod index_test;