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

Jump to bottom

refactor: Use KnoraRepo instead of MessageRelay in ResourcesResponderV2 #2927

Merged
merged 2 commits into from
Nov 14, 2023
Merged

refactor: Use KnoraRepo instead of MessageRelay in ResourcesResponderV2 #2927

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0563cbe
refactor: Use KnoraRepo instead of MessageRelay in ResourcesResponderV2
seakayone Nov 14, 2023
b424d48
Merge branch 'main' into refactor/use-KnoraProjectRepo-in-ResourcesRe…
seakayone Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package org.knora.webapi.responders.v2

import com.typesafe.scalalogging.LazyLogging
import zio.ZIO
import zio.*

import java.time.Instant
Expand Down Expand Up @@ -54,6 +53,7 @@ import org.knora.webapi.messages.v2.responder.valuemessages.*
import org.knora.webapi.responders.IriLocker
import org.knora.webapi.responders.IriService
import org.knora.webapi.responders.Responder
import org.knora.webapi.slice.admin.domain.service.KnoraProjectRepo
import org.knora.webapi.slice.admin.domain.service.ProjectADMService
import org.knora.webapi.slice.ontology.domain.model.Cardinality.AtLeastOne
import org.knora.webapi.slice.ontology.domain.model.Cardinality.ExactlyOne
Expand All @@ -77,6 +77,7 @@ final case class ResourcesResponderV2Live(
standoffTagUtilV2: StandoffTagUtilV2,
resourceUtilV2: ResourceUtilV2,
permissionUtilADM: PermissionUtilADM,
projectRepo: KnoraProjectRepo,
implicit val stringFormatter: StringFormatter
) extends ResourcesResponderV2
with MessageHandler
Expand Down Expand Up @@ -2418,11 +2419,10 @@ final case class ResourcesResponderV2Live(
.fromString(projectResourceHistoryEventsGetRequest.projectIri)
.toZIO
.mapError(e => BadRequestException(e.getMessage))
projectInfoResponse <- messageRelay.ask[ProjectGetResponseADM](ProjectGetRequestADM(projectId))
_ <- projectRepo.findById(projectId).someOrFail(NotFoundException(s"Project ${projectId.value.value} not found"))

// Do a SELECT prequery to get the IRIs of the resources that belong to the project.
prequery = sparql.v2.txt
.getAllResourcesInProjectPrequery(projectIri = projectInfoResponse.project.id)
prequery = sparql.v2.txt.getAllResourcesInProjectPrequery(projectId.value.value)
sparqlSelectResponse <- triplestore.query(Select(prequery))
mainResourceIris = sparqlSelectResponse.results.bindings.map(_.rowMap("resource"))
// For each resource IRI return history events
Expand Down Expand Up @@ -2861,8 +2861,7 @@ final case class ResourcesResponderV2Live(
object ResourcesResponderV2Live {

val layer: URLayer[
StringFormatter & PermissionUtilADM & ResourceUtilV2 & StandoffTagUtilV2 & ConstructResponseUtilV2 &
TriplestoreService & MessageRelay & IriService & AppConfig,
AppConfig & ConstructResponseUtilV2 & IriService & KnoraProjectRepo & MessageRelay & PermissionUtilADM & ResourceUtilV2 & StandoffTagUtilV2 & StringFormatter & TriplestoreService,
ResourcesResponderV2
] = ZLayer.fromZIO {
for {
Expand All @@ -2874,8 +2873,9 @@ object ResourcesResponderV2Live {
su <- ZIO.service[StandoffTagUtilV2]
ru <- ZIO.service[ResourceUtilV2]
pu <- ZIO.service[PermissionUtilADM]
pr <- ZIO.service[KnoraProjectRepo]
sf <- ZIO.service[StringFormatter]
handler <- mr.subscribe(ResourcesResponderV2Live(config, iriS, mr, ts, cu, su, ru, pu, sf))
handler <- mr.subscribe(ResourcesResponderV2Live(config, iriS, mr, ts, cu, su, ru, pu, pr, sf))
} yield handler
}
}