Moving store layers into independent packages (#15004)

store/layer_generators/main.go

@@ -47,7 +47,7 @@ func buildTimerLayer() error {
 		return err
 	}
 
-	return ioutil.WriteFile(path.Join("timer_layer.go"), formatedCode, 0644)
+	return ioutil.WriteFile(path.Join("timerlayer", "timerlayer.go"), formatedCode, 0644)
 }
 
 func buildOpenTracingLayer() error {
@@ -60,7 +60,7 @@ func buildOpenTracingLayer() error {
 		return err
 	}
 
-	return ioutil.WriteFile(path.Join("opentracing_layer.go"), formatedCode, 0644)
+	return ioutil.WriteFile(path.Join("opentracinglayer", "opentracinglayer.go"), formatedCode, 0644)
 }
 
 type methodParam struct {
@@ -252,7 +252,13 @@ func generateLayer(name, templateFile string) ([]byte, error) {
 		"joinParamsWithType": func(params []methodParam) string {
 			paramsWithType := []string{}
 			for _, param := range params {
-				paramsWithType = append(paramsWithType, fmt.Sprintf("%s %s", param.Name, param.Type))
+				if param.Type == "ChannelSearchOpts" || param.Type == "UserGetByIdsOpts" {
+					paramsWithType = append(paramsWithType, fmt.Sprintf("%s store.%s", param.Name, param.Type))
+				} else if param.Type == "*UserGetByIdsOpts" {
+					paramsWithType = append(paramsWithType, fmt.Sprintf("%s *store.UserGetByIdsOpts", param.Name))
+				} else {
+					paramsWithType = append(paramsWithType, fmt.Sprintf("%s %s", param.Name, param.Type))
+				}
 			}
 			return strings.Join(paramsWithType, ", ")
 		},

store/layer_generators/opentracing_layer.go.tmpl

@@ -4,31 +4,32 @@
 // Code generated by "make store-layers"
 // DO NOT EDIT
 
-package store
+package opentracinglayer
 
 import (
 	"context"
 
 	"github.com/mattermost/mattermost-server/v5/model"
 	"github.com/mattermost/mattermost-server/v5/services/tracing"
+	"github.com/mattermost/mattermost-server/v5/store"
 	"github.com/opentracing/opentracing-go/ext"
 	spanlog "github.com/opentracing/opentracing-go/log"
 )
 
 type {{.Name}} struct {
-	Store
-{{range $index, $element := .SubStores}}	{{$index}}Store {{$index}}Store
+	store.Store
+{{range $index, $element := .SubStores}}	{{$index}}Store store.{{$index}}Store
 {{end}}
 }
 
-{{range $index, $element := .SubStores}}func (s *{{$.Name}}) {{$index}}() {{$index}}Store {
+{{range $index, $element := .SubStores}}func (s *{{$.Name}}) {{$index}}() store.{{$index}}Store {
 	return s.{{$index}}Store
 }
 
 {{end}}
 
 {{range $index, $element := .SubStores}}type {{$.Name}}{{$index}}Store struct {
-	{{$index}}Store
+	store.{{$index}}Store
 	Root *{{$.Name}}
 }
 
@@ -72,7 +73,7 @@ func (s *{{$.Name}}) {{$index}}({{$element.Params | joinParamsWithType}}) {{$ele
 	{{end}}}
 {{end}}
 
-func New{{.Name}}(childStore Store, ctx context.Context) *{{.Name}} {
+func New(childStore store.Store, ctx context.Context) *{{.Name}} {
 	newStore := {{.Name}}{
 		Store: childStore,
 	}

store/layer_generators/timer_layer.go.tmpl

@@ -4,7 +4,7 @@
 // Code generated by "make store-layers"
 // DO NOT EDIT
 
-package store
+package timerlayer
 
 import (
 	"context"
@@ -12,23 +12,24 @@ import (
 	
     "github.com/mattermost/mattermost-server/v5/einterfaces"
 	"github.com/mattermost/mattermost-server/v5/model"
+	"github.com/mattermost/mattermost-server/v5/store"
 )
 
 type {{.Name}} struct {
-	Store
+	store.Store
 	Metrics einterfaces.MetricsInterface
-{{range $index, $element := .SubStores}}	{{$index}}Store {{$index}}Store
+{{range $index, $element := .SubStores}}	{{$index}}Store store.{{$index}}Store
 {{end}}
 }
 
-{{range $index, $element := .SubStores}}func (s *{{$.Name}}) {{$index}}() {{$index}}Store {
+{{range $index, $element := .SubStores}}func (s *{{$.Name}}) {{$index}}() store.{{$index}}Store {
 	return s.{{$index}}Store
 }
 
 {{end}}
 
 {{range $index, $element := .SubStores}}type {{$.Name}}{{$index}}Store struct {
-	{{$index}}Store
+	store.{{$index}}Store
 	Root *{{$.Name}}
 }
 
@@ -67,7 +68,7 @@ func (s *{{$.Name}}) {{$index}}({{$element.Params | joinParamsWithType}}) {{$ele
 	{{end}}}
 {{end}}
 
-func New{{.Name}}(childStore Store, metrics einterfaces.MetricsInterface) *{{.Name}} {
+func New(childStore store.Store, metrics einterfaces.MetricsInterface) *{{.Name}} {
 	newStore := {{.Name}}{
 		Store: childStore,
 		Metrics: metrics,