upd(all): merge fix/coupling-issues-stage-1

crm/flags.go

@@ -3,7 +3,7 @@ package service
 import (
 	"github.com/pkg/errors"
 
-	"github.com/crusttech/crust/crm/repository"
+	"github.com/crusttech/crust/crm/internal/repository"
 	"github.com/crusttech/crust/internal/config"
 )
 

crm/internal/repository/record.go

@@ -11,7 +11,7 @@ import (
 	"github.com/titpetric/factory"
 	sq "gopkg.in/Masterminds/squirrel.v1"
 
-	"github.com/crusttech/crust/crm/repository/ql"
+	"github.com/crusttech/crust/crm/internal/repository/ql"
 
 	"github.com/crusttech/crust/crm/types"
 )

crm/internal/repository/record_report_builder.go

@@ -9,7 +9,7 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/Masterminds/squirrel.v1"
 
-	"github.com/crusttech/crust/crm/repository/ql"
+	"github.com/crusttech/crust/crm/internal/repository/ql"
 	"github.com/crusttech/crust/crm/types"
 )
 

crm/internal/service/attachment.go

@@ -16,10 +16,11 @@ import (
 	"github.com/pkg/errors"
 	"github.com/titpetric/factory"
 
-	"github.com/crusttech/crust/crm/repository"
+	"github.com/crusttech/crust/crm/internal/repository"
 	"github.com/crusttech/crust/crm/types"
 	"github.com/crusttech/crust/internal/auth"
 	"github.com/crusttech/crust/internal/store"
+
 	systemService "github.com/crusttech/crust/system/service"
 )
 
@@ -77,7 +78,7 @@ func (svc *attachment) With(ctx context.Context) AttachmentService {
 		pageSvc:   svc.pageSvc.With(ctx),
 		moduleSvc: svc.moduleSvc.With(ctx),
 		recordSvc: svc.recordSvc.With(ctx),
-		usr:       svc.usr.With(ctx),
+		usr:       systemService.User(ctx),
 		store:     svc.store,
 
 		attachment: repository.Attachment(ctx, db),

crm/internal/service/chart.go

@@ -6,7 +6,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/titpetric/factory"
 
-	"github.com/crusttech/crust/crm/repository"
+	"github.com/crusttech/crust/crm/internal/repository"
 	"github.com/crusttech/crust/crm/types"
 )
 

crm/internal/service/module.go

@@ -6,7 +6,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/titpetric/factory"
 
-	"github.com/crusttech/crust/crm/repository"
+	"github.com/crusttech/crust/crm/internal/repository"
 	"github.com/crusttech/crust/crm/types"
 )
 

crm/internal/service/notification.go

