Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Fixed

- Category, Hide From Reports is now persisted. [#24] fixed in [#26]

### Changed

- The secrets file is now copied instead of moved during `tiller init` [#23]

## [v0.1.0]

### Added

- Initial project structure, documentation and design [#3], [#4]
Expand All @@ -23,7 +33,8 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

<!-- Tags -->

[Unreleased]: https://github.com/webern/tiller/compare/9c4b07a...HEAD
[Unreleased]: https://github.com/webern/tiller/compare/v0.1.0...HEAD
[v0.1.0]: https://github.com/webern/tiller-sync/releases/tag/v0.1.0

<!-- Pull Requests -->
[#3]: https://github.com/webern/tiller-sync/pull/3
Expand All @@ -44,5 +55,8 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
[#19]: https://github.com/webern/tiller-sync/pull/19
[#21]: https://github.com/webern/tiller-sync/pull/21
[#22]: https://github.com/webern/tiller-sync/pull/22
[#23]: https://github.com/webern/tiller-sync/pull/23
[#26]: https://github.com/webern/tiller-sync/pull/26

<!-- Issues -->
[#24]: https://github.com/webern/tiller-sync/issues/24
1 change: 1 addition & 0 deletions src/api/sheet_test_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,7 @@ Coffee Shops,Food,Expense,,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00
Gas & Fuel,Auto,Expense,,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00
Restaurants,Food,Expense,,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00
Utilities,Home,Expense,,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00,$0.00
Hidden Category,Food,Expense,Hide,,,,,,,,,,,,
"##;

/// Seed AutoCat data.
Expand Down
19 changes: 17 additions & 2 deletions src/commands/sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,24 @@ mod tests {
);
assert_eq!(
tiller_data.categories.data().len(),
5,
"Should have 5 categories from TestSheet"
6,
"Should have 6 categories from TestSheet"
);

// Assert that "Hidden Category" has the value "Hide".
// Bug fix: https://github.com/webern/tiller-sync/issues/24
let hidden_category = tiller_data
.categories
.data()
.iter()
.find(|&item| item.category == "Hidden Category")
.unwrap();
assert_eq!(
hidden_category.hide_from_reports, "Hide",
"The 'Hide From Reports' column should be properly serialized and deserialized but it \
wasn't. This could be a regression of https://github.com/webern/tiller-sync/issues/24"
);

assert_eq!(
tiller_data.auto_cats.data().len(),
3,
Expand Down
2 changes: 1 addition & 1 deletion src/model/category.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ impl CategoryColumn {
pub(super) const CATEGORY_STR: &str = "Category";
pub(super) const GROUP_STR: &str = "Group";
pub(super) const TYPE_STR: &str = "Type";
pub(super) const HIDE_FROM_REPORTS_STR: &str = "Hide from Reports";
pub(super) const HIDE_FROM_REPORTS_STR: &str = "Hide From Reports";

/// The fields to update in a category row. Only set values will be changed, unset values will
/// not be changed.
Expand Down