Skip to content

feat(audit-logs): improve audit logs search #52

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
wan0v merged 1 commit into from
Jun 16, 2026
Merged

feat(audit-logs): improve audit logs search #52

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
2 changes: 1 addition & 1 deletion .../main/kotlin/com/alleslocker/backend/application/auditlog/dto/filter/AuditLogFilterDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ import java.time.Instant
data class AuditLogFilterDto(
val fromDate: Instant? = null,
val toDate: Instant? = null,
val performedByUserId: String? = null,
val searchText: String? = null,
)
30 changes: 26 additions & 4 deletions ...otlin/com/alleslocker/backend/persistence/auditlog/specification/AuditLogSpecification.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ package com.alleslocker.backend.persistence.auditlog.specification

import com.alleslocker.backend.application.auditlog.dto.filter.AuditLogFilterDto
import com.alleslocker.backend.persistence.auditlog.entity.AuditLogEntity
import com.alleslocker.backend.persistence.user.entity.UserEntity
import jakarta.persistence.criteria.JoinType
import jakarta.persistence.criteria.Predicate
import org.springframework.data.jpa.domain.Specification

object AuditLogSpecification {
fun withFilter(filter: AuditLogFilterDto): Specification<AuditLogEntity> =
Specification { root, _, cb ->
Specification { root, query, cb ->
val predicates = mutableListOf<Predicate>()

filter.fromDate?.let {
Expand All @@ -18,9 +20,29 @@ object AuditLogSpecification {
predicates.add(cb.lessThanOrEqualTo(root.get("createdAt"), it))
}

filter.performedByUserId?.let { userId ->
predicates.add(cb.equal(root.get<Any>("performedBy").get<String>("id"), userId))
}
filter.searchText
?.takeIf { it.isNotBlank() }
?.let { searchText ->
val isCountQuery =
query?.resultType == java.lang.Long::class.java ||
query?.resultType == Long::class.javaPrimitiveType

if (!isCountQuery) {
query?.distinct(true)
}

val pattern = "%${searchText.lowercase()}%"
Comment thread
wan0v marked this conversation as resolved.
val performedBy = root.join<AuditLogEntity, UserEntity>("performedBy", JoinType.LEFT)

predicates.add(
cb.or(
cb.like(cb.lower(root.get("message")), pattern),
cb.like(cb.lower(performedBy.get("username")), pattern),
cb.like(cb.lower(performedBy.get("firstname")), pattern),
cb.like(cb.lower(performedBy.get("lastname")), pattern),
),
)
}

cb.and(*predicates.toTypedArray())
}
Expand Down
Loading