Skip to content
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

#469 Clean up soft-deleted timereports during employee order deletion. #470

Merged
merged 1 commit into from
Jan 17, 2025
Merged

#469 Clean up soft-deleted timereports during employee order deletion. #470

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
6 changes: 6 additions & 0 deletions src/main/java/org/tb/dailyreport/persistence/TimereportRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import java.util.Optional;
import org.hibernate.jpa.HibernateHints;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.NativeQuery;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.jpa.repository.QueryHints;
import org.springframework.data.repository.CrudRepository;
Expand Down Expand Up @@ -138,4 +140,8 @@ where tr.employeeorder.id in (:ids) group by tr.employeeorder.id
""")
List<Long[]> getReportedMinutesForEmployeeordersAsMap(List<Long> ids);

@Modifying
@NativeQuery("DELETE FROM timereport t WHERE t.employeeorder_id = :employeeorderId and t.deleted = true")
int hardDeleteSoftDeletedByEmployeeorderId(Long employeeorderId);

}
2 changes: 2 additions & 0 deletions src/main/java/org/tb/dailyreport/service/TimereportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,8 @@ void onEmployeeorderDelete(EmployeeorderDeleteEvent event) {
.toList();
event.veto(errors);
}
var deletedCount = timereportRepository.hardDeleteSoftDeletedByEmployeeorderId(employeeorderId); // ensure no soft deleted timereport exists
log.info("{} soft deleted timereports were deleted to allow deletion of employee order {}.", deletedCount, employeeorderId);
}

@EventListener
Expand Down
Loading