fix the request

Author: mlachkar

modules/infra/src/main/scala/scaladex/infra/sql/ArtifactDependencyTable.scala

@@ -67,17 +67,17 @@ object ArtifactDependencyTable {
   val computeProjectDependency: Query0[ProjectDependency] =
     selectRequest(
       fullJoin,
-      "DISTINCT d.organization, d.repository, t.organization, t.repository",
+      "d.organization, d.repository, t.organization, t.repository",
       groupBy = Seq("d.organization", "d.repository", "t.organization", "t.repository")
     )
 
   val computeReleaseDependency: Query0[ReleaseDependency] = {
-    val sourceReleaseFields = ReleaseTable.fields.map("d." + _)
-    val targetReleaseFields = ReleaseTable.fields.map("t." + _)
+    val sourceReleaseFields = ReleaseTable.primaryKeys.map("d." + _)
+    val targetReleaseFields = ReleaseTable.primaryKeys.map("t." + _)
     selectRequest(
       fullJoin,
-      s"DISTINCT ${sourceReleaseFields.mkString(", ")}, ${targetReleaseFields.mkString(", ")}, d.scope",
-      groupBy = (sourceReleaseFields ++ targetReleaseFields) :+ "d.scope"
+      s"${sourceReleaseFields.mkString(", ")}, MIN(d.release_date), ${targetReleaseFields.mkString(", ")}, MIN(t.release_date), d.scope",
+      groupBy = (sourceReleaseFields ++ targetReleaseFields) ++ Seq("d.scope")
     )
   }
 

modules/infra/src/main/scala/scaladex/infra/sql/ReleaseTable.scala

@@ -7,15 +7,15 @@ import scaladex.infra.sql.DoobieUtils.insertOrUpdateRequest
 
 object ReleaseTable {
   private val table: String = "releases"
-  private val primaryKeys: Seq[String] =
+  val primaryKeys: Seq[String] =
     Seq(
       "organization",
       "repository",
       "platform",
       "language_version",
       "version"
     )
-  val fields: Seq[String] =
+  private val fields: Seq[String] =
     primaryKeys ++ Seq(
       "release_date"
     )

modules/server/src/it/scala/scaladex/RelevanceTest.scala

@@ -14,11 +14,11 @@ import cats.effect.ContextShift
 import scala.concurrent.ExecutionContext
 import scaladex.core.model.Project
 import scaladex.core.model.search.SearchParams
-import scaladex.infra.{ElasticsearchEngine, FilesystemStorage, FlywayMigration, SqlDatabase}
+import scaladex.infra.{ElasticsearchEngine, FilesystemStorage, SqlDatabase}
 import scaladex.infra.sql.DoobieUtils
 import scaladex.server.service.SearchSynchronizer
 import scaladex.core.model.search.PageParams
-import scaladex.server.service.ProjectDependenciesUpdater
+import scaladex.server.service.DependencyUpdater
 
 class RelevanceTest extends TestKit(ActorSystem("SbtActorTest")) with AsyncFunSuiteLike with BeforeAndAfterAll {
 
@@ -31,18 +31,17 @@ class RelevanceTest extends TestKit(ActorSystem("SbtActorTest")) with AsyncFunSu
     implicit val cs: ContextShift[IO] = IO.contextShift(ExecutionContext.global)
     val datasource = DoobieUtils.getHikariDataSource(config.database)
     val transactor = DoobieUtils.transactor(datasource)
-    val flyway = FlywayMigration(datasource)
     transactor
       .use { xa =>
-        val database = new SqlDatabase(xa)
+        val database = new SqlDatabase(datasource, xa)
         val filesystem = FilesystemStorage(config.filesystem)
 
         val searchSync = new SearchSynchronizer(database, searchEngine)
-        val projectDependenciesUpdater = new ProjectDependenciesUpdater(database)
+        val projectDependenciesUpdater = new DependencyUpdater(database)
 
         IO.fromFuture(IO {
           for {
-            _ <- Init.run(database, filesystem, flyway)
+            _ <- Init.run(database, filesystem)
             _ <- searchEngine.init(true)
             _ <- projectDependenciesUpdater.updateAll()
             _ <- searchSync.syncAll()

modules/server/src/main/scala/scaladex/server/Server.scala

@@ -54,12 +54,13 @@ object Server extends LazyLogging {
       val searchEngine = ElasticsearchEngine.open(config.elasticsearch)
 
       val resources = {
-        val datasource = DoobieUtils.getHikariDataSource(config.database)
+        val datasourceWeb = DoobieUtils.getHikariDataSource(config.database)
+        val datasourceScheduler = DoobieUtils.getHikariDataSource(config.database)
         for {
-          webPool <- DoobieUtils.transactor(datasource)
-          schedulerPool <- DoobieUtils.transactor(datasource)
+          webPool <- DoobieUtils.transactor(datasourceWeb)
+          schedulerPool <- DoobieUtils.transactor(datasourceScheduler)
           publishPool <- ExecutionContexts.fixedThreadPool[IO](8)
-        } yield (webPool, schedulerPool, publishPool, datasource)
+        } yield (webPool, schedulerPool, publishPool, datasourceWeb)
       }
       resources
         .use {

modules/server/src/main/scala/scaladex/server/service/ProjectDependenciesUpdater.scala renamed to modules/server/src/main/scala/scaladex/server/service/DependencyUpdater.scala

@@ -7,7 +7,7 @@ import com.typesafe.scalalogging.LazyLogging
 import scaladex.core.service.SchedulerDatabase
 import scaladex.core.util.ScalaExtensions._
 
-class ProjectDependenciesUpdater(database: SchedulerDatabase)(implicit ec: ExecutionContext) extends LazyLogging {
+class DependencyUpdater(database: SchedulerDatabase)(implicit ec: ExecutionContext) extends LazyLogging {
 
   def updateAll(): Future[Unit] =
     for {

modules/server/src/main/scala/scaladex/server/service/SchedulerService.scala

@@ -22,7 +22,7 @@ class SchedulerService(
 ) extends LazyLogging {
   implicit val ec: ExecutionContextExecutor = ExecutionContext.global
   val searchSynchronizer = new SearchSynchronizer(database, searchEngine)
-  val projectDependenciesUpdater = new ProjectDependenciesUpdater(database)
+  val projectDependenciesUpdater = new DependencyUpdater(database)
 
   private val schedulers = Seq(
     Scheduler("update-dependency-tables", projectDependenciesUpdater.updateAll, 1.hour),