Skip to content

Commit

Permalink
#1693 PR review update - typos etc
Browse files Browse the repository at this point in the history
  • Loading branch information
dk1844 committed Apr 6, 2022
1 parent b934958 commit 51ad013
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ package za.co.absa.enceladus.model.versionedModel

case class VersionedSummary(_id: String, latestVersion: Int)

case class VersionsList(_id: String, versions: Seq[Int])
case class VersionList(_id: String, versions: Seq[Int])
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ abstract class VersionedModelControllerV3[C <: VersionedModel with Product

@GetMapping(Array("/{name}"))
@ResponseStatus(HttpStatus.OK)
def getVersionsList(@PathVariable name: String): CompletableFuture[VersionsList] = {
def getVersionsList(@PathVariable name: String): CompletableFuture[VersionList] = {
versionedModelService.getAllVersionsValues(name) map {
case Some(entity) => entity
case None => throw notFound()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.mongodb.scala.model.Updates._
import org.mongodb.scala.model._
import org.mongodb.scala.result.UpdateResult
import za.co.absa.enceladus.model.menas._
import za.co.absa.enceladus.model.versionedModel.{VersionedModel, VersionedSummary, VersionsList}
import za.co.absa.enceladus.model.versionedModel.{VersionedModel, VersionedSummary, VersionList}

import scala.concurrent.Future
import scala.reflect.ClassTag
Expand Down Expand Up @@ -92,13 +92,13 @@ abstract class VersionedMongoRepository[C <: VersionedModel](mongoDb: MongoDatab
collection.aggregate[VersionedSummary](pipeline).headOption().map(_.map(_.latestVersion))
}

def getAllVersionsValues(name: String): Future[Option[VersionsList]] = {
def getAllVersionsValues(name: String): Future[Option[VersionList]] = {
val pipeline = Seq(
filter(getNameFilter(name)),
Aggregates.sort(Sorts.ascending("version")),
Aggregates.group("$name", Accumulators.push("versions", "$version")) // all versions into single array
)
collection.aggregate[VersionsList](pipeline).headOption().map(_.map(vlist => VersionsList("versions", vlist.versions)))
collection.aggregate[VersionList](pipeline).headOption().map(_.map(vlist => VersionList("versions", vlist.versions)))
}

def getAllVersions(name: String, inclDisabled: Boolean = false): Future[Seq[C]] = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ class DatasetService @Autowired()(datasetMongoRepository: DatasetMongoRepository
}

override def getUsedIn(name: String, version: Option[Int]): Future[UsedIn] = {
val existingEntityF = version match {
val existingEntity = version match {
case Some(version) => getVersion(name, version)
case None => getLatestVersion(name)
}

existingEntityF.flatMap {
existingEntity.flatMap {
case Some(_) => Future.successful(UsedIn()) // empty usedIn for existing datasets
case None => Future.failed(NotFoundException(s"Dataset '$name' in version ${version.getOrElse("any")}' nof found"))
case None => Future.failed(NotFoundException(s"Dataset '$name' in version ${version.getOrElse("any")}' not found"))
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import org.springframework.security.core.context.SecurityContextHolder
import org.springframework.security.core.userdetails.UserDetails
import za.co.absa.enceladus.model.{ModelVersion, Schema, UsedIn, Validation}
import za.co.absa.enceladus.model.menas._
import za.co.absa.enceladus.model.versionedModel.{VersionedModel, VersionedSummary, VersionsList}
import za.co.absa.enceladus.model.versionedModel.{VersionedModel, VersionedSummary, VersionList}
import za.co.absa.enceladus.rest_api.exceptions._
import za.co.absa.enceladus.rest_api.repositories.VersionedMongoRepository
import za.co.absa.enceladus.model.menas.audit._
Expand Down Expand Up @@ -57,7 +57,7 @@ abstract class VersionedModelService[C <: VersionedModel with Product with Audit
versionedMongoRepository.getAllVersions(name)
}

def getAllVersionsValues(name: String): Future[Option[VersionsList]] = {
def getAllVersionsValues(name: String): Future[Option[VersionList]] = {
versionedMongoRepository.getAllVersionsValues(name)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ package object implicits {
classOf[Run], classOf[Schema], classOf[SchemaField], classOf[SplineReference], classOf[RunSummary],
classOf[RunDatasetNameGroupedSummary], classOf[RunDatasetVersionGroupedSummary],
classOf[RuntimeConfig], classOf[OozieSchedule], classOf[OozieScheduleInstance], classOf[ScheduleTiming], classOf[DataFormat],
classOf[UserInfo], classOf[VersionedSummary], classOf[VersionsList], classOf[MenasAttachment], classOf[MenasReference],
classOf[UserInfo], classOf[VersionedSummary], classOf[VersionList], classOf[MenasAttachment], classOf[MenasReference],
classOf[PropertyDefinition], classOf[PropertyType], classOf[Essentiality],
classOf[LandingPageInformation], classOf[TodaysRunsStatistics],
classOf[DataFrameFilter]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import za.co.absa.enceladus.model.dataFrameFilter._
import za.co.absa.enceladus.model.properties.essentiality.Essentiality
import za.co.absa.enceladus.model.properties.propertyType.EnumPropertyType
import za.co.absa.enceladus.model.test.factories.{DatasetFactory, PropertyDefinitionFactory, SchemaFactory}
import za.co.absa.enceladus.model.versionedModel.VersionsList
import za.co.absa.enceladus.model.versionedModel.VersionList
import za.co.absa.enceladus.model.{Dataset, UsedIn, Validation}
import za.co.absa.enceladus.rest_api.integration.controllers.{BaseRestApiTestV3, toExpected}
import za.co.absa.enceladus.rest_api.integration.fixtures._
Expand Down Expand Up @@ -129,9 +129,9 @@ class DatasetControllerV3IntegrationSuite extends BaseRestApiTestV3 with BeforeA
parent = Some(DatasetFactory.toParent(datasetV1)))
datasetFixture.add(datasetV1, datasetV2)

val response = sendGet[VersionsList](s"$apiUrl/datasetA")
val response = sendGet[VersionList](s"$apiUrl/datasetA")
assertOk(response)
assert(response.getBody == VersionsList("versions", Seq(1, 2)))
assert(response.getBody == VersionList("versions", Seq(1, 2)))
}
}

Expand Down

0 comments on commit 51ad013

Please sign in to comment.