more tests

Author: Sajjon

crates/core/src/logic/calendar_logic.rs

@@ -996,10 +996,24 @@ mod tests {
     }
 
     #[test]
-    fn test_one_half_earlier_second() {
+    fn ymf_one_half_earlier_month_half_first_half() {
         let ym = YearAndMonth::january(2025);
-        let month = YearMonthAndFortnight::year_and_month_with_half(ym, MonthHalf::Second);
-        let one_half_earlier = month.one_half_earlier();
+        let ymf = YearMonthAndFortnight::year_and_month_with_half(ym, MonthHalf::First);
+        let one_half_earlier = ymf.one_half_earlier();
+        assert_eq!(
+            one_half_earlier,
+            YearMonthAndFortnight::year_and_month_with_half(
+                YearAndMonth::december(2024),
+                MonthHalf::Second
+            )
+        );
+    }
+
+    #[test]
+    fn ymf_one_half_earlier_month_half_second_half() {
+        let ym = YearAndMonth::january(2025);
+        let ymf = YearMonthAndFortnight::year_and_month_with_half(ym, MonthHalf::Second);
+        let one_half_earlier = ymf.one_half_earlier();
         assert_eq!(
             one_half_earlier,
             YearMonthAndFortnight::year_and_month_with_half(ym, MonthHalf::First)

crates/core/src/logic/command/command.rs

@@ -646,7 +646,7 @@ mod tests {
         let result = record_expenses_with_base_path(
             &period,
             &[Item::sample_expense_breakfast()],
-            tempdir.path().to_path_buf(),
+            tempdir.path(),
         );
         assert!(
             result.is_err(),
@@ -670,7 +670,7 @@ mod tests {
         let result = record_expenses_with_base_path(
             &period,
             &[Item::sample_expense_breakfast()],
-            tempdir.path().to_path_buf(),
+            tempdir.path(),
         );
         assert!(
             result.is_err(),

crates/core/src/models/data/data.rs

@@ -59,12 +59,10 @@ impl<Period: IsPeriod> Data<Period> {
         cadence: Cadence,
         time_off: &Option<TimeOff>,
     ) -> Result<Quantity> {
-        let quantity_in_period = quantity_in_period(
-            target_period,
-            self.service_fees().rate().granularity(),
-            cadence,
-            self.information().record_of_periods_off(),
-        )?;
+        let granularity = self.service_fees().rate().granularity();
+        let periods_off = self.information().record_of_periods_off();
+        let quantity_in_period =
+            quantity_in_period(target_period, granularity, cadence, periods_off)?;
         let billable_quantity = quantity_in_period - time_off.map(|d| *d).unwrap_or(Quantity::ZERO);
         Ok(billable_quantity)
     }

crates/core/src/models/data/submodels/cadence.rs

@@ -16,18 +16,13 @@ pub enum Cadence {
 
 impl Cadence {
     pub fn validate(&self, granularity: impl Into<Granularity>) -> Result<()> {
+        use Cadence::*;
+        use Granularity::*;
         let granularity = granularity.into();
         match (self, granularity) {
-            (Self::BiWeekly, Granularity::Month) => {
-                Err(Error::CannotInvoiceForMonthWhenCadenceIsBiWeekly)
-            }
-            (Self::BiWeekly, Granularity::Fortnight | Granularity::Day | Granularity::Hour) => {
-                Ok(())
-            }
-            (
-                Self::Monthly,
-                Granularity::Fortnight | Granularity::Day | Granularity::Hour | Granularity::Month,
-            ) => Ok(()),
+            (BiWeekly, Month) => Err(Error::CannotInvoiceForMonthWhenCadenceIsBiWeekly),
+            (BiWeekly, Fortnight | Day | Hour) => Ok(()),
+            (Monthly, Fortnight | Day | Hour | Month) => Ok(()),
         }
     }
 }
@@ -61,15 +56,15 @@ mod tests {
     }
 
     #[test]
-    fn validate() {
-        assert!(Sut::sample().validate(Granularity::Month).is_ok());
-        assert!(Sut::sample().validate(Granularity::Fortnight).is_ok());
-        assert!(Sut::sample().validate(Granularity::Day).is_ok());
-        assert!(Sut::sample().validate(Granularity::Hour).is_ok());
+    fn validate_successful() {
+        assert!(Sut::Monthly.validate(Granularity::Month).is_ok());
+        assert!(Sut::Monthly.validate(Granularity::Fortnight).is_ok());
+        assert!(Sut::Monthly.validate(Granularity::Day).is_ok());
+        assert!(Sut::Monthly.validate(Granularity::Hour).is_ok());
 
-        assert!(Sut::sample_other().validate(Granularity::Month).is_err());
-        assert!(Sut::sample_other().validate(Granularity::Fortnight).is_ok());
-        assert!(Sut::sample_other().validate(Granularity::Day).is_ok());
-        assert!(Sut::sample_other().validate(Granularity::Hour).is_ok());
+        assert!(Sut::BiWeekly.validate(Granularity::Month).is_err());
+        assert!(Sut::BiWeekly.validate(Granularity::Fortnight).is_ok());
+        assert!(Sut::BiWeekly.validate(Granularity::Day).is_ok());
+        assert!(Sut::BiWeekly.validate(Granularity::Hour).is_ok());
     }
 }

crates/core/src/models/data/submodels/service_fees.rs

@@ -20,11 +20,15 @@ pub struct ServiceFees {
 #[bon]
 impl ServiceFees {
     #[builder]
-    pub fn new(name: String, rate: impl Into<Rate>, cadence: Cadence) -> Result<Self, Error> {
+    pub fn new(
+        name: impl AsRef<str>,
+        rate: impl Into<Rate>,
+        cadence: Cadence,
+    ) -> Result<Self, Error> {
         let rate = rate.into();
         cadence.validate(rate.granularity())?;
         Ok(Self {
-            name,
+            name: name.as_ref().to_owned(),
             rate,
             cadence,
         })