Bugfix/#170 show active work instant in report

[JonathanWekesser]

• Fixed Bug Active work only shown after a while in Report #170
• Refactored business logic from UI logic (Report Controller)
• added tests for business logic (Report Controller)
• active work is added to shown list, when isn't auto-saved yet

[sesturm]

@CodiumAI-Agent /review

[CodiumAI-Agent]

PR Reviewer Guide 🔍

⏱️ Estimated effort to review [1-5]	3
🧪 Relevant tests	Yes
🔒 Security concerns	No
⚡ Key issues to review	Possible Bug: The logic for adding the active work item to the workItems list in the Report class does not check if the active work item's date matches the report's date. This could lead to incorrect data being displayed for reports not meant for the current date.
	Refactoring Suggestion: The method fetchWorkItems in the Report class could be refactored to improve readability and separation of concerns. Consider breaking down the method into smaller, more focused methods.
	Performance Concern: The use of streams and filters in multiple places within the Report class could lead to performance issues with large datasets. Consider optimizing these operations or using more efficient data structures.

[Death111]

reminder for me: I do not like having this check still in the view-controller. Idea was that view just stupidly can show what the "view-model" presents it. no special logic needed.
this is why we did not merge it yet - as we now have logic in 2 places (Report.java and this class)

[sesturm]

bugbot run

[cursor]

Bug: Project Filtering Uses Inconsistent Object Equality

Inconsistent project filtering logic in Report.java. The calculateSeconds method filters work items by project using object reference equality (w.getProject() == project). This is problematic because Project objects in the workedProjectsSet (due to TreeSet usage with Project::getIndex comparator) or the activeWorkItem might be different object instances for the same logical project, even if they represent the same project ID. This leads to discrepancies between calculated project work times and displayed work items, resulting in incorrect totals or missing entries in the report.

src/main/java/de/doubleslash/keeptime/controller/report/Report.java#L92-L95

KeepTime/src/main/java/de/doubleslash/keeptime/controller/report/Report.java

Lines 92 to 95 in daeebea

	for (final Project project : workedProjectsSet) {
	final List<Work> onlyCurrentProjectWork = workItems.stream()
	.filter(w -> w.getProject() == project)
	.collect(Collectors.toList());

src/main/java/de/doubleslash/keeptime/view/ReportController.java#L229-L233

KeepTime/src/main/java/de/doubleslash/keeptime/view/ReportController.java

Lines 229 to 233 in daeebea

	for (Project project : report.getWorkedProjectsSet()) {
	final List<Work> projectWorks = report.getWorkItems()
	.stream()
	.filter(w -> w.getProject().getId() == project.getId())
	.toList();

Fix in Cursor • Fix in Web

---

Was this report helpful? Give feedback by reacting with 👍 or 👎