Transformations: Added query and update tests

Author: Stanislav Lukeš

src/main/scala/com/cognite/sdk/scala/v1/resources/transformations.scala

@@ -137,9 +137,8 @@ class Transformations[F[_]: Monad](val requestSession: RequestSession[F])
 
   def queryOne[I](
       q: String
-  )(implicit itemDecoder: Decoder[I]): F[I] = {
+  )(implicit itemDecoder: Decoder[I]): F[I] =
     query[I](q, limit = 1).map(_.results.items.head)
-  }
 }
 
 object Transformations {

src/main/scala/com/cognite/sdk/scala/v1/transformations.scala

@@ -103,8 +103,8 @@ final case class StandardTransformConfigUpdate(
   destination: Option[NonNullableSetter[Json]] = None,
   conflictMode: Option[NonNullableSetter[String]] = None,
   query: Option[NonNullableSetter[String]] = None,
-  //sourceOidcCredentials: Option[Setter[FlatOidcCredentialsUpdate]] = None,
-  //destinationOidcCredentials: Option[Setter[FlatOidcCredentialsUpdate]] = None,
+  sourceOidcCredentials: Option[Setter[FlatOidcCredentialsUpdate]] = None,
+  destinationOidcCredentials: Option[Setter[FlatOidcCredentialsUpdate]] = None,
   sourceApiKey: Option[Setter[String]] = None,
   destinationApiKey: Option[Setter[String]] = None,
   isPublic: Option[NonNullableSetter[Boolean]] = None
@@ -118,6 +118,10 @@ final case class FlatOidcCredentialsUpdate(
   cdfProjectName: Option[String] = None
 )
 
+object FlatOidcCredentialsUpdate {
+  implicit val encoder: Encoder[FlatOidcCredentialsUpdate] = deriveEncoder[FlatOidcCredentialsUpdate]
+}
+
 final case class QueryQuery(query: String)
 
 final case class QueryResponse[T](

src/test/scala/com/cognite/sdk/scala/common/WritableBehaviors.scala

@@ -279,6 +279,21 @@ trait WritableBehaviors extends Matchers with OptionValues { this: AnyFlatSpec =
       maybeDeletable.map(_.deleteByIds(updatedItems.map(_.id)))
     }
 
+  def updatableByBothIds[R <: ToCreate[W] with ToUpdate[U] with WithId[Long] with WithExternalId, W, U](
+    resource: Create[R, W, Id] with UpdateById[R, U, Id] with UpdateByExternalId[R, U, Id] with RetrieveByIds[R, Id],
+    maybeDeletable: Option[DeleteByIds[Id, Long] with DeleteByExternalIds[Id]],
+    itemsToCreate: Seq[R],
+    updatesToMake: Seq[U],
+    expectedBehaviors: (Seq[R], Seq[R]) => Unit
+  ): Unit = {
+    val externalIdUpdates = updatesToMake.zip(itemsToCreate).map {
+      case (u, c) => c.externalId.get -> u
+    }.toMap
+    updatableById(resource, maybeDeletable, itemsToCreate, updatesToMake, expectedBehaviors)
+    updatableByExternalId(resource, maybeDeletable, itemsToCreate, externalIdUpdates, expectedBehaviors)
+  }
+
+
   def deletableWithIgnoreUnknownIds[R <: ToCreate[W] with WithId[Long], W, PrimitiveId](
       writable: Create[R, W, Id]
         with DeleteByIdsWithIgnoreUnknownIds[Id, Long]

src/test/scala/com/cognite/sdk/scala/v1/TransformationsTest.scala

@@ -115,24 +115,36 @@ class TransformationsTest extends SdkTestSpec with ReadBehaviours with WritableB
     }
   )
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  it should behave like updatableByBothIds(
+    greenfieldClient.transformations,
+    Some(greenfieldClient.transformations),
+    transformsToCreate,
+    Seq(
+      StandardTransformConfigUpdate(name = Some(SetValue("scala-sdk-update-1-1"))),
+      StandardTransformConfigUpdate(
+        destination = Some(SetValue(Json.obj("type" -> Json.fromString("datapoints")))),
+        query = Some(SetValue("select 2")),
+        sourceApiKey = Some(SetValue(greenfieldAuth.asInstanceOf[ApiKeyAuth].apiKey)),
+        isPublic = Some(SetValue(true))
+      )
+    ),
+    (read: Seq[TransformConfigRead], updated: Seq[TransformConfigRead]) => {
+      assert(read.size == updated.size)
+      assert(read.size == transformsToCreate.size)
+      assert(read.size == transformUpdates.size)
+      assert(updated.map(_.name) == List("scala-sdk-update-1-1", "scala-sdk-read-example-2"))
+      assert(updated(1).isPublic)
+      assert(!read(1).isPublic)
+      assert(updated(1).hasSourceApiKey)
+      assert(updated(1).query == "select 2")
+      ()
+    }
+  )
 
   case class RawAggregationResponse(average: Double)
 
   it should "query average" in {
+    greenfieldClient.transformations.list().compile.toList
     val response = greenfieldClient.transformations.queryOne[RawAggregationResponse](
       "select avg(` V1 vcross (m/s)`) as average from ORCA.VAN_net"
     )
@@ -153,42 +165,4 @@ class TransformationsTest extends SdkTestSpec with ReadBehaviours with WritableB
     println(response)
     assert(response.nonEmpty)
   }
-
-//  it should behave like updatableById(
-//    client.assets,
-//    Some(client.assets),
-//    assetsToCreate,
-//    Seq(
-//      AssetUpdate(name = Some(SetValue("scala-sdk-update-1-1"))),
-//      AssetUpdate(name = Some(SetValue("scala-sdk-update-2-1")), dataSetId = Some(SetNull()))
-//    ),
-//    (readAssets: Seq[Asset], updatedAssets: Seq[Asset]) => {
-//      assert(assetsToCreate.size == assetUpdates.size)
-//      assert(readAssets.size == assetsToCreate.size)
-//      assert(updatedAssets.size == assetUpdates.size)
-//      assert(updatedAssets.zip(readAssets).forall { case (updated, read) => updated.name === s"${read.name}-1" })
-//      assert(readAssets)
-//      assert(List(None, None) === dataSets)
-//      ()
-//    }
-//  )
-//
-//  it should behave like updatableByExternalId(
-//    client.assets,
-//    Some(client.assets),
-//    Seq(
-//      Asset(name = "update-1", externalId = Some("update-1-externalId")),
-//      Asset(name = "update-2", externalId = Some("update-2-externalId"))),
-//    Map("update-1-externalId" -> AssetUpdate(name = Some(SetValue("update-1-1"))),
-//      "update-2-externalId" -> AssetUpdate(name = Some(SetValue("update-2-1")))),
-//    (readAssets: Seq[Asset], updatedAssets: Seq[Asset]) => {
-//      assert(assetsToCreate.size == assetUpdates.size)
-//      assert(readAssets.size == assetsToCreate.size)
-//      assert(updatedAssets.size == assetUpdates.size)
-//      assert(updatedAssets.zip(readAssets).forall { case (updated, read) =>  updated.name === s"${read.name}-1" })
-//      assert(updatedAssets.zip(readAssets).forall { case (updated, read) => updated.externalId === read.externalId })
-//      ()
-//    }
-//  )
-
 }