Skip to content

ref: zone and dashboard services #15

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
devcavin merged 1 commit into from
Jul 1, 2026
+3 −3
Merged

ref: zone and dashboard services #15

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
0 Dockerfile → backend/Dockerfile
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions backend/src/main/kotlin/io/github/devcavin/backend/service/DashboardService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class DashboardService(
siteId = siteId,
visitStatus = checkedInStatus,
pageable = PageRequest.of(0, 10,
Sort.by(Sort.Direction.DESC, "checkoutTime"))
Sort.by(Sort.Direction.DESC, "checkInTime"))
).content.map { it.toResponse() }

val overdueVisitors = visitorRepository.findAllOverdue(
Expand All @@ -75,7 +75,7 @@ class DashboardService(
siteId = siteId,
visitStatus = checkedOutStatus,
pageable = PageRequest.of(0, 10,
Sort.by(Sort.Direction.DESC, "checkoutTime"))
Sort.by(Sort.Direction.DESC, "checkOutTime"))
).content.map { it.toResponse() }

return DashboardFeed(
Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/kotlin/io/github/devcavin/backend/service/ZoneService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ZoneService(
val site = siteRepository.findById(siteId)
.orElseThrow { ResourceNotFoundException("Site", siteId) }

if (!zoneRepository.existsBySiteIdAndName(siteId, request.name)) {
if (zoneRepository.existsBySiteIdAndName(siteId, request.name)) {
throw ConflictException("Zone with this name already exists under this site")
}

Expand Down
Loading