fix unfreezing view port and exclude default columns when creating JoinColumn

vuu/src/main/scala/org/finos/vuu/core/table/Column.scala

@@ -2,6 +2,7 @@ package org.finos.vuu.core.table
 
 import com.typesafe.scalalogging.StrictLogging
 import org.finos.vuu.api.TableDef
+import org.finos.vuu.core.table.DefaultColumnNames.{CreatedTimeColumnName, LastUpdatedTimeColumnName, allDefaultColumns}
 import org.finos.vuu.core.table.column.CalculatedColumnClause
 import org.finos.vuu.util.schema.ExternalEntitySchema
 import org.finos.vuu.util.types.{DefaultTypeConverters, TypeConverterContainerBuilder}
@@ -78,18 +79,26 @@ object Columns {
     table.columns.filter(c => names.contains(c.name)).map(c => new JoinColumn(c.name, c.index, c.dataType, table, c))
   }
 
+  /**
+   * Note: this method returns all columns of a given table, including the default columns of vuuCreatedTimestamp and vuuUpdatedTimestamp
+   * @return JoinColumn based on all columns of a given table except the default columns
+   */
   def allFrom(table: TableDef): Array[Column] = {
-    table.columns.map(c => new JoinColumn(c.name, c.index, c.dataType, table, c))
+    allFromExcept(table)
   }
 
   def aliased(table: TableDef, aliases: (String, String)*): Array[Column] = {
     val aliased = aliases.map(tuple => tuple._1 -> tuple._2).toMap
     table.columns.filter(c => aliased.contains(c.name)) map (c => new AliasedJoinColumn(aliased(c.name), c.index, c.dataType, table, c).asInstanceOf[Column])
   }
 
+  /**
+   * Note: this method excludes the default columns of vuuCreatedTimestamp and vuuUpdatedTimestamp
+   */
   def allFromExcept(table: TableDef, excludeColumns: String*): Array[Column] = {
+    val columnsToExclude = excludeColumns ++ allDefaultColumns
 
-    val excluded = excludeColumns.map(s => s -> 1).toMap
+    val excluded = columnsToExclude.map(s => s -> 1).toMap
 
     table.columns.filterNot(c => excluded.contains(c.name)).map(c => new JoinColumn(c.name, c.index, c.dataType, table, c))
   }

vuu/src/main/scala/org/finos/vuu/core/table/DefaultColumnNames.scala

@@ -3,4 +3,5 @@ package org.finos.vuu.core.table
 object DefaultColumnNames {
   val CreatedTimeColumnName: String = "vuuCreatedTimestamp"
   val LastUpdatedTimeColumnName: String = "vuuUpdatedTimestamp"
+  val allDefaultColumns: Array[String] = Array(CreatedTimeColumnName, LastUpdatedTimeColumnName)
 }

vuu/src/main/scala/org/finos/vuu/viewport/ViewPort.scala

@@ -340,7 +340,7 @@ class ViewPortImpl(val id: String,
 
 
   override def getStructuralHashCode(): Int = {
-    37 * filterAndSort.hashCode() ^ getGroupBy.hashCode() ^ getColumns.hashCode() ^ permissionChecker().hashCode()
+    37 * filterAndSort.hashCode() ^ getGroupBy.hashCode() ^ getColumns.hashCode() ^ permissionChecker().hashCode() ^ viewPortFrozenTimestamp.hashCode()
   }
 
   private def getTreeNodeStateHash(): Int = {

vuu/src/test/scala/org/finos/vuu/core/module/ModuleSyntaxTest.scala

@@ -6,16 +6,16 @@ import org.scalatest.GivenWhenThen
 import org.scalatest.featurespec.AnyFeatureSpec
 import org.scalatest.matchers.should.Matchers
 
-class ModuleSyntaxTest extends AnyFeatureSpec with Matchers with GivenWhenThen{
+class ModuleSyntaxTest extends AnyFeatureSpec with Matchers with GivenWhenThen {
 
-  Feature("check the new builder syntax for view server modules"){
+  Feature("check the new builder syntax for view server modules") {
 
-    Scenario("check we can parse the module"){
+    Scenario("check we can parse the module") {
 
       Given("A test module which several tables defined, which takes some parameters (these are simple example params but could be complicated lifecycle stuff)")
       implicit val tableDefContainer: TableDefContainer = new TableDefContainer(Map())
       val module = TestModule2.apply("foo", 100)
-      module.tableDefs.size should be (3)
+      module.tableDefs.size should be(3)
       module.name should equal("TEST")
 
       val instruments = module.tableDefs.head
@@ -33,16 +33,16 @@ class ModuleSyntaxTest extends AnyFeatureSpec with Matchers with GivenWhenThen{
         )
       )
       instruments.joinFields should equal(Seq("ric"))
-      
+
       val prices = module.tableDefs.tail.head
       prices.name should equal("prices")
       prices.columns.size should equal(9)
       prices.joinFields should equal(Seq("ric"))
 
       val instrumentPrices = module.tableDefs.tail.tail.head
       instrumentPrices.name should equal("instrumentPrices")
-      // TODO once https://github.com/finos/vuu/issues/1653 is done, review the expected value of columns.size in the next line
-      instrumentPrices.columns.size should equal(prices.columns.size + instruments.columns.size - 1 + 2)
+      instrumentPrices.columns.size should equal((prices.columns.size - 2) + (instruments.columns.size - 2) - 1 + 2)
+      // exclude default columns in left and right table and exclude join column, and add default columns to the join table itself
 
       instrumentPrices.joinFields should equal(Seq())
     }

vuu/src/test/scala/org/finos/vuu/core/table/ColumnTest.scala

@@ -1,5 +1,6 @@
 package org.finos.vuu.core.table
 
+import org.finos.vuu.api.{ColumnBuilder, TableDef}
 import org.finos.vuu.util.types.TypeUtils
 import org.scalatest.featurespec.AnyFeatureSpec
 import org.scalatest.matchers.should.Matchers
@@ -41,4 +42,41 @@ class ColumnTest extends AnyFeatureSpec with Matchers {
 
   }
 
+  Feature("Columns.allFromExceptDefaultColumns") {
+    Scenario("Create join columns for all columns in table def except default columns") {
+      val tableDef = TableDef(
+        name = "TestTable",
+        keyField = "Id",
+        columns =
+          new ColumnBuilder()
+            .addString("Id")
+            .addString("Name")
+            .addInt("Account")
+            .build()
+      )
+
+      val joinColumns = Columns.allFrom(tableDef)
+      joinColumns.length shouldEqual 3
+      joinColumns.map(_.name) should contain theSameElementsAs Array("Id", "Name", "Account")
+    }
+  }
+
+  Feature("Columns.allFromExcept") {
+    Scenario("Create join columns for all columns in table def except given columns and default columns") {
+      val tableDef = TableDef(
+        name = "TestTable",
+        keyField = "Id",
+        columns =
+          new ColumnBuilder()
+            .addString("Id")
+            .addString("Name")
+            .addInt("Account")
+            .build()
+      )
+
+      val joinColumns = Columns.allFromExcept(tableDef, "Name")
+      joinColumns.length shouldEqual 2
+      joinColumns.map(_.name) should contain theSameElementsAs Array("Id", "Account")
+    }
+  }
 }