Merge pull request #469 from YuukiToriyama/feature/chimei-ruiju/fix-i…

…nteractor

chimei-ruiju.orgへの対応: `ChimeiRujiuInteractor`のメソッドの引数を変更

core/src/interactor.rs

@@ -11,18 +11,18 @@ pub(crate) trait ChimeiRuijuInteractor {
     /// 都道府県マスタを取得
     async fn get_prefecture_master(
         &self,
-        prefecture_name: &str,
+        prefecture: &Prefecture,
     ) -> Result<PrefectureMaster, ApiError>;
     /// 市区町村マスタを取得
     async fn get_city_master(
         &self,
-        prefecture_name: &str,
+        prefecture: &Prefecture,
         city_name: &str,
     ) -> Result<CityMaster, ApiError>;
     /// 町名マスタを取得
     async fn get_town_master(
         &self,
-        prefecture_name: &str,
+        prefecture: &Prefecture,
         city_name: &str,
         town_name: &str,
     ) -> Result<TownMaster, ApiError>;
@@ -44,28 +44,25 @@ impl Default for ChimeiRuijuInteractorImpl {
 impl ChimeiRuijuInteractor for ChimeiRuijuInteractorImpl {
     async fn get_prefecture_master(
         &self,
-        prefecture_name: &str,
+        prefecture: &Prefecture,
     ) -> Result<PrefectureMaster, ApiError> {
-        let prefecture = Prefecture::try_from(prefecture_name).unwrap();
-        PrefectureMasterRepository::get(&self.api_service, &prefecture).await
+        PrefectureMasterRepository::get(&self.api_service, prefecture).await
     }
 
     async fn get_city_master(
         &self,
-        prefecture_name: &str,
+        prefecture: &Prefecture,
         city_name: &str,
     ) -> Result<CityMaster, ApiError> {
-        let prefecture = Prefecture::try_from(prefecture_name).unwrap();
-        CityMasterRepository::get(&self.api_service, &prefecture, city_name).await
+        CityMasterRepository::get(&self.api_service, prefecture, city_name).await
     }
 
     async fn get_town_master(
         &self,
-        prefecture_name: &str,
+        prefecture: &Prefecture,
         city_name: &str,
         town_name: &str,
     ) -> Result<TownMaster, ApiError> {
-        let prefecture = Prefecture::try_from(prefecture_name).unwrap();
-        TownMasterRepository::get(&self.api_service, &prefecture, city_name, town_name).await
+        TownMasterRepository::get(&self.api_service, prefecture, city_name, town_name).await
     }
 }