finos#1052 using the new basket provider and deleting old csv static …

…loader
ScottLogic · Jan 4, 2024 · 166d52a · 166d52a
1 parent cddecb2
commit 166d52a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 166 deletions.
diff --git a/example/basket/src/main/scala/org/finos/vuu/core/module/basket/csv/CsvStaticLoader.scala b/example/basket/src/main/scala/org/finos/vuu/core/module/basket/csv/CsvStaticLoader.scala
diff --git a/.../src/main/scala/org/finos/vuu/core/module/basket/provider/BasketConstituentProvider.scala b/.../src/main/scala/org/finos/vuu/core/module/basket/provider/BasketConstituentProvider.scala
@@ -4,25 +4,26 @@ import org.finos.toolbox.lifecycle.LifecycleContainer
 import org.finos.toolbox.thread.RunOnceLifeCycleRunner
 import org.finos.toolbox.time.Clock
 import org.finos.vuu.core.module.basket.BasketConstants
-import org.finos.vuu.core.module.basket.csv.CsvStaticLoader
+import org.finos.vuu.core.module.basket.csv.BasketLoader
 import org.finos.vuu.core.table.{DataTable, RowWithData}
 import org.finos.vuu.provider.DefaultProvider
 
 class BasketConstituentProvider(val table: DataTable)(implicit lifecycle: LifecycleContainer, clock: Clock) extends DefaultProvider {
 
   private val runner = new RunOnceLifeCycleRunner("BasketConstituentProvider", runOnce)
+  private val basketLoader = new BasketLoader()
 
   lifecycle(this).dependsOn(runner)
 
   import org.finos.vuu.core.module.basket.BasketModule.BasketConstituentColumnNames._
 
   def runOnce(): Unit = {
-    val baskets = CsvStaticLoader.load
+    val baskets = basketLoader.loadBasketIds()
     baskets.foreach(basketId => updateBasketConstituents(basketId))
   }
 
   def updateBasketConstituents(basketId: String): Unit = {
-    val list = CsvStaticLoader.loadConstituent(basketId)
+    val list = basketLoader.loadConstituents(basketId)
     list.foreach(row => {
 
       if (row.nonEmpty) {

diff --git a/example/basket/src/main/scala/org/finos/vuu/core/module/basket/provider/BasketProvider.scala b/example/basket/src/main/scala/org/finos/vuu/core/module/basket/provider/BasketProvider.scala
@@ -4,17 +4,18 @@ import org.finos.toolbox.lifecycle.LifecycleContainer
 import org.finos.toolbox.thread.RunOnceLifeCycleRunner
 import org.finos.toolbox.time.Clock
 import org.finos.vuu.core.module.basket.BasketModule.BasketColumnNames._
-import org.finos.vuu.core.module.basket.csv.CsvStaticLoader
+import org.finos.vuu.core.module.basket.csv.BasketLoader
 import org.finos.vuu.core.table.{DataTable, RowWithData}
 import org.finos.vuu.provider.DefaultProvider
 
 class BasketProvider(val table: DataTable)(implicit lifecycle: LifecycleContainer, clock: Clock) extends DefaultProvider {
 
   private val runner = new RunOnceLifeCycleRunner("BasketProvider", runOnce)
+  private val basketLoader = new BasketLoader()
 
   lifecycle(this).dependsOn(runner)
   def runOnce(): Unit = {
-    val data = CsvStaticLoader.load
+    val data = basketLoader.loadBasketIds()
 
     data.foreach(id => {
       table.processUpdate(id, RowWithData(id, Map(
@@ -23,7 +24,5 @@ class BasketProvider(val table: DataTable)(implicit lifecycle: LifecycleContaine
       )), clock.now())
     })
   }
-
-
   override val lifecycleId: String = "org.finos.vuu.core.module.basket.provider.BasketProvider"
 }
diff --git a/example/basket/src/test/scala/org/finos/vuu/csv/CsvStaticLoaderTests.scala b/example/basket/src/test/scala/org/finos/vuu/csv/CsvStaticLoaderTests.scala