Merge pull request #816 from adpi2/naming-810

Some renaming from #810

core/shared/src/main/scala/scaladex/core/service/SchedulerDatabase.scala

@@ -22,5 +22,5 @@ trait SchedulerDatabase extends WebDatabase {
   def updateProjectCreationDate(ref: Project.Reference, creationDate: Instant): Future[Unit]
   def insertProjectDependencies(projectDependencies: Seq[ProjectDependency]): Future[Int]
   def countInverseProjectDependencies(projectRef: Project.Reference): Future[Int]
-  def deleteMovedProjectFromProjectDependencyTable(): Future[Unit]
+  def deleteDependenciesOfMovedProject(): Future[Unit]
 }

core/shared/src/test/scala/scaladex/core/model/PlatformTests.scala

@@ -54,9 +54,8 @@ class PlatformTests extends AsyncFunSpec with Matchers with OptionValues with Ta
     PlatformType.ofName("Js").value shouldBe PlatformType.Js
     PlatformType.ofName("Jvm").value shouldBe PlatformType.Jvm
   }
-  it("Should encode and parse a ScalaTarget") {
-    val st = ScalaJs(ScalaVersion.`2.10`, MinorBinary(0, 6))
-    println(s"st.encode = ${st.encode}")
-    assert(parse(st.encode).get == st)
+  it("Should encode and parse a Scala.js platform") {
+    val platform = ScalaJs(ScalaVersion.`2.10`, MinorBinary(0, 6))
+    assert(parse(platform.encode).get == platform)
   }
 }

core/shared/src/test/scala/scaladex/core/test/InMemoryDatabase.scala

@@ -91,5 +91,5 @@ class InMemoryDatabase extends SchedulerDatabase {
   override def countInverseProjectDependencies(projectRef: Project.Reference): Future[Int] = ???
 
   override def updataArtifacts(artifacts: Seq[Artifact], newRef: Project.Reference): Future[Int] = ???
-  override def deleteMovedProjectFromProjectDependencyTable(): scala.concurrent.Future[Unit] = ???
+  override def deleteDependenciesOfMovedProject(): scala.concurrent.Future[Unit] = ???
 }

infra/src/main/scala/scaladex/infra/storage/sql/SqlDatabase.scala

@@ -137,11 +137,11 @@ class SqlDatabase(conf: DatabaseConfig, xa: doobie.Transactor[IO]) extends Sched
   override def countInverseProjectDependencies(projectRef: Project.Reference): Future[Int] =
     run(ProjectDependenciesTable.countInverseDependencies.unique(projectRef))
 
-  override def deleteMovedProjectFromProjectDependencyTable(): Future[Unit] =
+  override def deleteDependenciesOfMovedProject(): Future[Unit] =
     for {
       moved <- run(ProjectTable.selectProjectByGithubStatus.to[List]("Moved"))
-      _ <- run(ProjectDependenciesTable.deleteSourceProject.updateMany(moved))
-      _ <- run(ProjectDependenciesTable.deleteTargetProject.updateMany(moved))
+      _ <- run(ProjectDependenciesTable.deleteBySource.updateMany(moved))
+      _ <- run(ProjectDependenciesTable.deleteByTarget.updateMany(moved))
     } yield ()
 
   override def computeAllProjectsCreationDates(): Future[Seq[(Instant, Project.Reference)]] =

infra/src/main/scala/scaladex/infra/storage/sql/tables/ProjectDependenciesTable.scala

@@ -19,10 +19,10 @@ object ProjectDependenciesTable {
   val countInverseDependencies: Query[Project.Reference, Int] =
     selectRequest(table, Seq("COUNT(*)"), targetFields)
 
-  val deleteSourceProject: Update[Project.Reference] =
+  val deleteBySource: Update[Project.Reference] =
     deleteRequest(table, sourceFields)
 
-  val deleteTargetProject: Update[Project.Reference] =
+  val deleteByTarget: Update[Project.Reference] =
     deleteRequest(table, targetFields)
 
 }

infra/src/test/scala/scaladex/infra/storage/sql/SqlDatabaseTests.scala

@@ -213,7 +213,7 @@ class SqlDatabaseTests extends AsyncFunSpec with BaseDatabaseSuite with Matchers
         Scalafix.githubInfo,
         GithubStatus.Moved(now, Project.Reference.from("scala", "fix"))
       )
-      _ <- database.deleteMovedProjectFromProjectDependencyTable()
+      _ <- database.deleteDependenciesOfMovedProject()
       scalafixInverseDeps <- database.countInverseProjectDependencies(Scalafix.reference)
       catsInverseDeps <- database.countInverseProjectDependencies(Cats.reference)
     } yield {

infra/src/test/scala/scaladex/infra/storage/sql/tables/ProjectDependenciesTableTests.scala

@@ -7,5 +7,6 @@ import scaladex.infra.storage.sql.tables.ProjectDependenciesTable
 
 class ProjectDependenciesTableTests extends AnyFunSpec with BaseDatabaseSuite with Matchers {
   it("check insertOrUpdate")(check(ProjectDependenciesTable.insertOrUpdate))
-  it("check deleteSourceProject")(check(ProjectDependenciesTable.deleteSourceProject))
+  it("check deleteBySource")(check(ProjectDependenciesTable.deleteBySource))
+  it("check deleteByTarget")(check(ProjectDependenciesTable.deleteByTarget))
 }

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

@@ -42,16 +42,15 @@ class SchedulerService(database: SchedulerDatabase, searchEngine: SearchEngine,
         .computeProjectDependencies()
         .mapFailure(e =>
           new Exception(
-            s"not able to getAllProjectDependencies because of ${e.getMessage}"
+            s"Failed to compute project dependencies because of ${e.getMessage}"
           )
         )
-      _ = println(s" I m here!")
-      _ <- database.deleteMovedProjectFromProjectDependencyTable()
+      _ <- database.deleteDependenciesOfMovedProject()
       _ <- database
         .insertProjectDependencies(projectWithDependencies)
         .mapFailure(e =>
           new Exception(
-            s"not able to insertProjectDependencies because of ${e.getMessage}"
+            s"Failed to insert project dependencies because of ${e.getMessage}"
           )
         )