From 7b39b764f88cbf0463475fd6af89d61ebc1771b9 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@kendu.si>
Date: Mon, 17 Dec 2018 12:07:09 +0100
Subject: [PATCH] Move from explicit service passing to using default

---
 crm/rest/field.go    |  6 ++++--
 crm/rest/job.go      |  6 +++---
 crm/rest/module.go   |  7 +++++--
 crm/rest/page.go     |  6 ++++--
 crm/rest/router.go   | 20 +++++---------------
 crm/rest/workflow.go |  8 +++++---
 6 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/crm/rest/field.go b/crm/rest/field.go
index fe5a7a90f..f61fa5ece 100644
--- a/crm/rest/field.go
+++ b/crm/rest/field.go
@@ -19,8 +19,10 @@ type (
 	}
 )
 
-func (Field) New(field service.FieldService) *Field {
-	return &Field{field}
+func (Field) New() *Field {
+	return &Field{
+		field: service.DefaultField,
+	}
 }
 
 func (s *Field) List(ctx context.Context, _ *request.FieldList) (interface{}, error) {
diff --git a/crm/rest/job.go b/crm/rest/job.go
index 81520951f..d89deb695 100644
--- a/crm/rest/job.go
+++ b/crm/rest/job.go
@@ -13,12 +13,12 @@ var _ = errors.Wrap
 
 type (
 	Job struct {
-		job service.JobService
+		jobSvc service.JobService
 	}
 )
 
-func (Job) New(jobSvc service.JobService) *Job {
-	return &Job{jobSvc}
+func (Job) New() *Job {
+	return &Job{jobSvc: service.DefaultJob}
 }
 
 func (ctrl *Job) List(ctx context.Context, r *request.JobList) (interface{}, error) {
diff --git a/crm/rest/module.go b/crm/rest/module.go
index 43f23b482..bfdd6cc74 100644
--- a/crm/rest/module.go
+++ b/crm/rest/module.go
@@ -18,8 +18,11 @@ type (
 	}
 )
 
-func (Module) New(module service.ModuleService, content service.ContentService) *Module {
-	return &Module{module, content}
+func (Module) New() *Module {
+	return &Module{
+		module:  service.DefaultModule,
+		content: service.DefaultContent,
+	}
 }
 
 func (s *Module) List(ctx context.Context, r *request.ModuleList) (interface{}, error) {
diff --git a/crm/rest/page.go b/crm/rest/page.go
index 44f98d18e..6f2bad65e 100644
--- a/crm/rest/page.go
+++ b/crm/rest/page.go
@@ -17,8 +17,10 @@ type (
 	}
 )
 
-func (Page) New(pageSvc service.PageService) *Page {
-	return &Page{pageSvc}
+func (Page) New() *Page {
+	return &Page{
+		page: service.DefaultPage,
+	}
 }
 
 func (ctrl *Page) List(ctx context.Context, r *request.PageList) (interface{}, error) {
diff --git a/crm/rest/router.go b/crm/rest/router.go
index dc8b8aa47..d6abec88b 100644
--- a/crm/rest/router.go
+++ b/crm/rest/router.go
@@ -4,26 +4,16 @@ import (
 	"github.com/go-chi/chi"
 
 	"github.com/crusttech/crust/crm/rest/handlers"
-	"github.com/crusttech/crust/crm/service"
 	"github.com/crusttech/crust/internal/auth"
 )
 
 func MountRoutes(jwtAuth auth.TokenEncoder) func(chi.Router) {
 	var (
-		fieldSvc    = service.Field()
-		moduleSvc   = service.Module()
-		contentSvc  = service.Content()
-		pageSvc     = service.Page()
-		workflowSvc = service.Workflow()
-		jobSvc      = service.Job()
-	)
-
-	var (
-		field    = Field{}.New(fieldSvc)
-		module   = Module{}.New(moduleSvc, contentSvc)
-		page     = Page{}.New(pageSvc)
-		workflow = Workflow{}.New(workflowSvc)
-		job      = Job{}.New(jobSvc)
+		field    = Field{}.New()
+		module   = Module{}.New()
+		page     = Page{}.New()
+		workflow = Workflow{}.New()
+		job      = Job{}.New()
 	)
 
 	// Initialize handers & controllers.
diff --git a/crm/rest/workflow.go b/crm/rest/workflow.go
index b19e3536c..d9d9c7741 100644
--- a/crm/rest/workflow.go
+++ b/crm/rest/workflow.go
@@ -13,12 +13,14 @@ var _ = errors.Wrap
 
 type (
 	Workflow struct {
-		workflow service.WorkflowService
+		workflowSvc service.WorkflowService
 	}
 )
 
-func (Workflow) New(workflowSvc service.WorkflowService) *Workflow {
-	return &Workflow{workflowSvc}
+func (Workflow) New() *Workflow {
+	return &Workflow{
+		workflowSvc: service.DefaultWorkflow,
+	}
 }
 
 func (ctrl *Workflow) List(ctx context.Context, r *request.WorkflowList) (interface{}, error) {