Skip to content

Fix notes tags not included #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RMCampos merged 1 commit into from
Feb 10, 2026
Merged

Fix notes tags not included #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 16 additions & 10 deletions server/src/main/java/br/com/tasknoteapp/server/service/HomeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package br.com.tasknoteapp.server.service;

import br.com.tasknoteapp.server.response.NoteResponse;
import br.com.tasknoteapp.server.response.TaskResponse;
import java.util.HashSet;
import java.util.List;
Expand All @@ -16,10 +17,11 @@ public class HomeService {

private final TaskService taskService;

private static final String N_TASKS_FOUND = "%d tasks found!";
private final NoteService noteService;

public HomeService(TaskService taskService) {
public HomeService(TaskService taskService, NoteService noteService) {
this.taskService = taskService;
this.noteService = noteService;
}

/**
Expand All @@ -28,20 +30,24 @@ public HomeService(TaskService taskService) {
* @return List of String with the tags.
*/
public List<String> getTopTasksTag() {
logger.info("Getting all tags for the tasks");
logger.info("Getting all tags for tasks and notes");

List<TaskResponse> tasks = taskService.getTasksByFilter("all");
logger.info(String.format(N_TASKS_FOUND, tasks.size()));
List<NoteResponse> notes = noteService.getAllNotes();

Set<String> tags = new HashSet<>();
for (TaskResponse task : tasks) {
String tag = task.tag();
if (tag.isBlank()) {
tag = "untagged";
}
tags.add(tag);
tags.addAll(tasks.stream().map(TaskResponse::tag).filter(tag -> !tag.isBlank()).toList());
tags.addAll(notes.stream().map(NoteResponse::tag).filter(tag -> !tag.isBlank()).toList());

boolean hasBlankTags =
tasks.stream().anyMatch(task -> task.tag().isBlank())
|| notes.stream().anyMatch(note -> note.tag().isBlank());
if (hasBlankTags) {
tags.add("untagged");
}

logger.info("Found {} tags", tags.size());

return tags.stream().sorted().toList();
}
}
2 changes: 1 addition & 1 deletion server/src/test/java/br/com/tasknoteapp/server/service/HomeServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class HomeServiceTest {

@BeforeEach
void setUp() {
homeService = new HomeService(taskService);
homeService = new HomeService(taskService, noteService);
}

@Test
Expand Down
Loading