Merge pull request #260 from /issues/259/main

Support Slice
go-generalize · Aug 29, 2024 · c72f2cd · c72f2cd
2 parents c49bce7 + bfec0d5
commit c72f2cd
Show file tree

Hide file tree

Showing 8 changed files with 117 additions and 5 deletions.
diff --git a/examples/different_dir/lock_gen.go b/examples/different_dir/lock_gen.go
diff --git a/examples/repository/task_gen.go b/examples/repository/task_gen.go
diff --git a/examples/task_gen.go b/examples/task_gen.go
diff --git a/generator/templates/gen.go.tmpl b/generator/templates/gen.go.tmpl
@@ -1232,10 +1232,6 @@ func (repo *{{ .RepositoryStructName }}) searchByParam(v interface{}, param *{{
 				query = query.WherePath(firestore.FieldPath{{ $bracketsStart }}"{{ $fi.FsTag }}", key{{ $bracketsEnd }}, chain.Operator, value)
 			}
 		}
-{{- 		else if eq $IsSlice true }}
-		for _, chain := range param.{{ $fi.Field }}.QueryGroup {
-			query = query.Where("{{ $fi.FsTag }}", chain.Operator, chain.Value)
-		}
 {{- 		else if $fi.IsDocumentID }}
 		for _, chain := range param.{{ $fi.Field }}.QueryGroup {
 			var value interface{}

diff --git a/generator/testfiles/auto/task.go b/generator/testfiles/auto/task.go
@@ -15,7 +15,7 @@ type Task struct {
 	Done2            bool               `firestore:"done2"`
 	Count            int                `firestore:"count"`
 	Count64          int64              `firestore:"count64"`
-	NameList         []string           `firestore:"nameList"`
+	NameList         []string           `firestore:"nameList" indexer:"e"`
 	Proportion       float64            `firestore:"proportion" indexer:"e"`
 	Flag             map[string]float64 `firestore:"flag"`
 	SliceSubTask     []*SubTask         `firestore:"slice_sub_task"`

diff --git a/generator/testfiles/auto/task_gen.go b/generator/testfiles/auto/task_gen.go
diff --git a/generator/testfiles/auto/tests/model_test.go b/generator/testfiles/auto/tests/model_test.go
@@ -724,6 +724,36 @@ func TestFirestoreQuery(t *testing.T) {
 		}
 	})
 
+	t.Run("[]string(10件) by filter", func(tr *testing.T) {
+		param := &model.TaskSearchParam{
+			NameList: model.NewQueryChainer().Filters("a", model.FilterTypeAddSomething).Filters("b", model.FilterTypeAddSomething),
+		}
+
+		tasks, err := taskRepo.Search(ctx, param, nil)
+		if err != nil {
+			tr.Fatalf("%+v", err)
+		}
+
+		if len(tasks) != 10 {
+			tr.Fatalf("unexpected length: %d (expected: %d)", len(tasks), 10)
+		}
+	})
+
+	t.Run("[]string(0件) by filter", func(tr *testing.T) {
+		param := &model.TaskSearchParam{
+			NameList: model.NewQueryChainer().Filters("d", model.FilterTypeAddSomething),
+		}
+
+		tasks, err := taskRepo.Search(ctx, param, nil)
+		if err != nil {
+			tr.Fatalf("%+v", err)
+		}
+
+		if len(tasks) != 0 {
+			tr.Fatalf("unexpected length: %d (expected: %d)", len(tasks), 10)
+		}
+	})
+
 	t.Run("[]Object(10件)", func(tr *testing.T) {
 		param := &model.TaskSearchParam{
 			SliceSubTask: model.NewQueryChainer().ArrayContainsAny([]*model.SubTask{{Name: "slice_struct"}}),

diff --git a/generator/testfiles/not_auto/task_gen.go b/generator/testfiles/not_auto/task_gen.go