Skip to content

Add default location limit #128

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
jackpf merged 2 commits into from
Apr 21, 2026
Merged

Add default location limit #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9cb0fb
Add default location limit
jackpf Apr 21, 2026
6310ef8
Fix tests
jackpf Apr 21, 2026
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
13 changes: 11 additions & 2 deletions server/src/main/scala/com/jackpf/locationhistory/server/grpc/AdminServiceImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ package com.jackpf.locationhistory.server.grpc
import com.jackpf.locationhistory.admin_service.*
import com.jackpf.locationhistory.admin_service.AdminServiceGrpc.AdminService
import com.jackpf.locationhistory.server.errors.ApplicationErrors.*
import com.jackpf.locationhistory.server.grpc.AdminServiceImpl.{DefaultUser, TokenDuration}
import com.jackpf.locationhistory.server.grpc.AdminServiceImpl.{
DefaultLocationLimit,
DefaultUser,
TokenDuration
}
import com.jackpf.locationhistory.server.grpc.interceptors.TokenService
import com.jackpf.locationhistory.server.model.DeviceId
import com.jackpf.locationhistory.server.repo.{DeviceRepo, LocationRepo}
Expand All @@ -18,6 +22,8 @@ import scala.util.{Failure, Success}
object AdminServiceImpl {
val DefaultUser: String = "admin"
val TokenDuration: Long = 3600

val DefaultLocationLimit: Option[Int] = Some(1000)
}

class AdminServiceImpl(
Expand Down Expand Up @@ -80,7 +86,10 @@ class AdminServiceImpl(
request: ListLocationsRequest
): Future[ListLocationsResponse] = {
for {
locations <- locationRepo.getForDevice(DeviceId(request.deviceId), limit = None)
locations <- locationRepo.getForDevice(
DeviceId(request.deviceId),
limit = DefaultLocationLimit
)
Comment thread
jackpf marked this conversation as resolved.
} yield ListLocationsResponse(locations.map(_.toProto))
}

Expand Down
10 changes: 7 additions & 3 deletions server/src/test/scala/com/jackpf/locationhistory/server/grpc/AdminServiceImplTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@ import org.specs2.concurrent.ExecutionEnv

import scala.concurrent.Future
import scala.util.{Failure, Success, Try}
import com.jackpf.locationhistory.server.grpc.AdminServiceImpl.DefaultUser
import com.jackpf.locationhistory.server.grpc.AdminServiceImpl.TokenDuration
import com.jackpf.locationhistory.server.grpc.AdminServiceImpl.{
DefaultLocationLimit,
DefaultUser,
TokenDuration
}

class AdminServiceImplTest(implicit ee: ExecutionEnv)
extends DefaultSpecification
Expand Down Expand Up @@ -226,7 +229,8 @@ class AdminServiceImplTest(implicit ee: ExecutionEnv)
lazy val deviceId: String = "123"

lazy val getResponse: Future[Vector[model.StoredLocation]]
when(locationRepo.getForDevice(DeviceId(deviceId), limit = None)).thenReturn(getResponse)
when(locationRepo.getForDevice(DeviceId(deviceId), limit = DefaultLocationLimit))
.thenReturn(getResponse)

val request: ListLocationsRequest = ListLocationsRequest(deviceId = deviceId)
lazy val result: Future[ListLocationsResponse] = adminService.listLocations(request)
Expand Down
Loading