mvv/personal-finances
1
0
Fork 0
mirror of https://github.com/mvvasilev/personal-finances.git synced 2025-04-19 14:19:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-fetch categories on import, add delete cascade of categorizations

Browse source
This commit is contained in:
Miroslav Vasilev 2024-01-03 18:12:09 +02:00
parent 6b0f3828a3
commit 3ec459da6f
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PersonalFinancesService/src/main/java/dev/mvvasilev/finances/services/CategoryService.java
View file

@ -391,7 +391,7 @@ public class CategoryService {
private CreateCategorizationDTO mapCategorizationForImport(CategorizationDTO cr) { private CreateCategorizationDTO mapCategorizationForImport(CategorizationDTO cr) {
return new CreateCategorizationDTO ( return new CreateCategorizationDTO (
cr.rule().rule(), cr.rule().rule(),
cr.ruleBasedOn().field(), cr.ruleBasedOn() == null ? null : cr.ruleBasedOn().field(),
Optional.ofNullable(cr.stringValue()), Optional.ofNullable(cr.stringValue()),
Optional.ofNullable(cr.numericGreaterThan()), Optional.ofNullable(cr.numericGreaterThan()),
Optional.ofNullable(cr.numericLessThan()), Optional.ofNullable(cr.numericLessThan()),

4
PersonalFinancesService/src/main/resources/db/migration/V1.20__MakeCategorizationFKCascade.sql Normal file
View file

@ -0,0 +1,4 @@
ALTER TABLE categories.categorization DROP CONSTRAINT FK_categorization_category;
ALTER TABLE categories.categorization
ADD CONSTRAINT FK_categorization_category FOREIGN KEY (category_id) REFERENCES categories.transaction_category(id) ON DELETE CASCADE;

15
frontend/src/app/pages/CategoriesPage.jsx
View file

@ -197,12 +197,15 @@ export default function CategoriesPage() {
toast.promise( toast.promise(
utils.performRequest("/api/categories/import", { utils.performRequest("/api/categories/import", {
method: "POST", method: "POST",
body: formData body: formData
}).then(resp => { })
openUploadDialog(false); .then(resp => fetchCategories())
utils.hideSpinner(); .then(resp => {
}), setSelectedCategory(null);
openUploadDialog(false);
utils.hideSpinner();
}),
{ {
loading: "Importing...", loading: "Importing...",
success: "Imported", success: "Imported",