From 0ab9cc71da740e284013d193636e402149bc0848 Mon Sep 17 00:00:00 2001
From: Tit Petric <black@scene-si.org>
Date: Fri, 15 Mar 2019 01:50:58 +0100
Subject: [PATCH] fix(all): fix Init function, required as-is

---
 crm/internal/service/service.go       |  2 +-
 crm/start.go                          |  9 +++++++--
 messaging/internal/service/service.go |  2 +-
 messaging/start.go                    | 11 ++++++++---
 system/internal/service/service.go    |  2 +-
 system/start.go                       |  9 ++++++---
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/crm/internal/service/service.go b/crm/internal/service/service.go
index 7197fad91..391e74996 100644
--- a/crm/internal/service/service.go
+++ b/crm/internal/service/service.go
@@ -25,7 +25,7 @@ var (
 	DefaultAttachment   AttachmentService
 )
 
-func init() {
+func Init() {
 	o.Do(func() {
 		fs, err := store.New("var/store")
 		if err != nil {
diff --git a/crm/start.go b/crm/start.go
index d509d13f5..815ebf470 100644
--- a/crm/start.go
+++ b/crm/start.go
@@ -11,11 +11,12 @@ import (
 	"github.com/titpetric/factory/resputil"
 
 	migrate "github.com/crusttech/crust/crm/db"
-	"github.com/crusttech/crust/internal/db"
-
+	"github.com/crusttech/crust/crm/internal/service"
 	"github.com/crusttech/crust/internal/auth"
+	"github.com/crusttech/crust/internal/db"
 	"github.com/crusttech/crust/internal/mail"
 	"github.com/crusttech/crust/internal/metrics"
+	systemService "github.com/crusttech/crust/system/service"
 )
 
 var (
@@ -51,6 +52,10 @@ func Init() error {
 		},
 	})
 
+	// Don't change this, it needs Database
+	systemService.Init()
+	service.Init()
+
 	return nil
 }
 
diff --git a/messaging/internal/service/service.go b/messaging/internal/service/service.go
index b18841632..e8d5c12ef 100644
--- a/messaging/internal/service/service.go
+++ b/messaging/internal/service/service.go
@@ -24,7 +24,7 @@ var (
 	DefaultPermissions PermissionsService
 )
 
-func init() {
+func Init() {
 	o.Do(func() {
 		fs, err := store.New("var/store")
 		if err != nil {
diff --git a/messaging/start.go b/messaging/start.go
index a3c9ce5e0..077b85405 100644
--- a/messaging/start.go
+++ b/messaging/start.go
@@ -10,12 +10,13 @@ import (
 	"github.com/pkg/errors"
 	"github.com/titpetric/factory/resputil"
 
-	"github.com/crusttech/crust/internal/db"
-	migrate "github.com/crusttech/crust/messaging/db"
-
 	"github.com/crusttech/crust/internal/auth"
+	"github.com/crusttech/crust/internal/db"
 	"github.com/crusttech/crust/internal/mail"
 	"github.com/crusttech/crust/internal/metrics"
+	migrate "github.com/crusttech/crust/messaging/db"
+	"github.com/crusttech/crust/messaging/internal/service"
+	systemService "github.com/crusttech/crust/system/service"
 )
 
 var (
@@ -51,6 +52,10 @@ func Init() error {
 		},
 	})
 
+	// Don't change this, it needs Database
+	systemService.Init()
+	service.Init()
+
 	return nil
 }
 
diff --git a/system/internal/service/service.go b/system/internal/service/service.go
index 2f88fd6a4..0b65c9ce9 100644
--- a/system/internal/service/service.go
+++ b/system/internal/service/service.go
@@ -21,7 +21,7 @@ var (
 	DefaultPermissions  PermissionsService
 )
 
-func init() {
+func Init() {
 	o.Do(func() {
 		DefaultRules = Rules()
 		DefaultPermissions = Permissions()
diff --git a/system/start.go b/system/start.go
index ea35934af..61ac250b5 100644
--- a/system/start.go
+++ b/system/start.go
@@ -10,12 +10,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/titpetric/factory/resputil"
 
-	"github.com/crusttech/crust/internal/db"
-	migrate "github.com/crusttech/crust/system/db"
-
 	"github.com/crusttech/crust/internal/auth"
+	"github.com/crusttech/crust/internal/db"
 	"github.com/crusttech/crust/internal/mail"
 	"github.com/crusttech/crust/internal/metrics"
+	migrate "github.com/crusttech/crust/system/db"
+	"github.com/crusttech/crust/system/service"
 )
 
 var (
@@ -51,6 +51,9 @@ func Init() error {
 		},
 	})
 
+	// Don't change this, it needs Database
+	service.Init()
+
 	return nil
 }