@@ -10,26 +10,21 @@ import (
 
 	"github.com/crusttech/crust/internal/mail"
 	systemService "github.com/crusttech/crust/system/service"
-	systemTypes "github.com/crusttech/crust/system/types"
 )
 
 type (
 	notification struct {
 		ctx context.Context
 
-		userSvc notificationUserService
+		userSvc systemService.UserService
 	}
 
 	NotificationService interface {
 		With(ctx context.Context) NotificationService
+
 		SendEmail(message *gomail.Message) error
 		AttachEmailRecipients(message *gomail.Message, field string, recipients ...string) error
 	}
-
-	notificationUserService interface {
-		With(ctx context.Context) systemService.UserService
-		FindByID(userID uint64) (*systemTypes.User, error)
-	}
 )
 
 func Notification() NotificationService {
@@ -40,9 +35,8 @@ func Notification() NotificationService {
 
 func (s *notification) With(ctx context.Context) NotificationService {
 	return &notification{
-		ctx: ctx,
-
-		userSvc: s.userSvc.With(ctx),
+		ctx:     ctx,
+		userSvc: systemService.User(ctx),
 	}
 }
 
@@ -67,7 +61,7 @@ func (s *notification) AttachEmailRecipients(message *gomail.Message, field stri
 		return
 	}
 
-	if recipients, err = s.expandUserRefs(s.userSvc.With(s.ctx), recipients); err != nil {
+	if recipients, err = s.expandUserRefs(recipients); err != nil {
 		return
 	}
 
@@ -97,11 +91,11 @@ func (s *notification) AttachEmailRecipients(message *gomail.Message, field stri
 // Expands references to users (strings as numeric uint64)
 //
 // This func is extracted to make testing/mocking mocking
-func (s *notification) expandUserRefs(usrLookup notificationUserService, recipients []string) ([]string, error) {
+func (s *notification) expandUserRefs(recipients []string) ([]string, error) {
 	for r, rcpt := range recipients {
 		// First, get userID off the table
 		if userID, _ := strconv.ParseUint(rcpt, 10, 64); userID > 0 {
-			if user, err := usrLookup.FindByID(userID); err != nil {
+			if user, err := s.userSvc.FindByID(userID); err != nil {
 				return nil, errors.Wrapf(err, "invalid recipient %v", userID)
 			} else {
 				recipients[r] = user.Email + " " + user.Name

crm/internal/service/notification_mock_test.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: crm/service/notification.go
+// Source: crm/internal/service/notification.go
 
 // Package service is a generated GoMock package.
 package service

crm/internal/service/page.go

@@ -6,7 +6,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/titpetric/factory"
 
-	"github.com/crusttech/crust/crm/repository"
+	"github.com/crusttech/crust/crm/internal/repository"
 	"github.com/crusttech/crust/crm/types"
 )
 

crm/internal/service/permissions.go

@@ -3,7 +3,7 @@ package service
 import (
 	"context"
 
-	"github.com/crusttech/crust/crm/repository"
+	"github.com/crusttech/crust/crm/internal/repository"
 	"github.com/crusttech/crust/crm/types"
 	internalRules "github.com/crusttech/crust/internal/rules"
 	systemService "github.com/crusttech/crust/system/service"
@@ -80,7 +80,7 @@ func (p *permissions) With(ctx context.Context) PermissionsService {
 		db:  db,
 		ctx: ctx,
 
-		rules: p.rules.With(ctx),
+		rules: systemService.Rules(ctx),
 	}
 }
 

crm/internal/service/permissions_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/crusttech/crust/internal/rules"
 	. "github.com/crusttech/crust/internal/test"
 
-	"github.com/crusttech/crust/crm/repository"
+	"github.com/crusttech/crust/crm/internal/repository"
 	systemService "github.com/crusttech/crust/system/service"
 	systemTypes "github.com/crusttech/crust/system/types"
 )

crm/internal/service/record.go

@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/titpetric/factory"
 
-	"github.com/crusttech/crust/crm/repository"
+	"github.com/crusttech/crust/crm/internal/repository"
 	"github.com/crusttech/crust/crm/types"
 	"github.com/crusttech/crust/internal/auth"
 
@@ -58,7 +58,7 @@ func (svc *record) With(ctx context.Context) RecordService {
 		ctx: ctx,
 
 		prmSvc:  svc.prmSvc.With(ctx),
-		userSvc: svc.userSvc.With(ctx),
+		userSvc: systemService.User(ctx),
 
 		repository: repository.Record(ctx, db),
 		moduleRepo: repository.Module(ctx, db),

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 {

crm/internal/service/trigger.go

@@ -6,7 +6,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/titpetric/factory"
 
-	"github.com/crusttech/crust/crm/repository"
+	"github.com/crusttech/crust/crm/internal/repository"
 	"github.com/crusttech/crust/crm/types"
 )
 

crm/rest/attachment.go

@@ -3,8 +3,8 @@ package rest
 import (
 	"context"
 
+	"github.com/crusttech/crust/crm/internal/service"
 	"github.com/crusttech/crust/crm/rest/request"
-	"github.com/crusttech/crust/crm/service"
 	"github.com/crusttech/crust/crm/types"
 
 	"github.com/pkg/errors"

crm/rest/attachment_custom.go

@@ -6,8 +6,8 @@ import (
 	"net/url"
 	"time"
 
+	"github.com/crusttech/crust/crm/internal/service"
 	"github.com/crusttech/crust/crm/rest/handlers"
-	"github.com/crusttech/crust/crm/service"
 	"github.com/crusttech/crust/crm/types"
 )
 

crm/rest/chart.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/titpetric/factory/resputil"
 
+	"github.com/crusttech/crust/crm/internal/service"
 	"github.com/crusttech/crust/crm/rest/request"
-	"github.com/crusttech/crust/crm/service"
 	"github.com/crusttech/crust/crm/types"
 
 	"github.com/pkg/errors"

crm/rest/middleware.go

@@ -3,7 +3,7 @@ package rest
 import (
 	"net/http"
 
-	"github.com/crusttech/crust/crm/service"
+	"github.com/crusttech/crust/crm/internal/service"
 )
 
 func middlewareAllowedAccess(next http.Handler) http.Handler {

crm/rest/module.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/titpetric/factory/resputil"
 
+	"github.com/crusttech/crust/crm/internal/service"
 	"github.com/crusttech/crust/crm/rest/request"
-	"github.com/crusttech/crust/crm/service"
 	"github.com/crusttech/crust/crm/types"
 )
 

crm/rest/notification.go

@@ -3,8 +3,8 @@ package rest
 import (
 	"context"
 
+	"github.com/crusttech/crust/crm/internal/service"
 	"github.com/crusttech/crust/crm/rest/request"
-	"github.com/crusttech/crust/crm/service"
 	"github.com/crusttech/crust/internal/mail"
 
 	"github.com/pkg/errors"

crm/rest/page.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/titpetric/factory/resputil"
 
+	"github.com/crusttech/crust/crm/internal/service"
 	"github.com/crusttech/crust/crm/rest/request"
-	"github.com/crusttech/crust/crm/service"
 	"github.com/crusttech/crust/crm/types"
 	"github.com/crusttech/crust/internal/payload"
 )

crm/rest/permissions.go

@@ -3,8 +3,8 @@ package rest
 import (
 	"context"
 
+	"github.com/crusttech/crust/crm/internal/service"
 	"github.com/crusttech/crust/crm/rest/request"
-	"github.com/crusttech/crust/crm/service"
 
 	"github.com/pkg/errors"
 )

crm/rest/record.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/titpetric/factory/resputil"
 
+	"github.com/crusttech/crust/crm/internal/service"
 	"github.com/crusttech/crust/crm/rest/request"
-	"github.com/crusttech/crust/crm/service"
 	"github.com/crusttech/crust/crm/types"
 
 	"github.com/pkg/errors"

crm/rest/trigger.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/titpetric/factory/resputil"
 
+	"github.com/crusttech/crust/crm/internal/service"
 	"github.com/crusttech/crust/crm/rest/request"
-	"github.com/crusttech/crust/crm/service"
 	"github.com/crusttech/crust/crm/types"
 
 	"github.com/pkg/errors"

crm/start.go

@@ -12,9 +12,7 @@ import (
 
 	migrate "github.com/crusttech/crust/crm/db"
 	"github.com/crusttech/crust/internal/db"
-	systemService "github.com/crusttech/crust/system/service"
 
-	"github.com/crusttech/crust/crm/service"
 	"github.com/crusttech/crust/internal/auth"
 	"github.com/crusttech/crust/internal/mail"
 	"github.com/crusttech/crust/internal/metrics"
@@ -53,9 +51,6 @@ func Init() error {
 		},
 	})
 
-	systemService.Init()
-	service.Init()
-
 	return nil
 }
 

messaging/flags.go

@@ -4,7 +4,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/crusttech/crust/internal/config"
-	"github.com/crusttech/crust/messaging/repository"
+	"github.com/crusttech/crust/messaging/internal/repository"
 )
 
 type (

messaging/internal/service/attachment.go

@@ -17,7 +17,7 @@ import (
 	"github.com/titpetric/factory"
 
 	"github.com/crusttech/crust/internal/store"
-	"github.com/crusttech/crust/messaging/repository"
+	"github.com/crusttech/crust/messaging/internal/repository"
 	"github.com/crusttech/crust/messaging/types"
 	systemService "github.com/crusttech/crust/system/service"
 )
@@ -65,7 +65,7 @@ func (svc *attachment) With(ctx context.Context) AttachmentService {
 		ctx: ctx,
 
 		store: svc.store,
-		usr:   svc.usr.With(ctx),
+		usr:   systemService.User(ctx),
 		evl:   svc.evl.With(ctx),
 
 		attachment: repository.Attachment(ctx, db),

messaging/internal/service/attachment_mock_test.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: messaging/service/attachment.go
+// Source: messaging/internal/service/attachment.go
 
 // Package service is a generated GoMock package.
 package service

messaging/internal/service/channel.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/crusttech/crust/internal/auth"
 	"github.com/crusttech/crust/internal/organization"
-	"github.com/crusttech/crust/messaging/repository"
+	"github.com/crusttech/crust/messaging/internal/repository"
 	"github.com/crusttech/crust/messaging/types"
 	systemService "github.com/crusttech/crust/system/service"
 )
@@ -81,7 +81,7 @@ func (svc *channel) With(ctx context.Context) ChannelService {
 		db:  db,
 		ctx: ctx,
 
-		usr: svc.usr.With(ctx),
+		usr: systemService.User(ctx),
 		evl: svc.evl.With(ctx),
 		prm: svc.prm.With(ctx),
 

messaging/internal/service/channel_mock_test.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: messaging/service/channel.go
+// Source: messaging/internal/service/channel.go
 
 // Package service is a generated GoMock package.
 package service

messaging/internal/service/events.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/crusttech/crust/internal/payload"
 	"github.com/crusttech/crust/internal/payload/outgoing"
-	"github.com/crusttech/crust/messaging/repository"
+	"github.com/crusttech/crust/messaging/internal/repository"
 	"github.com/crusttech/crust/messaging/types"
 )
 

messaging/internal/service/message.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/crusttech/crust/internal/auth"
 	"github.com/crusttech/crust/internal/payload"
-	"github.com/crusttech/crust/messaging/repository"
+	"github.com/crusttech/crust/messaging/internal/repository"
 	"github.com/crusttech/crust/messaging/types"
 	systemService "github.com/crusttech/crust/system/service"
 	systemTypes "github.com/crusttech/crust/system/types"
@@ -80,7 +80,7 @@ func (svc *message) With(ctx context.Context) MessageService {
 		db:  db,
 		ctx: ctx,
 
-		usr: svc.usr.With(ctx),
+		usr: systemService.User(ctx),
 		evl: svc.evl.With(ctx),
 		prm: svc.prm.With(ctx),
 

messaging/internal/service/message_mock_test.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: messaging/service/message.go
+// Source: messaging/internal/service/message.go
 
 // Package service is a generated GoMock package.
 package service

messaging/internal/service/permissions.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/crusttech/crust/internal/auth"
 	internalRules "github.com/crusttech/crust/internal/rules"
-	"github.com/crusttech/crust/messaging/repository"
+	"github.com/crusttech/crust/messaging/internal/repository"
 	"github.com/crusttech/crust/messaging/types"
 	systemService "github.com/crusttech/crust/system/service"
 )
@@ -63,7 +63,7 @@ type (
 
 func Permissions() PermissionsService {
 	return (&permissions{
-		rules: systemService.Rules(),
+		rules: systemService.DefaultRules,
 	}).With(context.Background())
 }
 
@@ -73,7 +73,7 @@ func (p *permissions) With(ctx context.Context) PermissionsService {
 		db:  db,
 		ctx: ctx,
 
-		rules: p.rules.With(ctx),
+		rules: systemService.Rules(ctx),
 	}
 }
 

messaging/internal/service/permissions_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/crusttech/crust/internal/rules"
 	. "github.com/crusttech/crust/internal/test"
 
-	"github.com/crusttech/crust/messaging/repository"
+	"github.com/crusttech/crust/messaging/internal/repository"
 	"github.com/crusttech/crust/messaging/types"
 	systemService "github.com/crusttech/crust/system/service"
 	systemTypes "github.com/crusttech/crust/system/types"

messaging/internal/service/pubsub.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"github.com/crusttech/crust/messaging/repository"
+	"github.com/crusttech/crust/messaging/internal/repository"
 )
 
 type pubSub struct {

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 {

messaging/rest/attachment.go

@@ -2,9 +2,9 @@ package rest
 
 import (
 	"context"
+	"github.com/crusttech/crust/messaging/internal/service"
 	"github.com/crusttech/crust/messaging/rest/handlers"
 	"github.com/crusttech/crust/messaging/rest/request"
-	"github.com/crusttech/crust/messaging/service"
 	"github.com/crusttech/crust/messaging/types"
 	"github.com/pkg/errors"
 	"io"

messaging/rest/channel.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/crusttech/crust/internal/payload"
 	"github.com/crusttech/crust/internal/payload/outgoing"
+	"github.com/crusttech/crust/messaging/internal/service"
 	"github.com/crusttech/crust/messaging/rest/request"
-	"github.com/crusttech/crust/messaging/service"
 	"github.com/crusttech/crust/messaging/types"
 	"github.com/pkg/errors"
 )

messaging/rest/message.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/crusttech/crust/internal/payload"
 	"github.com/crusttech/crust/internal/payload/outgoing"
+	"github.com/crusttech/crust/messaging/internal/service"
 	"github.com/crusttech/crust/messaging/rest/request"
-	"github.com/crusttech/crust/messaging/service"
 	"github.com/crusttech/crust/messaging/types"
 )
 

messaging/rest/middleware.go

@@ -3,7 +3,7 @@ package rest
 import (
 	"net/http"
 
-	"github.com/crusttech/crust/messaging/service"
+	"github.com/crusttech/crust/messaging/internal/service"
 )
 
 func middlewareAllowedAccess(next http.Handler) http.Handler {

messaging/rest/permissions.go

@@ -3,8 +3,8 @@ package rest
 import (
 	"context"
 
+	"github.com/crusttech/crust/messaging/internal/service"
 	"github.com/crusttech/crust/messaging/rest/request"
-	"github.com/crusttech/crust/messaging/service"
 	"github.com/pkg/errors"
 )
 

messaging/rest/search.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/crusttech/crust/internal/payload"
 	"github.com/crusttech/crust/internal/payload/outgoing"
+	"github.com/crusttech/crust/messaging/internal/service"
 	"github.com/crusttech/crust/messaging/rest/request"
-	"github.com/crusttech/crust/messaging/service"
 	"github.com/crusttech/crust/messaging/types"
 
 	"github.com/pkg/errors"

messaging/start.go

@@ -12,12 +12,10 @@ import (
 
 	"github.com/crusttech/crust/internal/db"
 	migrate "github.com/crusttech/crust/messaging/db"
-	systemService "github.com/crusttech/crust/system/service"
 
 	"github.com/crusttech/crust/internal/auth"
 	"github.com/crusttech/crust/internal/mail"
 	"github.com/crusttech/crust/internal/metrics"
-	"github.com/crusttech/crust/messaging/service"
 )
 
 var (
@@ -53,9 +51,6 @@ func Init() error {
 		},
 	})
 
-	systemService.Init()
-	service.Init()
-
 	return nil
 }