some file moving and struct renaming (#57686)

pkg/services/folder/folderimpl/sqlstore.go

@@ -0,0 +1,53 @@
+package folderimpl
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type sqlStore struct {
+	db  db.DB
+	log log.Logger
+	cfg *setting.Cfg
+	fm  featuremgmt.FeatureManager
+}
+
+// sqlStore implements the store interface.
+var _ store = (*sqlStore)(nil)
+
+func ProvideStore(db db.DB, cfg *setting.Cfg, features featuremgmt.FeatureManager) *sqlStore {
+	return &sqlStore{db: db, log: log.New("folder-store"), cfg: cfg, fm: features}
+}
+
+func (s *sqlStore) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (*folder.Folder, error) {
+	panic("not implemented")
+}
+
+func (s *sqlStore) Delete(ctx context.Context, uid string, orgID int64) error {
+	panic("not implemented")
+}
+
+func (s *sqlStore) Update(ctx context.Context, cmd *folder.UpdateFolderCommand) (*folder.Folder, error) {
+	panic("not implemented")
+}
+
+func (s *sqlStore) Move(ctx context.Context, cmd *folder.MoveFolderCommand) (*folder.Folder, error) {
+	panic("not implemented")
+}
+
+func (s *sqlStore) Get(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.Folder, error) {
+	panic("not implemented")
+}
+
+func (s *sqlStore) GetParents(ctx context.Context, cmd *folder.GetParentsQuery) ([]*folder.Folder, error) {
+	panic("not implemented")
+}
+
+func (s *sqlStore) GetChildren(ctx context.Context, cmd *folder.GetTreeQuery) ([]*folder.Folder, error) {
+	panic("not implemented")
+}

pkg/services/folder/folderimpl/store.go

@@ -3,51 +3,31 @@ package folderimpl
 import (
 	"context"
 
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder"
-	"github.com/grafana/grafana/pkg/setting"
 )
 
-type store struct {
-	db  db.DB
-	log log.Logger
-	cfg *setting.Cfg
-	fm  featuremgmt.FeatureManager
-}
+// Store is the interface which a folder store must implement.
+type store interface {
+	// Create creates a folder and returns the newly-created folder.
+	Create(ctx context.Context, cmd *folder.CreateFolderCommand) (*folder.Folder, error)
 
-// store implements the folder.Store interface.
-var _ folder.Store = (*store)(nil)
+	// Delete deletes a folder from the folder store.
+	Delete(ctx context.Context, uid string, orgID int64) error
 
-func ProvideStore(db db.DB, cfg *setting.Cfg, features featuremgmt.FeatureManager) *store {
-	return &store{db: db, log: log.New("folder-store"), cfg: cfg, fm: features}
-}
+	// Update updates the given folder's UID, Title, and Description.
+	// Use Move to change a dashboard's parent ID.
+	Update(ctx context.Context, cmd *folder.UpdateFolderCommand) (*folder.Folder, error)
 
-func (s *store) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (*folder.Folder, error) {
-	panic("not implemented")
-}
+	// Move changes the given folder's parent folder uid and applies any necessary permissions changes.
+	Move(ctx context.Context, cmd *folder.MoveFolderCommand) (*folder.Folder, error)
 
-func (s *store) Delete(ctx context.Context, uid string, orgID int64) error {
-	panic("not implemented")
-}
+	// Get returns a folder.
+	Get(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.Folder, error)
 
-func (s *store) Update(ctx context.Context, cmd *folder.UpdateFolderCommand) (*folder.Folder, error) {
-	panic("not implemented")
-}
+	// GetParents returns an ordered list of parent folder of the given folder.
+	GetParents(ctx context.Context, cmd *folder.GetParentsQuery) ([]*folder.Folder, error)
 
-func (s *store) Move(ctx context.Context, cmd *folder.MoveFolderCommand) (*folder.Folder, error) {
-	panic("not implemented")
-}
-
-func (s *store) Get(ctx context.Context, cmd *folder.GetFolderCommand) (*folder.Folder, error) {
-	panic("not implemented")
-}
-
-func (s *store) GetParents(ctx context.Context, cmd *folder.GetParentsCommand) ([]*folder.Folder, error) {
-	panic("not implemented")
-}
-
-func (s *store) GetChildren(ctx context.Context, cmd *folder.GetTreeCommand) ([]*folder.Folder, error) {
-	panic("not implemented")
+	// GetChildren returns the set of immediate children folders (depth=1) of the
+	// given folder.
+	GetChildren(ctx context.Context, cmd *folder.GetTreeQuery) ([]*folder.Folder, error)
 }

pkg/services/folder/folderimpl/store_fake.go

@@ -0,0 +1,43 @@
+package folderimpl
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/services/folder"
+)
+
+type FakeStore struct {
+	ExpectedFolders []*folder.Folder
+	ExpectedFolder  *folder.Folder
+	ExpectedError   error
+}
+
+var _ store = (*FakeStore)(nil)
+
+func (f *FakeStore) Create(ctx context.Context, cmd *folder.CreateFolderCommand) (*folder.Folder, error) {
+	return f.ExpectedFolder, f.ExpectedError
+}
+
+func (f *FakeStore) Delete(ctx context.Context, uid string, orgID int64) error {
+	return f.ExpectedError
+}
+
+func (f *FakeStore) Update(ctx context.Context, cmd *folder.UpdateFolderCommand) (*folder.Folder, error) {
+	return f.ExpectedFolder, f.ExpectedError
+}
+
+func (f *FakeStore) Move(ctx context.Context, cmd *folder.MoveFolderCommand) (*folder.Folder, error) {
+	return f.ExpectedFolder, f.ExpectedError
+}
+
+func (f *FakeStore) Get(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.Folder, error) {
+	return f.ExpectedFolder, f.ExpectedError
+}
+
+func (f *FakeStore) GetParents(ctx context.Context, cmd *folder.GetParentsQuery) ([]*folder.Folder, error) {
+	return f.ExpectedFolders, f.ExpectedError
+}
+
+func (f *FakeStore) GetChildren(ctx context.Context, cmd *folder.GetTreeQuery) ([]*folder.Folder, error) {
+	return f.ExpectedFolders, f.ExpectedError
+}