Skip to content

Commit acd97c8

Browse files
DianaFairekaradietz
authored andcommitted
fix build
1 parent 751cb30 commit acd97c8

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

service/src/main/kotlin/app/cash/backfila/dashboard/SearchBackfillRunsAction.kt

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@ import app.cash.backfila.service.persistence.DbBackfillRun
77
import app.cash.backfila.service.persistence.DbRegisteredBackfill
88
import app.cash.backfila.service.persistence.RegisteredBackfillQuery
99
import app.cash.backfila.service.persistence.ServiceQuery
10-
import com.sksamuel.hoplite.Undefined.path
1110
import javax.inject.Inject
1211
import misk.exceptions.BadRequestException
13-
import misk.hibernate.*
12+
import misk.hibernate.Id
13+
import misk.hibernate.Query
14+
import misk.hibernate.Session
15+
import misk.hibernate.Transacter
16+
import misk.hibernate.constraint
17+
import misk.hibernate.newQuery
1418
import misk.hibernate.pagination.Offset
1519
import misk.hibernate.pagination.Page
1620
import misk.hibernate.pagination.idDescPaginator
@@ -22,9 +26,7 @@ import misk.web.QueryParam
2226
import misk.web.ResponseContentType
2327
import misk.web.actions.WebAction
2428
import misk.web.mediatype.MediaTypes
25-
import org.hibernate.criterion.Restrictions.like
2629
import wisp.logging.getLogger
27-
import javax.persistence.criteria.Root
2830

2931
data class SearchBackfillRunsResponse(
3032
val running_backfills: List<UiBackfillRun>,
@@ -177,23 +179,20 @@ class SearchBackfillRunsAction @Inject constructor(
177179
private fun BackfillRunQuery.filterByBackfillNameIfPresent(backfillName: String?): BackfillRunQuery {
178180
return if (backfillName.isNullOrEmpty()) {
179181
this
180-
}
181-
else {
182-
this.constraint { backfillRunRoot ->
183-
val registeredBackfillJoin = backfillRunRoot.join<DbBackfillRun, DbRegisteredBackfill>("registered_backfill")
184-
like(registeredBackfillJoin.get("name"), "%${backfillName}%")
185-
}
182+
} else {
183+
this.constraint { backfillRunRoot ->
184+
val registeredBackfillJoin = backfillRunRoot.join<DbBackfillRun, DbRegisteredBackfill>("registered_backfill")
185+
like(registeredBackfillJoin.get("name"), "%$backfillName%")
186+
}
186187
}
187188
}
188189

189-
190190
private fun BackfillRunQuery.filterByAuthorIfPresent(author: String?): BackfillRunQuery {
191191
return if (author.isNullOrEmpty()) {
192192
this
193-
}
194-
else {
193+
} else {
195194
this.constraint { backfillRunRoot ->
196-
like(backfillRunRoot.get("created_by_user"), "%${author}%")
195+
like(backfillRunRoot.get("created_by_user"), "%$author%")
197196
}
198197
}
199198
}

service/src/test/kotlin/app/cash/backfila/actions/SearchBackfillRunsActionTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ class SearchBackfillRunsActionTest {
258258
}
259259
}
260260

261-
262261
@Test
263262
fun `fuzzy search`() {
264263
scope.fakeCaller(user = "molly.baker") {
@@ -322,7 +321,7 @@ class SearchBackfillRunsActionTest {
322321
pagination_token = null,
323322
backfill_name = "Sandwich",
324323
created_by_user = "baker",
325-
)
324+
)
326325
assertThat(backfillSearchResults.paused_backfills).hasSize(2)
327326

328327
backfillSearchResults = searchBackfillRunsAction.searchBackfillRuns(

0 commit comments

Comments
 (0)