#1702 add visibility to join table def

tanjjj · tanjjj · commit 5ddafa016eab · 2025-09-05T12:22:06.000+01:00
diff --git a/example/order/src/main/scala/org/finos/vuu/core/module/simul/SimulationModule.scala b/example/order/src/main/scala/org/finos/vuu/core/module/simul/SimulationModule.scala
@@ -237,7 +237,6 @@ object SimulationModule extends DefaultModule {
       .addJoinTable(tableDefs =>
         JoinTableDef(
           name = "orderEntryPrices",
-          visibility = Public,
           baseTable = tableDefs.get(NAME, "orderEntry"),
           joinColumns = Columns.allFrom(tableDefs.get(NAME, "orderEntry")) ++ Columns.allFromExcept(tableDefs.get(PriceModule.NAME, "prices"), "ric"),
           joins =
@@ -251,7 +250,6 @@ object SimulationModule extends DefaultModule {
       .addJoinTable(tableDefs =>
         JoinTableDef(
           name = "instrumentPrices",
-          visibility = Public,
           baseTable = tableDefs.get(NAME, "instruments"),
           joinColumns = Columns.allFrom(tableDefs.get(NAME, "instruments")) ++ Columns.allFromExcept(tableDefs.get(PriceModule.NAME, "prices"), "ric"),
           joins =
@@ -265,7 +263,6 @@ object SimulationModule extends DefaultModule {
       .addJoinTable(tableDefs =>
         JoinTableDef(
           name = "ordersPrices",
-          visibility = Public,
           baseTable = tableDefs.get(NAME, "orders"),
           joinColumns = Columns.allFrom(tableDefs.get(NAME, "orders")) ++ Columns.allFromExcept(tableDefs.get(PriceModule.NAME, "prices"), "ric"),
           joins =
diff --git a/vuu/src/main/scala/org/finos/vuu/api/TableDef.scala b/vuu/src/main/scala/org/finos/vuu/api/TableDef.scala
@@ -257,6 +257,11 @@ case class JoinTableDef(
   }
 }
 
+object JoinTableDef {
+  def apply(name: String, baseTable: TableDef, joinColumns: Array[Column], links: VisualLinks, joinFields: Seq[String], joins: JoinTo): JoinTableDef = {
+    new JoinTableDef(name, Public, baseTable, joinColumns, links, joinFields, joins)
+  }
+}
 //case class JoinTableDef(override val name: String, left: TableDef, right: TableDef, joinDef: JoinDefinition, joinColumns: Array[Column]) extends TableDef(name, joinDef.leftKeyField, joinColumns){
 //  def getJoinDefinitionColumns():Array[Column] = {
 //     Array(columnForName(left.keyField), columnForName(joinDef.rightKeyField))
diff --git a/vuu/src/test/scala/org/finos/vuu/core/module/TestModule2.scala b/vuu/src/test/scala/org/finos/vuu/core/module/TestModule2.scala
@@ -55,7 +55,6 @@ object TestModule2 extends DefaultModule {
         .addJoinTable( tableDefs =>
           JoinTableDef(
             name = "instrumentPrices",
-            visibility = Public,
             baseTable = tableDefs.get("TEST", "instruments"),
             joinColumns = Columns.allFrom(tableDefs.get("TEST", "instruments")) ++
                           Columns.allFromExcept(tableDefs.get("TEST", "prices"), "ric"),
diff --git a/vuu/src/test/scala/org/finos/vuu/core/module/modulefrommodule/JoinModule.scala b/vuu/src/test/scala/org/finos/vuu/core/module/modulefrommodule/JoinModule.scala
@@ -2,7 +2,7 @@ package org.finos.vuu.core.module.modulefrommodule
 
 import org.finos.toolbox.lifecycle.LifecycleContainer
 import org.finos.toolbox.time.Clock
-import org.finos.vuu.api.{JoinSpec, JoinTableDef, JoinTo, LeftOuterJoin, Public, VisualLinks}
+import org.finos.vuu.api.{JoinSpec, JoinTableDef, JoinTo, LeftOuterJoin, VisualLinks}
 import org.finos.vuu.core.module.{ModuleFactory, TableDefContainer, ViewServerModule}
 import org.finos.vuu.core.table.Columns
 
@@ -16,7 +16,6 @@ object JoinModule {
         tableDefs =>
           JoinTableDef(
             name = "instrumentPrice",
-            visibility = Public,
             baseTable = tableDefs.get(Instrument.NAME, "instrument"),
             joinColumns = Columns.allFrom(tableDefs.get(Instrument.NAME, "instrument")) ++ Columns.allFromExcept(tableDefs.get(Price.NAME, "price"), "ric"),
             joins =
diff --git a/vuu/src/test/scala/org/finos/vuu/core/table/TableTestHelper.scala b/vuu/src/test/scala/org/finos/vuu/core/table/TableTestHelper.scala
@@ -43,7 +43,6 @@ object TableTestHelper {
 
     val joinDef = JoinTableDef(
       name = "orderPrices",
-      visibility = Public,
       baseTable = ordersDef,
       joinColumns = Columns.allFrom(ordersDef) ++ Columns.allFromExcept(pricesDef, "ric"),
       joins =
diff --git a/vuu/src/test/scala/org/finos/vuu/core/table/join/JoinTableTest.scala b/vuu/src/test/scala/org/finos/vuu/core/table/join/JoinTableTest.scala
@@ -64,7 +64,6 @@ class JoinTableTest extends AnyFeatureSpec with Matchers with ViewPortSetup {
 
       val joinDef = JoinTableDef(
         name = "orderPrices",
-        visibility = Public,
         baseTable = ordersDef,
         joinColumns = Columns.allFrom(ordersDef) ++ Columns.allFromExcept(pricesDef, "ric"),
         joins =
diff --git a/vuu/src/test/scala/org/finos/vuu/core/table/join/JoinsOfJoinsTableTest.scala b/vuu/src/test/scala/org/finos/vuu/core/table/join/JoinsOfJoinsTableTest.scala
@@ -56,7 +56,6 @@ class JoinsOfJoinsTableTest extends AnyFeatureSpec with Matchers with ViewPortSe
 
     val joinDef = JoinTableDef(
       name = "orderPrices",
-      visibility = Public,
       baseTable = ordersDef,
       joinColumns = Columns.allFrom(ordersDef) ++ Columns.allFromExcept(pricesDef, "ric"),
       joins =
@@ -152,7 +151,6 @@ class JoinsOfJoinsTableTest extends AnyFeatureSpec with Matchers with ViewPortSe
 
     val joinDef = JoinTableDef(
       name = "orderPrices",
-      visibility = Public,
       baseTable = ordersDef,
       joinColumns = Columns.allFrom(ordersDef) ++ Columns.allFromExcept(pricesDef, "ric"),
       joins =
@@ -258,7 +256,6 @@ class JoinsOfJoinsTableTest extends AnyFeatureSpec with Matchers with ViewPortSe
 
     val join1Def = JoinTableDef(
       name = "instrumentToCurrency",
-      visibility = Public,
       baseTable = instrumentDef,
       joinColumns = Columns.allFrom(instrumentDef) ++ Columns.allFromExcept(currencyDef, "currency"),
       joins =
@@ -272,7 +269,6 @@ class JoinsOfJoinsTableTest extends AnyFeatureSpec with Matchers with ViewPortSe
 
     val join2Def = JoinTableDef(
       name = "orderToInstrument",
-      visibility = Public,
       baseTable = ordersDef,
       joinColumns = Columns.allFrom(ordersDef) ++ Columns.allFromExcept(join1Def, "ric"),
       joins =
diff --git a/vuu/src/test/scala/org/finos/vuu/viewport/AbstractViewPortTestCase.scala b/vuu/src/test/scala/org/finos/vuu/viewport/AbstractViewPortTestCase.scala
@@ -46,7 +46,6 @@ class AbstractViewPortTestCase extends AnyFeatureSpec {
 
     val joinDef = JoinTableDef(
       name = "orderPrices",
-      visibility = Public,
       baseTable = ordersDef,
       joinColumns = Columns.allFrom(ordersDef) ++ Columns.allFromExcept(pricesDef, "ric"),
       joins =
@@ -162,7 +161,6 @@ class AbstractViewPortTestCase extends AnyFeatureSpec {
 
     val joinDef = JoinTableDef(
       name = "orderPrices",
-      visibility = Public,
       baseTable = ordersDef,
       joinColumns = Columns.allFrom(ordersDef) ++ Columns.allFromExcept(pricesDef, "ric"),
       joins =
diff --git a/vuu/src/test/scala/org/finos/vuu/viewport/AmendViewPortToTreeTest.scala b/vuu/src/test/scala/org/finos/vuu/viewport/AmendViewPortToTreeTest.scala
@@ -150,7 +150,6 @@ class AmendViewPortToTreeTest extends AnyFeatureSpec with ViewPortSetup {
 
     val joinDef = JoinTableDef(
       name = "orderPrices",
-      visibility = Public,
       baseTable = ordersDef,
       joinColumns = Columns.allFrom(ordersDef) ++ Columns.allFromExcept(pricesDef, "ric"),
       joins =
diff --git a/vuu/src/test/scala/org/finos/vuu/viewport/CalculatedColumnsViewPortTest.scala b/vuu/src/test/scala/org/finos/vuu/viewport/CalculatedColumnsViewPortTest.scala
@@ -3,14 +3,14 @@ package org.finos.vuu.viewport
 import org.finos.toolbox.jmx.{MetricsProvider, MetricsProviderImpl}
 import org.finos.toolbox.lifecycle.LifecycleContainer
 import org.finos.toolbox.time.{Clock, TestFriendlyClock}
-import org.finos.vuu.api.{JoinSpec, JoinTableDef, JoinTo, LeftOuterJoin, Public, TableDef, VisualLinks}
+import org.finos.vuu.api.{JoinSpec, JoinTableDef, JoinTo, LeftOuterJoin, TableDef, VisualLinks}
 import org.finos.vuu.client.messages.RequestId
 import org.finos.vuu.core.table.TableTestHelper.combineQs
 import org.finos.vuu.core.table.{Columns, TableContainer, ViewPortColumnCreator}
 import org.finos.vuu.net.ClientSessionId
 import org.finos.vuu.provider.{JoinTableProviderImpl, MockProvider, ProviderContainer}
 import org.finos.vuu.util.OutboundRowPublishQueue
-import org.finos.vuu.util.table.TableAsserts.{assertVpEq, assertVpEqWithMeta}
+import org.finos.vuu.util.table.TableAsserts.{assertVpEq}
 import org.scalatest.GivenWhenThen
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.prop.Tables.Table
@@ -224,7 +224,6 @@ class CalculatedColumnsViewPortTest extends AbstractViewPortTestCase with Matche
 
       val joinDef = JoinTableDef(
         name = "orderPrices",
-        visibility = Public,
         baseTable = ordersDef,
         joinColumns = Columns.allFrom(ordersDef) ++ Columns.allFromExcept(pricesDef, "ric"),
         joins =
diff --git a/vuu/src/test/scala/org/finos/vuu/viewport/ChangeViewPortTest.scala b/vuu/src/test/scala/org/finos/vuu/viewport/ChangeViewPortTest.scala
@@ -49,7 +49,6 @@ class ChangeViewPortTest extends AnyFeatureSpec{
 
       val joinDef = JoinTableDef(
         name          = "orderPrices",
-        visibility = Public,
         baseTable     = ordersDef,
         joinColumns   = Columns.allFrom(ordersDef) ++ Columns.allFromExcept(pricesDef, "ric"),
         joins  =
diff --git a/vuu/src/test/scala/org/finos/vuu/viewport/OrdersAndPricesScenarioFixture.scala b/vuu/src/test/scala/org/finos/vuu/viewport/OrdersAndPricesScenarioFixture.scala
@@ -27,7 +27,6 @@ object OrdersAndPricesScenarioFixture {
 
     val joinDef = JoinTableDef(
       name          = "orderPrices",
-      visibility = Public,
       baseTable     = ordersDef,
       joinColumns   = Columns.allFrom(ordersDef) ++ Columns.allFromExcept(pricesDef, "ric"),
       joins  =
diff --git a/vuu/src/test/scala/org/finos/vuu/viewport/ViewPortSetup.scala b/vuu/src/test/scala/org/finos/vuu/viewport/ViewPortSetup.scala
@@ -73,7 +73,6 @@ trait ViewPortSetup {
 
     val joinDef = JoinTableDef(
       name          = "orderPrices",
-      visibility = Public,
       baseTable     = ordersDef,
       joinColumns   = Columns.allFrom(ordersDef) ++ Columns.allFromExcept(pricesDef, "ric"),
       joins  =
diff --git a/vuu/src/test/scala/org/finos/vuu/viewport/performance/CalculateTreeOptimizationTest.scala b/vuu/src/test/scala/org/finos/vuu/viewport/performance/CalculateTreeOptimizationTest.scala
@@ -35,7 +35,6 @@ class CalculateTreeOptimizationTest extends AnyFeatureSpec with ViewPortSetup {
 
     val joinDef = JoinTableDef(
       name = "orderPrices",
-      visibility = Public,
       baseTable = ordersDef,
       joinColumns = Columns.allFrom(ordersDef) ++ Columns.allFromExcept(pricesDef, "ric"),
       joins =
diff --git a/vuu/src/test/scala/org/finos/vuu/viewport/sessiontable/SessionTableViewportTest.scala b/vuu/src/test/scala/org/finos/vuu/viewport/sessiontable/SessionTableViewportTest.scala
@@ -119,7 +119,6 @@ class SessionTableViewportTest extends AbstractViewPortTestCase with Matchers wi
 
     val joinDef = JoinTableDef(
       name = "orderPrices",
-      visibility = Public,
       baseTable = ordersDef,
       joinColumns = Columns.allFrom(ordersDef) ++ Columns.allFromExcept(pricesDef, "ric"),
       joins =
diff --git a/vuu/src/test/scala/org/finos/vuu/wsapi/FreezeViewPortWSApiTest.scala b/vuu/src/test/scala/org/finos/vuu/wsapi/FreezeViewPortWSApiTest.scala
@@ -271,7 +271,6 @@ class FreezeViewPortWSApiTest extends WebSocketApiTestBase {
 
     val joinTableFunc1: TableDefContainer => JoinTableDef = _ => JoinTableDef(
       name = joinTableName1,
-      visibility = Public,
       baseTable = leftTableDef1,
       joinColumns = Columns.allFrom(leftTableDef1) ++ Columns.allFrom(rightTableDef1),
       joins =
@@ -285,7 +284,6 @@ class FreezeViewPortWSApiTest extends WebSocketApiTestBase {
 
     val joinTableFunc2: TableDefContainer => JoinTableDef = _ => JoinTableDef(
       name = joinTableName2,
-      visibility = Public,
       baseTable = leftTableDef2,
       joinColumns = Columns.allFrom(leftTableDef2) ++ Columns.allFrom(rightTableDef2),
       joins =
diff --git a/vuu/src/test/scala/org/finos/vuu/wsapi/TypeAheadWSApiTest.scala b/vuu/src/test/scala/org/finos/vuu/wsapi/TypeAheadWSApiTest.scala
@@ -323,7 +323,6 @@ class TypeAheadWSApiTest extends WebSocketApiTestBase {
 
     val joinTableFunc: TableDefContainer => JoinTableDef = _ => JoinTableDef(
       name = joinTableName,
-      visibility = Public,
       baseTable = baseTableDef,
       joinColumns = Columns.allFrom(baseTableDef),
       joins =

Original file line number	Diff line number	Diff line change
`@@ -257,6 +257,11 @@ case class JoinTableDef(`
`257`	`257`	`}`
`258`	`258`	`}`
`259`	`259`
	`260`	`+object JoinTableDef {`
	`261`	`+ def apply(name: String, baseTable: TableDef, joinColumns: Array[Column], links: VisualLinks, joinFields: Seq[String], joins: JoinTo): JoinTableDef = {`
	`262`	`+ new JoinTableDef(name, Public, baseTable, joinColumns, links, joinFields, joins)`
	`263`	`+ }`
	`264`	`+}`
`260`	`265`	`//case class JoinTableDef(override val name: String, left: TableDef, right: TableDef, joinDef: JoinDefinition, joinColumns: Array[Column]) extends TableDef(name, joinDef.leftKeyField, joinColumns){`
`261`	`266`	`// def getJoinDefinitionColumns():Array[Column] = {`
`262`	`267`	`// Array(columnForName(left.keyField), columnForName(joinDef.rightKeyField))`