upd(messaging): update import paths

cmd/messaging/main.go

@@ -4,7 +4,7 @@ import (
 	"log"
 	"os"
 
-	service "github.com/crusttech/crust/sam"
+	service "github.com/crusttech/crust/messaging"
 
 	"github.com/crusttech/crust/internal/auth"
 	"github.com/crusttech/crust/internal/rbac"

cmd/system-cli/users.go

@@ -9,7 +9,7 @@ import (
 
 	crmRepository "github.com/crusttech/crust/crm/repository"
 	"github.com/crusttech/crust/internal/payload"
-	messagingRepository "github.com/crusttech/crust/sam/repository"
+	messagingRepository "github.com/crusttech/crust/messaging/repository"
 	"github.com/crusttech/crust/system/service"
 	"github.com/crusttech/crust/system/types"
 )

internal/payload/outgoing.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/crusttech/crust/internal/auth"
 	"github.com/crusttech/crust/internal/payload/outgoing"
-	samTypes "github.com/crusttech/crust/sam/types"
+	samTypes "github.com/crusttech/crust/messaging/types"
 	systemTypes "github.com/crusttech/crust/system/types"
 )
 

messaging/db/migrate.go

@@ -13,7 +13,7 @@ import (
 	"github.com/titpetric/factory"
 	"github.com/titpetric/statik/fs"
 
-	"github.com/crusttech/crust/sam/db/mysql"
+	"github.com/crusttech/crust/messaging/db/mysql"
 )
 
 func statements(contents []byte, err error) ([]string, error) {

messaging/flags.go

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

messaging/repository/attachment.go

@@ -7,7 +7,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/titpetric/factory"
 
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 type (

messaging/repository/attachment_test.go

@@ -7,7 +7,7 @@ import (
 
 	"testing"
 
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 func TestAttachment(t *testing.T) {

messaging/repository/channel.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/titpetric/factory"
 
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 type (

messaging/repository/channel_member.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/titpetric/factory"
 
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 type (

messaging/repository/channel_test.go

@@ -7,7 +7,7 @@ import (
 
 	"testing"
 
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 func TestChannel(t *testing.T) {

messaging/repository/events.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/titpetric/factory"
 
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 /*

messaging/repository/events_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 func TestEvents(t *testing.T) {

messaging/repository/main_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/namsral/flag"
 	"github.com/titpetric/factory"
 
-	samMigrate "github.com/crusttech/crust/sam/db"
+	samMigrate "github.com/crusttech/crust/messaging/db"
 	systemMigrate "github.com/crusttech/crust/system/db"
 )
 

messaging/repository/mention.go

@@ -8,7 +8,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/titpetric/factory"
 
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 type (

messaging/repository/message.go

@@ -8,7 +8,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/titpetric/factory"
 
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 type (

messaging/repository/message_flag.go

@@ -7,7 +7,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/titpetric/factory"
 
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 type (

messaging/repository/message_flag_test.go

@@ -7,7 +7,7 @@ import (
 
 	"testing"
 
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 func TestReaction(t *testing.T) {

messaging/repository/message_test.go

@@ -7,7 +7,7 @@ import (
 
 	"testing"
 
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 func TestMessage(t *testing.T) {

messaging/repository/unread.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/titpetric/factory"
 
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 type (

messaging/rest/attachment.go

@@ -2,10 +2,10 @@ package rest
 
 import (
 	"context"
-	"github.com/crusttech/crust/sam/rest/handlers"
-	"github.com/crusttech/crust/sam/rest/request"
-	"github.com/crusttech/crust/sam/service"
-	"github.com/crusttech/crust/sam/types"
+	"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"
 	"time"

messaging/rest/channel.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/crusttech/crust/internal/payload"
 	"github.com/crusttech/crust/internal/payload/outgoing"
-	"github.com/crusttech/crust/sam/rest/request"
-	"github.com/crusttech/crust/sam/service"
-	"github.com/crusttech/crust/sam/types"
+	"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/handlers/attachment.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/titpetric/factory/resputil"
 
-	"github.com/crusttech/crust/sam/rest/request"
+	"github.com/crusttech/crust/messaging/rest/request"
 )
 
 // Internal API interface

messaging/rest/handlers/attachment_custom.go

@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/crusttech/crust/sam/rest/request"
+	"github.com/crusttech/crust/messaging/rest/request"
 )
 
 // HTTP API interface

messaging/rest/handlers/channel.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/titpetric/factory/resputil"
 
-	"github.com/crusttech/crust/sam/rest/request"
+	"github.com/crusttech/crust/messaging/rest/request"
 )
 
 // Internal API interface

messaging/rest/handlers/message.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/titpetric/factory/resputil"
 
-	"github.com/crusttech/crust/sam/rest/request"
+	"github.com/crusttech/crust/messaging/rest/request"
 )
 
 // Internal API interface

messaging/rest/handlers/permissions.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/titpetric/factory/resputil"
 
-	"github.com/crusttech/crust/sam/rest/request"
+	"github.com/crusttech/crust/messaging/rest/request"
 )
 
 // Internal API interface

messaging/rest/handlers/search.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/titpetric/factory/resputil"
 
-	"github.com/crusttech/crust/sam/rest/request"
+	"github.com/crusttech/crust/messaging/rest/request"
 )
 
 // Internal API interface

messaging/rest/message.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/crusttech/crust/internal/payload"
 	"github.com/crusttech/crust/internal/payload/outgoing"
-	"github.com/crusttech/crust/sam/rest/request"
-	"github.com/crusttech/crust/sam/service"
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/rest/request"
+	"github.com/crusttech/crust/messaging/service"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 var _ = errors.Wrap

messaging/rest/permissions.go

@@ -3,9 +3,9 @@ package rest
 import (
 	"context"
 
-	"github.com/crusttech/crust/sam/rest/request"
-	"github.com/crusttech/crust/sam/service"
-	_ "github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/rest/request"
+	"github.com/crusttech/crust/messaging/service"
+	_ "github.com/crusttech/crust/messaging/types"
 )
 
 type Permissions struct {

messaging/rest/router.go

@@ -4,7 +4,7 @@ import (
 	"github.com/go-chi/chi"
 
 	"github.com/crusttech/crust/internal/auth"
-	"github.com/crusttech/crust/sam/rest/handlers"
+	"github.com/crusttech/crust/messaging/rest/handlers"
 )
 
 func MountRoutes() func(chi.Router) {

messaging/rest/search.go

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

messaging/routes.go

@@ -16,8 +16,8 @@ import (
 	"github.com/crusttech/crust/internal/config"
 	"github.com/crusttech/crust/internal/metrics"
 	"github.com/crusttech/crust/internal/version"
-	"github.com/crusttech/crust/sam/rest"
-	"github.com/crusttech/crust/sam/websocket"
+	"github.com/crusttech/crust/messaging/rest"
+	"github.com/crusttech/crust/messaging/websocket"
 )
 
 func Routes(ctx context.Context) *chi.Mux {

messaging/service/attachment.go

@@ -17,8 +17,8 @@ import (
 	"github.com/titpetric/factory"
 
 	"github.com/crusttech/crust/internal/store"
-	"github.com/crusttech/crust/sam/repository"
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/repository"
+	"github.com/crusttech/crust/messaging/types"
 	systemService "github.com/crusttech/crust/system/service"
 )
 

messaging/service/attachment_mock_test.go

@@ -6,7 +6,7 @@ package service
 
 import (
 	context "context"
-	types "github.com/crusttech/crust/sam/types"
+	types "github.com/crusttech/crust/messaging/types"
 	gomock "github.com/golang/mock/gomock"
 	io "io"
 	reflect "reflect"

messaging/service/channel.go

@@ -8,8 +8,8 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/crusttech/crust/internal/auth"
-	"github.com/crusttech/crust/sam/repository"
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/repository"
+	"github.com/crusttech/crust/messaging/types"
 	systemService "github.com/crusttech/crust/system/service"
 )
 

messaging/service/channel_mock_test.go

@@ -6,7 +6,7 @@ package service
 
 import (
 	context "context"
-	types "github.com/crusttech/crust/sam/types"
+	types "github.com/crusttech/crust/messaging/types"
 	gomock "github.com/golang/mock/gomock"
 	reflect "reflect"
 )

messaging/service/channel_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/crusttech/crust/internal/auth"
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 	systemTypes "github.com/crusttech/crust/system/types"
 )
 

messaging/service/events.go

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

messaging/service/message.go

@@ -8,8 +8,8 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/crusttech/crust/internal/payload"
-	"github.com/crusttech/crust/sam/repository"
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/repository"
+	"github.com/crusttech/crust/messaging/types"
 	systemService "github.com/crusttech/crust/system/service"
 	systemTypes "github.com/crusttech/crust/system/types"
 )

messaging/service/message_mock_test.go

@@ -6,7 +6,7 @@ package service
 
 import (
 	context "context"
-	types "github.com/crusttech/crust/sam/types"
+	types "github.com/crusttech/crust/messaging/types"
 	gomock "github.com/golang/mock/gomock"
 	reflect "reflect"
 )

messaging/service/message_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/crusttech/crust/internal/auth"
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 	systemTypes "github.com/crusttech/crust/system/types"
 )
 

messaging/service/permissions.go

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

messaging/service/pubsub.go

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

messaging/start.go

@@ -13,14 +13,14 @@ import (
 	"github.com/titpetric/factory/resputil"
 
 	"github.com/crusttech/crust/internal/db"
-	migrate "github.com/crusttech/crust/sam/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/internal/version"
-	"github.com/crusttech/crust/sam/service"
+	"github.com/crusttech/crust/messaging/service"
 )
 
 var (

messaging/types/channel.perms.gen.go

@@ -2,7 +2,7 @@ package types
 
 import "github.com/crusttech/crust/internal/rules"
 
-/* File is generated from sam/types/permissions/3-channel.json with permissions.go */
+/* File is generated from messaging/types/permissions/3-channel.json with permissions.go */
 
 func (c *Channel) Permissions() []rules.OperationGroup {
 	return []rules.OperationGroup{

messaging/types/organisation.perms.gen.go

@@ -2,7 +2,7 @@ package types
 
 import "github.com/crusttech/crust/internal/rules"
 
-/* File is generated from sam/types/permissions/1-organisation.json with permissions.go */
+/* File is generated from messaging/types/permissions/1-organisation.json with permissions.go */
 
 func (c *Organisation) Permissions() []rules.OperationGroup {
 	return []rules.OperationGroup{

messaging/types/team.perms.gen.go

@@ -2,7 +2,7 @@ package types
 
 import "github.com/crusttech/crust/internal/rules"
 
-/* File is generated from sam/types/permissions/2-team.json with permissions.go */
+/* File is generated from messaging/types/permissions/2-team.json with permissions.go */
 
 func (c *Team) Permissions() []rules.OperationGroup {
 	return []rules.OperationGroup{

messaging/websocket/event_queue.go

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

messaging/websocket/router.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-chi/chi"
 
-	"github.com/crusttech/crust/sam/repository"
+	"github.com/crusttech/crust/messaging/repository"
 )
 
 func MountRoutes(ctx context.Context, config *repository.Flags) func(chi.Router) {

messaging/websocket/session.go

@@ -12,9 +12,9 @@ import (
 	"github.com/crusttech/crust/internal/auth"
 	"github.com/crusttech/crust/internal/payload"
 	"github.com/crusttech/crust/internal/payload/outgoing"
-	"github.com/crusttech/crust/sam/repository"
-	samService "github.com/crusttech/crust/sam/service"
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/repository"
+	samService "github.com/crusttech/crust/messaging/service"
+	"github.com/crusttech/crust/messaging/types"
 	systemService "github.com/crusttech/crust/system/service"
 	systemTypes "github.com/crusttech/crust/system/types"
 )

messaging/websocket/session_incoming_channel.go

@@ -7,7 +7,7 @@ import (
 	"github.com/crusttech/crust/internal/payload"
 	"github.com/crusttech/crust/internal/payload/incoming"
 	"github.com/crusttech/crust/internal/payload/outgoing"
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 func (s *Session) channelJoin(ctx context.Context, p *incoming.ChannelJoin) error {

messaging/websocket/session_incoming_command.go

@@ -10,7 +10,7 @@ import (
 	"github.com/crusttech/crust/internal/payload"
 	"github.com/crusttech/crust/internal/payload/incoming"
 	"github.com/crusttech/crust/internal/payload/outgoing"
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 func (s *Session) execCommand(ctx context.Context, c *incoming.ExecCommand) error {

messaging/websocket/session_incoming_message.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/crusttech/crust/internal/payload"
 	"github.com/crusttech/crust/internal/payload/incoming"
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 func (s *Session) messageCreate(ctx context.Context, p *incoming.MessageCreate) error {

messaging/websocket/session_outgoing.go

@@ -4,8 +4,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/crusttech/crust/sam/repository"
-	"github.com/crusttech/crust/sam/types"
+	"github.com/crusttech/crust/messaging/repository"
+	"github.com/crusttech/crust/messaging/types"
 )
 
 // Sends message to subscribers

messaging/websocket/websocket.go

@@ -9,7 +9,7 @@ import (
 	"github.com/titpetric/factory/resputil"
 
 	"github.com/crusttech/crust/internal/auth"
-	"github.com/crusttech/crust/sam/repository"
+	"github.com/crusttech/crust/messaging/repository"
 	systemService "github.com/crusttech/crust/system/service"
 )