Skip to content

tasks: Ensure when you update them they just update #167

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

Open
flintman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

tasks: Ensure when you update them they just update #167

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
122 changes: 83 additions & 39 deletions api/src/main/java/com/grash/controller/TaskController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,50 @@ public Collection<TaskShowDTO> createByPreventiveMaintenance(@Valid @RequestBody
OwnUser user = userService.whoami(req);
Optional<PreventiveMaintenance> optionalPreventiveMaintenance = preventiveMaintenanceService.findById(id);
if (optionalPreventiveMaintenance.isPresent() && optionalPreventiveMaintenance.get().canBeEditedBy(user)) {
taskService.findByPreventiveMaintenance(id).forEach(task -> taskService.delete(task.getId()));
Collection<TaskBase> taskBases = taskBasesReq.stream().map(taskBaseDTO ->
taskBaseService.createFromTaskBaseDTO(taskBaseDTO, user.getCompany())).collect(Collectors.toList());
return taskBases.stream().map(taskBase -> {
StringBuilder value = new StringBuilder();
if (taskBase.getTaskType().equals(TaskType.SUBTASK)) {
value.append("OPEN");
} else if (taskBase.getTaskType().equals(TaskType.INSPECTION)) {
value.append("FLAG");
List<Task> savedPMTasks = taskService.findByPreventiveMaintenance(id);
List<TaskBaseDTO> incomingTasks = new ArrayList<>(taskBasesReq);

// Merge tasks intelligently: preserve existing task data (notes, images, value)
List<Task> resultTasks = new ArrayList<>();
List<Task> matchedTasks = new ArrayList<>();

// Process each incoming task
for (TaskBaseDTO reqTaskBase : incomingTasks) {
// Find matching existing task by comparing task base properties
Task matchedTask = savedPMTasks.stream()
.filter(task -> !matchedTasks.contains(task) && tasksMatch(task.getTaskBase(), reqTaskBase))
.findFirst()
.orElse(null);

if (matchedTask != null) {
// Task already exists - preserve it with all its data (notes, images, value)
matchedTasks.add(matchedTask);
resultTasks.add(matchedTask);
} else {
// New task - create it
TaskBase taskBase = taskBaseService.createFromTaskBaseDTO(reqTaskBase, user.getCompany());
StringBuilder value = new StringBuilder();
if (taskBase.getTaskType().equals(TaskType.SUBTASK)) {
value.append("OPEN");
} else if (taskBase.getTaskType().equals(TaskType.INSPECTION)) {
value.append("FLAG");
}
Task newTask = new Task(taskBase, null, optionalPreventiveMaintenance.get(), value.toString());
Task createdTask = taskService.create(newTask);
resultTasks.add(createdTask);
}
Task task = new Task(taskBase, null, optionalPreventiveMaintenance.get(), value.toString());
return taskService.create(task);
}).map(taskMapper::toShowDto).collect(Collectors.toList());
}

// Delete tasks that are no longer in the incoming request
savedPMTasks.forEach(task -> {
if (!matchedTasks.contains(task)) {
taskService.delete(task.getId());
}
});

return resultTasks.stream()
.map(taskMapper::toShowDto)
.collect(Collectors.toList());
} else throw new CustomException("Not found", HttpStatus.NOT_FOUND);
}

Expand All @@ -102,35 +133,48 @@ List<TaskShowDTO> create(@Valid @RequestBody List<TaskBaseDTO> taskBasesReq,
Optional<WorkOrder> optionalWorkOrder = workOrderService.findById(id);
if (optionalWorkOrder.isPresent() && optionalWorkOrder.get().canBeEditedBy(user)) {
List<Task> savedWOTasks = taskService.findByWorkOrder(id);
boolean isSame;
if (savedWOTasks.size() != taskBasesReq.size()) {
isSame = false;
} else {
isSame = IntStream.range(0, savedWOTasks.size())
.allMatch(i -> {
TaskBase savedTaskBase = savedWOTasks.get(i).getTaskBase();
TaskBaseDTO reqTaskBase = taskBasesReq.get(i);
return tasksMatch(savedTaskBase, reqTaskBase);
});
}
if (isSame) {
return savedWOTasks.stream()
.map(taskMapper::toShowDto)
.collect(Collectors.toList());

// Merge tasks intelligently: preserve existing task data (notes, images, value)
List<Task> resultTasks = new ArrayList<>();
List<Task> matchedTasks = new ArrayList<>();

// Process each incoming task
for (TaskBaseDTO reqTaskBase : taskBasesReq) {
// Find matching existing task by comparing task base properties
Task matchedTask = savedWOTasks.stream()
.filter(task -> !matchedTasks.contains(task) && tasksMatch(task.getTaskBase(), reqTaskBase))
.findFirst()
.orElse(null);

if (matchedTask != null) {
// Task already exists - preserve it with all its data (notes, images, value)
matchedTasks.add(matchedTask);
resultTasks.add(matchedTask);
} else {
// New task - create it
TaskBase taskBase = taskBaseService.createFromTaskBaseDTO(reqTaskBase, user.getCompany());
StringBuilder value = new StringBuilder();
if (taskBase.getTaskType().equals(TaskType.SUBTASK)) {
value.append("OPEN");
} else if (taskBase.getTaskType().equals(TaskType.INSPECTION)) {
value.append("FLAG");
}
Task newTask = new Task(taskBase, optionalWorkOrder.get(), null, value.toString());
Task createdTask = taskService.create(newTask);
resultTasks.add(createdTask);
}
}
savedWOTasks.forEach(task -> taskService.delete(task.getId()));
List<TaskBase> taskBases = taskBasesReq.stream().map(taskBaseDTO ->
taskBaseService.createFromTaskBaseDTO(taskBaseDTO, user.getCompany())).collect(Collectors.toList());
return taskBases.stream().map(taskBase -> {
StringBuilder value = new StringBuilder();
if (taskBase.getTaskType().equals(TaskType.SUBTASK)) {
value.append("OPEN");
} else if (taskBase.getTaskType().equals(TaskType.INSPECTION)) {
value.append("FLAG");

// Delete tasks that are no longer in the incoming request
savedWOTasks.forEach(task -> {
if (!matchedTasks.contains(task)) {
taskService.delete(task.getId());
}
Task task = new Task(taskBase, optionalWorkOrder.get(), null, value.toString());
return taskService.create(task);
}).map(taskMapper::toShowDto).collect(Collectors.toList());
});

return resultTasks.stream()
.map(taskMapper::toShowDto)
.collect(Collectors.toList());
} else throw new CustomException("Not found", HttpStatus.NOT_FOUND);
}

Expand Down