Cadence rate logic #22
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull Request Overview
This PR generalizes the invoice period logic by introducing an IsPeriod trait and replacing all hard-coded monthly concepts with a generic Period parameter that can be monthly or fortnightly. Key changes include:
- Refactored
ValidInput,Data,ProtoInvoiceInfo, and related functions to useperiodgenerically instead ofmonth. - Added a new
YearMonthAndFortnightsubmodel andPeriodAnnoenum to support bi-weekly invoicing alongside monthly. - Updated error variants, snapshots, CLI commands, and tests to cover the new generic period abstraction.
Reviewed Changes
Copilot reviewed 65 out of 67 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| crates/core/src/models/data/submodels/is_period.rs | Introduces the IsPeriod trait and PeriodMarker marker interface. |
| crates/core/src/models/data/submodels/year_month_and_fortnight.rs | Adds the fortnight period type and its IsPeriod implementation. |
| crates/core/src/models/valid_input.rs | Makes ValidInput generic on Period and renames month to period. |
| crates/core/src/models/data/data.rs | Makes Data generic on Period and replaces expensed_months with expensed_periods. |
| crates/cli/src/dispatch_command.rs | Updates CLI commands to handle generic periods instead of months. |
| crates/cli/src/input/tui.rs | Adds build_period to prompt for monthly or bi-weekly periods. |
| crates/render/src/render_test_helpers.rs | Adjusts PDF comparison helpers to be generic over Period. |
Comments suppressed due to low confidence (3)
crates/core/src/models/data/submodels/year_month_and_fortnight.rs:36
- Add unit tests for
elapsed_periods_sinceandto_date_end_of_periodto validate the new fortnight-period logic.
impl YearMonthAndFortnight {
crates/cli/src/input/tui.rs
Outdated
Comment on lines
173
to
188
| // match cadence { | ||
| // Cadence::Monthly => if let Some(default) = default { | ||
| // match default { | ||
| // PeriodAnno::YearAndMonth(ym) => { | ||
| // build_year_month_inner(help, Some(*ym.year()), Some(*ym.month())) | ||
| // } | ||
| // PeriodAnno::YearMonthAndFortnight(_) => { | ||
| // panic!("Expected YearAndMonth since Cadence is Monthly") | ||
| // } | ||
| // } | ||
| // } else { | ||
| // build_year_month_inner(help, None, None) | ||
| // } | ||
| // .map(|ok| ok.map(PeriodAnno::from)), | ||
| // Cadence::BiWeekly => build_year_month_inner(), | ||
| // } |
There was a problem hiding this comment.
[nitpick] Consider removing or refactoring the large commented-out block to improve readability and maintainability of the period-building logic.
Suggested change
| // match cadence { | |
| // Cadence::Monthly => if let Some(default) = default { | |
| // match default { | |
| // PeriodAnno::YearAndMonth(ym) => { | |
| // build_year_month_inner(help, Some(*ym.year()), Some(*ym.month())) | |
| // } | |
| // PeriodAnno::YearMonthAndFortnight(_) => { | |
| // panic!("Expected YearAndMonth since Cadence is Monthly") | |
| // } | |
| // } | |
| // } else { | |
| // build_year_month_inner(help, None, None) | |
| // } | |
| // .map(|ok| ok.map(PeriodAnno::from)), | |
| // Cadence::BiWeekly => build_year_month_inner(), | |
| // } | |
| // Removed redundant commented-out block for improved readability and maintainability. |
Copilot uses AI. Check for mistakes.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## invoice_cadence_and_granularity #22 +/- ##
===================================================================
- Coverage 95.80% 94.33% -1.47%
===================================================================
Files 79 88 +9
Lines 1717 2084 +367
===================================================================
+ Hits 1645 1966 +321
- Misses 72 118 +46 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.