Fix to use rng.gen_range

src/infrastructure/namegen.rs

@@ -6,6 +6,7 @@ use std::{
 use anyhow::{bail, ensure, Context};
 use rand::{thread_rng, Rng};
 use scraper::{Html, Selector};
+use time::{Date, Month, OffsetDateTime};
 use tokio::sync::Mutex;
 
 use crate::{
@@ -146,6 +147,12 @@ impl GeneratePiUseCase for NamesCache {
             KanaForm::Katakana => name.in_katakana(),
             KanaForm::HalfwidthKana => name.in_halfwidth_kana(),
         };
-        Ok(PI::from((name, sex, DateOfBirth::gen())))
+        let current_year = OffsetDateTime::now_utc().year();
+        let start =
+            Date::from_calendar_date(current_year - 120, Month::January, 1).expect("invalid date");
+        let end =
+            Date::from_calendar_date(current_year, Month::December, 31).expect("invalid date");
+        let date = rng.gen_range(DateOfBirth::from(start)..=DateOfBirth::from(end));
+        Ok(PI::from((name, sex, date)))
     }
 }

src/model/date_of_birth.rs

@@ -6,13 +6,8 @@ use time::{macros::format_description, Date, Duration, OffsetDateTime};
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct DateOfBirth(Date);
 
-impl DateOfBirth {
-    pub fn gen() -> Self {
-        let mut rng = thread_rng();
-        let current_year = OffsetDateTime::now_utc().year();
-        let year = rng.gen_range(current_year - 120..=current_year);
-        let date = rng.gen::<Date>();
-        let date = Date::from_calendar_date(year, date.month(), date.day()).expect("invalid date");
+impl From<Date> for DateOfBirth {
+    fn from(date: Date) -> Self {
         Self(date)
     }
 }
@@ -90,6 +85,15 @@ mod tests {
 
     use super::*;
 
+    #[test]
+    fn test_from_date() -> anyhow::Result<()> {
+        let date = Date::parse("2020-01-02", format_description!("[year]-[month]-[day]"))?;
+        let dob = DateOfBirth::from(date);
+        let s = serde_json::to_string(&dob)?;
+        assert_eq!(s, r#""2020-01-02""#);
+        Ok(())
+    }
+
     #[test]
     fn test_from_str() -> anyhow::Result<()> {
         let dob: DateOfBirth = "2020-01-02".parse()?;
@@ -116,9 +120,4 @@ mod tests {
 
         Ok(())
     }
-
-    #[test]
-    fn test_gen() {
-        assert_ne!(DateOfBirth::gen(), DateOfBirth::gen());
-    }
 }