refactor moved logis to modify schema

k1LoW · Nov 3, 2023 · 802fa6c · 802fa6c
1 parent 41abee7
commit 802fa6c
Show file tree

Hide file tree

Showing 9 changed files with 160 additions and 83 deletions.
diff --git a/config/config.go b/config/config.go
@@ -506,10 +506,21 @@ func (c *Config) ModifySchema(s *schema.Schema) error {
 			return fmt.Errorf("viewpoint '%s' has unknown label '%s'", v.Name, l)
 		}
 	}
+	for vi, v := range s.Viewpoints {
+		// Add viewpoints to table
 
-	_, err := s.SetViewpointsToTables()
-	if err != nil {
-		return errors.WithStack(err)
+		for _, t := range v.Tables {
+			println(v.Name, t)
+			table, err := s.FindTableByName(t)
+			if err != nil {
+				return err
+			}
+			table.Viewpoints = append(table.Viewpoints, &schema.TableViewpoint{
+				Index: vi,
+				Name:  v.Name,
+				Desc:  v.Desc,
+			})
+		}
 	}
 
 	return nil

diff --git a/config/config_test.go b/config/config_test.go
@@ -254,22 +254,42 @@ func TestModifySchema(t *testing.T) {
 		t.Error(err)
 	}
 	tests := []struct {
-		name      string
-		desc      string
-		labels    []string
-		comments  []AdditionalComment
-		relations []AdditionalRelation
-		wantRel   int
+		name             string
+		desc             string
+		labels           []string
+		comments         []AdditionalComment
+		relations        []AdditionalRelation
+		viewpointATables []string
+		viewpointBTables []string
+		wantRel          int
 	}{
-		{"", "", []string{}, nil, nil, 3},
-		{"mod_name_and_desc", "this is test schema", []string{}, nil, nil, 3},
+		{"", "", []string{}, nil, nil, []string{
+			"users",
+			"posts",
+		}, []string{
+			"users",
+			"user_options",
+		}, 3},
+		{"mod_name_and_desc", "this is test schema", []string{}, nil, nil, []string{
+			"users",
+			"posts",
+		}, []string{
+			"users",
+			"user_options",
+		}, 3},
 		{"relations", "", []string{}, nil, []AdditionalRelation{
 			{
 				Table:         "users",
 				ParentTable:   "categories",
 				Columns:       []string{"id"},
 				ParentColumns: []string{"id"},
 			},
+		}, []string{
+			"users",
+			"posts",
+		}, []string{
+			"users",
+			"user_options",
 		}, 4},
 		{"not_override", "", []string{}, nil, []AdditionalRelation{
 			{
@@ -280,6 +300,12 @@ func TestModifySchema(t *testing.T) {
 				Def:           "Additional Relation",
 				Override:      false,
 			},
+		}, []string{
+			"users",
+			"posts",
+		}, []string{
+			"users",
+			"user_options",
 		}, 4},
 		{"override", "", []string{}, nil, []AdditionalRelation{
 			{
@@ -292,6 +318,12 @@ func TestModifySchema(t *testing.T) {
 				Def:               "Override Relation",
 				Override:          true,
 			},
+		}, []string{
+			"users",
+			"posts",
+		}, []string{
+			"users",
+			"user_options",
 		}, 3},
 	}
 	for _, tt := range tests {
@@ -301,11 +333,21 @@ func TestModifySchema(t *testing.T) {
 			c.Labels = tt.labels
 			c.Comments = tt.comments
 			c.Relations = tt.relations
+			c.Viewpoints = append(c.Viewpoints, Viewpoint{
+				Name:   "A",
+				Desc:   "Viewpoint A",
+				Tables: tt.viewpointATables,
+			})
+			c.Viewpoints = append(c.Viewpoints, Viewpoint{
+				Name:   "B",
+				Desc:   "Viewpoint B",
+				Tables: tt.viewpointBTables,
+			})
+
 			s := newTestSchemaViaJSON(t)
 			if err := c.ModifySchema(s); err != nil {
 				t.Error(err)
 			}
-
 			got, err := json.MarshalIndent(s, "", "  ")
 			if err != nil {
 				t.Error(err)

diff --git a/schema/schema.go b/schema/schema.go
@@ -199,24 +199,6 @@ type Schema struct {
 	Viewpoints Viewpoints  `json:"viewpoints,omitempty"`
 }
 
-func (s *Schema) SetViewpointsToTables() (*Schema, error) {
-	for vi, v := range s.Viewpoints {
-		// Add viewpoints to table
-		for _, t := range v.Tables {
-			table, err := s.FindTableByName(t)
-			if err != nil {
-				return s, err
-			}
-			table.Viewpoints = append(table.Viewpoints, &TableViewpoint{
-				Index: vi,
-				Name:  v.Name,
-				Desc:  v.Desc,
-			})
-		}
-	}
-	return s, nil
-}
-
 func (s *Schema) NormalizeTableName(name string) string {
 	if s.Driver != nil && s.Driver.Meta != nil && s.Driver.Meta.CurrentSchema != "" && (s.Driver.Name == "postgres" || s.Driver.Name == "redshift") && !strings.Contains(name, ".") {
 		return fmt.Sprintf("%s.%s", s.Driver.Meta.CurrentSchema, name)

diff --git a/schema/schema_test.go b/schema/schema_test.go
@@ -11,54 +11,6 @@ import (
 	"github.com/google/go-cmp/cmp"
 )
 
-func TestSetViewpointsToTables(t *testing.T) {
-	viewpointAName := "va"
-	viewpointBName := "vb"
-
-	tests := []struct {
-		viewpointATables     []string
-		viewpointBTables     []string
-		wantTableAViewpoints []*TableViewpoint
-	}{
-		{[]string{"a"}, []string{"b"}, []*TableViewpoint{{Name: viewpointAName}}},
-		{[]string{"a", "b"}, []string{"a"}, []*TableViewpoint{{
-			Index: 0,
-			Name:  viewpointAName,
-		}, {
-			Index: 1,
-			Name:  viewpointBName,
-		}}},
-	}
-
-	for _, tt := range tests {
-		t.Run(fmt.Sprintf("%v", tt.viewpointATables), func(t *testing.T) {
-			fmt.Println(tt.viewpointATables)
-			s := newTestSchema(t)
-			s.Viewpoints = []*Viewpoint{
-				{
-					Name:   viewpointAName,
-					Tables: tt.viewpointATables,
-				},
-				{
-					Name:   viewpointBName,
-					Tables: tt.viewpointBTables,
-				},
-			}
-			result, err := s.SetViewpointsToTables()
-			if err != nil {
-				t.Error(err)
-			}
-			gotTable, _ := result.FindTableByName("a")
-			got := gotTable.Viewpoints
-			want := tt.wantTableAViewpoints
-
-			if diff := cmp.Diff(got, want, nil); diff != "" {
-				t.Errorf("%s", diff)
-			}
-		})
-	}
-}
-
 func TestNormalizeTableName(t *testing.T) {
 	tests := []struct {
 		s    *Schema

diff --git a/testdata/modify_schema_.golden b/testdata/modify_schema_.golden
@@ -409,5 +409,23 @@
     "name": "sqlite",
     "database_version": "3.39.4",
     "meta": {}
-  }
+  },
+  "viewpoints": [
+    {
+      "name": "A",
+      "desc": "Viewpoint A",
+      "tables": [
+        "users",
+        "posts"
+      ]
+    },
+    {
+      "name": "B",
+      "desc": "Viewpoint B",
+      "tables": [
+        "users",
+        "user_options"
+      ]
+    }
+  ]
 }
diff --git a/testdata/modify_schema_mod_name_and_desc.golden b/testdata/modify_schema_mod_name_and_desc.golden
@@ -409,5 +409,23 @@
     "name": "sqlite",
     "database_version": "3.39.4",
     "meta": {}
-  }
+  },
+  "viewpoints": [
+    {
+      "name": "A",
+      "desc": "Viewpoint A",
+      "tables": [
+        "users",
+        "posts"
+      ]
+    },
+    {
+      "name": "B",
+      "desc": "Viewpoint B",
+      "tables": [
+        "users",
+        "user_options"
+      ]
+    }
+  ]
 }
diff --git a/testdata/modify_schema_not_override.golden b/testdata/modify_schema_not_override.golden
@@ -423,5 +423,23 @@
     "name": "sqlite",
     "database_version": "3.39.4",
     "meta": {}
-  }
+  },
+  "viewpoints": [
+    {
+      "name": "A",
+      "desc": "Viewpoint A",
+      "tables": [
+        "users",
+        "posts"
+      ]
+    },
+    {
+      "name": "B",
+      "desc": "Viewpoint B",
+      "tables": [
+        "users",
+        "user_options"
+      ]
+    }
+  ]
 }
diff --git a/testdata/modify_schema_override.golden b/testdata/modify_schema_override.golden
@@ -409,5 +409,23 @@
     "name": "sqlite",
     "database_version": "3.39.4",
     "meta": {}
-  }
+  },
+  "viewpoints": [
+    {
+      "name": "A",
+      "desc": "Viewpoint A",
+      "tables": [
+        "users",
+        "posts"
+      ]
+    },
+    {
+      "name": "B",
+      "desc": "Viewpoint B",
+      "tables": [
+        "users",
+        "user_options"
+      ]
+    }
+  ]
 }
diff --git a/testdata/modify_schema_relations.golden b/testdata/modify_schema_relations.golden
@@ -423,5 +423,23 @@
     "name": "sqlite",
     "database_version": "3.39.4",
     "meta": {}
-  }
+  },
+  "viewpoints": [
+    {
+      "name": "A",
+      "desc": "Viewpoint A",
+      "tables": [
+        "users",
+        "posts"
+      ]
+    },
+    {
+      "name": "B",
+      "desc": "Viewpoint B",
+      "tables": [
+        "users",
+        "user_options"
+      ]
+    }
+  ]
 }