refactor: add repo for ansible tasks

Author: fiftin

api/api_test.go

@@ -27,6 +27,7 @@ func TestApiPing(t *testing.T) {
 		nil,
 		nil,
 		nil,
+		nil,
 	)
 
 	r.ServeHTTP(rr, req)

api/projects/tasks.go

@@ -15,6 +15,16 @@ import (
 	"time"
 )
 
+type TaskController struct {
+	ansibleTaskRepo db.AnsibleTaskRepository
+}
+
+func NewTaskController(ansibleTaskRepo db.AnsibleTaskRepository) *TaskController {
+	return &TaskController{
+		ansibleTaskRepo: ansibleTaskRepo,
+	}
+}
+
 func taskPool(r *http.Request) *tasks.TaskPool {
 	return helpers.GetFromContext(r, "task_pool").(*tasks.TaskPool)
 }
@@ -139,10 +149,10 @@ func GetTaskMiddleware(next http.Handler) http.Handler {
 //	return
 //}
 
-func GetAnsibleTaskHosts(w http.ResponseWriter, r *http.Request) {
+func (c *TaskController) GetAnsibleTaskHosts(w http.ResponseWriter, r *http.Request) {
 	task := helpers.GetFromContext(r, "task").(db.Task)
 	project := helpers.GetFromContext(r, "project").(db.Project)
-	hosts, err := helpers.Store(r).GetAnsibleTaskHosts(project.ID, task.ID)
+	hosts, err := c.ansibleTaskRepo.GetAnsibleTaskHosts(project.ID, task.ID)
 	if err != nil {
 		helpers.WriteError(w, err)
 		return
@@ -151,10 +161,10 @@ func GetAnsibleTaskHosts(w http.ResponseWriter, r *http.Request) {
 	helpers.WriteJSON(w, http.StatusOK, hosts)
 }
 
-func GetAnsibleTaskErrors(w http.ResponseWriter, r *http.Request) {
+func (c *TaskController) GetAnsibleTaskErrors(w http.ResponseWriter, r *http.Request) {
 	task := helpers.GetFromContext(r, "task").(db.Task)
 	project := helpers.GetFromContext(r, "project").(db.Project)
-	hosts, err := helpers.Store(r).GetAnsibleTaskErrors(project.ID, task.ID)
+	hosts, err := c.ansibleTaskRepo.GetAnsibleTaskErrors(project.ID, task.ID)
 	if err != nil {
 		helpers.WriteError(w, err)
 		return

api/router.go

@@ -84,6 +84,7 @@ func DelayMiddleware(delay time.Duration) func(http.Handler) http.Handler {
 func Route(
 	store db.Store,
 	terraformStore db.TerraformStore,
+	ansibleTaskRepo db.AnsibleTaskRepository,
 	taskPool *taskServices.TaskPool,
 	projectService server.ProjectService,
 	integrationService server.IntegrationService,
@@ -109,6 +110,7 @@ func Route(
 	usersController := NewUsersController(subscriptionService)
 	subscriptionController := proApi.NewSubscriptionController(store)
 	projectRunnerController := proProjects.NewProjectRunnerController()
+	taskController := projects.NewTaskController(ansibleTaskRepo)
 
 	r := mux.NewRouter()
 	r.NotFoundHandler = http.HandlerFunc(servePublic)
@@ -436,8 +438,8 @@ func Route(
 	projectTaskManagement.HandleFunc("/{task_id}", projects.GetTask).Methods("GET", "HEAD")
 	projectTaskManagement.HandleFunc("/{task_id}", projects.RemoveTask).Methods("DELETE")
 	projectTaskManagement.HandleFunc("/{task_id}/stages", projects.GetTaskStages).Methods("GET", "HEAD")
-	projectTaskManagement.HandleFunc("/{task_id}/ansible/hosts", projects.GetAnsibleTaskHosts).Methods("GET", "HEAD")
-	projectTaskManagement.HandleFunc("/{task_id}/ansible/errors", projects.GetAnsibleTaskErrors).Methods("GET", "HEAD")
+	projectTaskManagement.HandleFunc("/{task_id}/ansible/hosts", taskController.GetAnsibleTaskHosts).Methods("GET", "HEAD")
+	projectTaskManagement.HandleFunc("/{task_id}/ansible/errors", taskController.GetAnsibleTaskErrors).Methods("GET", "HEAD")
 
 	projectScheduleManagement := projectUserAPI.PathPrefix("/schedules").Subrouter()
 	projectScheduleManagement.Use(projects.SchedulesMiddleware)

cli/cmd/root.go

@@ -73,6 +73,7 @@ func Execute() {
 func runService() {
 	store := createStore("root")
 	terraformStore := proFactory.NewTerraformStore(store)
+	ansibleTaskRepository := proFactory.NewAnsibleTaskRepository(store)
 
 	projectService := server.NewProjectService(store, store)
 	encryptionService := server.NewAccessKeyEncryptionService(store, store, store)
@@ -129,6 +130,7 @@ func runService() {
 	route := api.Route(
 		store,
 		terraformStore,
+		ansibleTaskRepository,
 		&taskPool,
 		projectService,
 		integrationService,

db/Store.go

@@ -459,7 +459,6 @@ type Store interface {
 	SessionManager
 	TokenManager
 	TaskManager
-	AnsibleTaskRepository
 	ScheduleManager
 	ViewManager
 	RunnerManager

pro/db/factory/factory.go

@@ -8,3 +8,7 @@ import (
 func NewTerraformStore(store db.Store) db.TerraformStore {
 	return &sql.TerraformStoreImpl{}
 }
+
+func NewAnsibleTaskRepository(store db.Store) db.AnsibleTaskRepository {
+	return &sql.AnsibleTaskStoreImpl{}
+}

pro/db/sql/ansible_task.go

@@ -0,0 +1,29 @@
+package sql
+
+import (
+	"github.com/semaphoreui/semaphore/db"
+	"github.com/semaphoreui/semaphore/db/sql"
+)
+
+type AnsibleTaskStoreImpl struct {
+}
+
+func NewAnsibleTask(connection *sql.SqlDbConnection) db.AnsibleTaskRepository {
+	return &AnsibleTaskStoreImpl{}
+}
+
+func (d *AnsibleTaskStoreImpl) CreateAnsibleTaskHost(host db.AnsibleTaskHost) error {
+	return nil
+}
+
+func (d *AnsibleTaskStoreImpl) CreateAnsibleTaskError(error db.AnsibleTaskError) error {
+	return nil
+}
+
+func (d *AnsibleTaskStoreImpl) GetAnsibleTaskHosts(projectID int, taskID int) (res []db.AnsibleTaskHost, err error) {
+	return
+}
+
+func (d *AnsibleTaskStoreImpl) GetAnsibleTaskErrors(projectID int, taskID int) (res []db.AnsibleTaskError, err error) {
+	return
+}