Nested Folders: Unify folder services (#60390)

* Nested Folders: Unify folder services

pkg/services/folder/service.go

@@ -18,30 +18,8 @@ type Service interface {
 	// Update is used to update a folder's UID, Title and Description. To change
 	// a folder's parent folder, use Move.
 	Update(ctx context.Context, cmd *UpdateFolderCommand) (*Folder, error)
-	DeleteFolder(ctx context.Context, cmd *DeleteFolderCommand) error
+	Delete(ctx context.Context, cmd *DeleteFolderCommand) error
 	MakeUserAdmin(ctx context.Context, orgID int64, userID, folderID int64, setViewAndEditPermissions bool) error
 	// Move changes a folder's parent folder to the requested new parent.
 	Move(ctx context.Context, cmd *MoveFolderCommand) (*Folder, error)
 }
-
-// NestedFolderService is the temporary interface definition for the folder
-// Service which includes any new or alternate methods. These will be collapsed
-// into a single service when the nested folder implementation is rolled out.
-// Note that the commands in this service use models from this package, while
-// the legacy FolderService uses models from the models package.
-type NestedFolderService interface {
-	// Create creates a new folder.
-	Create(ctx context.Context, cmd *CreateFolderCommand) (*Folder, error)
-
-	// Delete deletes a folder. This will return an error if there are any
-	// dashboards in the folder.
-	Delete(ctx context.Context, cmd *DeleteFolderCommand) (*Folder, error)
-
-	// GetParents returns an ordered list of parent folders for the given
-	// folder, starting with the root node and ending with the requested child
-	// node.
-	GetParents(ctx context.Context, cmd *GetParentsQuery) ([]*Folder, error)
-
-	// GetChildren returns an array containing all child folders.
-	GetChildren(ctx context.Context, cmd *GetChildrenQuery) ([]*Folder, error)
-}