From aa5fc27d853738b0686c1c5fdec820d85f8a8cd4 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Sun, 8 Sep 2019 09:55:19 +0200 Subject: [PATCH] Remove internal/ from messaging --- Makefile | 4 ++-- messaging/autosetup.go | 4 ++-- messaging/messaging.go | 2 +- messaging/{internal => }/repository/attachment.go | 0 messaging/{internal => }/repository/attachment_test.go | 0 messaging/{internal => }/repository/channel.go | 0 messaging/{internal => }/repository/channel_member.go | 0 messaging/{internal => }/repository/channel_test.go | 0 messaging/{internal => }/repository/error.go | 0 messaging/{internal => }/repository/events.go | 0 messaging/{internal => }/repository/events_test.go | 0 messaging/{internal => }/repository/main_test.go | 0 messaging/{internal => }/repository/mention.go | 0 messaging/{internal => }/repository/message.go | 0 messaging/{internal => }/repository/message_flag.go | 0 messaging/{internal => }/repository/message_flag_test.go | 0 messaging/{internal => }/repository/message_test.go | 0 messaging/{internal => }/repository/pubsub.go | 0 messaging/{internal => }/repository/pubsub_memory.go | 0 messaging/{internal => }/repository/pubsub_memory_test.go | 0 messaging/{internal => }/repository/pubsub_redis.go | 0 messaging/{internal => }/repository/repository.go | 0 messaging/{internal => }/repository/repository_test.go | 0 messaging/{internal => }/repository/unread.go | 0 messaging/{internal => }/repository/util.go | 0 messaging/{internal => }/repository/webhook.go | 0 messaging/rest/activity.go | 2 +- messaging/rest/attachment.go | 4 ++-- messaging/rest/channel.go | 2 +- messaging/rest/message.go | 2 +- messaging/rest/middleware.go | 2 +- messaging/rest/permissions.go | 2 +- messaging/rest/search.go | 2 +- messaging/rest/webhooks.go | 2 +- messaging/rest/webhooks_public.go | 2 +- messaging/{internal => }/service/access_control.go | 0 messaging/{internal => }/service/attachment.go | 2 +- messaging/{internal => }/service/channel.go | 2 +- messaging/{internal => }/service/channel_test.go | 0 messaging/{internal => }/service/command.go | 0 messaging/{internal => }/service/error.go | 0 messaging/{internal => }/service/event.go | 2 +- messaging/{internal => }/service/main_test.go | 0 messaging/{internal => }/service/message.go | 2 +- messaging/{internal => }/service/message_test.go | 0 messaging/{internal => }/service/service.go | 2 +- messaging/{internal => }/service/webhook.go | 2 +- messaging/{internal => }/service/webhook_fortune_test.go | 0 messaging/{internal => }/service/webhook_test.go | 2 +- messaging/websocket/event_queue.go | 2 +- messaging/websocket/router.go | 4 ++-- messaging/websocket/session.go | 2 +- messaging/websocket/session_outgoing.go | 2 +- 53 files changed, 27 insertions(+), 27 deletions(-) rename messaging/{internal => }/repository/attachment.go (100%) rename messaging/{internal => }/repository/attachment_test.go (100%) rename messaging/{internal => }/repository/channel.go (100%) rename messaging/{internal => }/repository/channel_member.go (100%) rename messaging/{internal => }/repository/channel_test.go (100%) rename messaging/{internal => }/repository/error.go (100%) rename messaging/{internal => }/repository/events.go (100%) rename messaging/{internal => }/repository/events_test.go (100%) rename messaging/{internal => }/repository/main_test.go (100%) rename messaging/{internal => }/repository/mention.go (100%) rename messaging/{internal => }/repository/message.go (100%) rename messaging/{internal => }/repository/message_flag.go (100%) rename messaging/{internal => }/repository/message_flag_test.go (100%) rename messaging/{internal => }/repository/message_test.go (100%) rename messaging/{internal => }/repository/pubsub.go (100%) rename messaging/{internal => }/repository/pubsub_memory.go (100%) rename messaging/{internal => }/repository/pubsub_memory_test.go (100%) rename messaging/{internal => }/repository/pubsub_redis.go (100%) rename messaging/{internal => }/repository/repository.go (100%) rename messaging/{internal => }/repository/repository_test.go (100%) rename messaging/{internal => }/repository/unread.go (100%) rename messaging/{internal => }/repository/util.go (100%) rename messaging/{internal => }/repository/webhook.go (100%) rename messaging/{internal => }/service/access_control.go (100%) rename messaging/{internal => }/service/attachment.go (99%) rename messaging/{internal => }/service/channel.go (99%) rename messaging/{internal => }/service/channel_test.go (100%) rename messaging/{internal => }/service/command.go (100%) rename messaging/{internal => }/service/error.go (100%) rename messaging/{internal => }/service/event.go (98%) rename messaging/{internal => }/service/main_test.go (100%) rename messaging/{internal => }/service/message.go (99%) rename messaging/{internal => }/service/message_test.go (100%) rename messaging/{internal => }/service/service.go (95%) rename messaging/{internal => }/service/webhook.go (98%) rename messaging/{internal => }/service/webhook_fortune_test.go (100%) rename messaging/{internal => }/service/webhook_test.go (97%) diff --git a/Makefile b/Makefile index fe3bcba5b..bff515a98 100644 --- a/Makefile +++ b/Makefile @@ -114,12 +114,12 @@ test.messaging: $(GO) tool cover -func=.cover.out | grep --color "^\|[^0-9]0.0%" test.pubsub: - $(GOTEST) -run PubSubMemory -covermode count -coverprofile .cover.out -v ./messaging/internal/repository/pubsub*.go ./messaging/internal/repository/flags*.go ./messaging/internal/repository/error*.go + $(GOTEST) -run PubSubMemory -covermode count -coverprofile .cover.out -v ./messaging/repository/pubsub*.go ./messaging/repository/flags*.go ./messaging/repository/error*.go perl -pi -e 's/command-line-arguments/.\/messaging\/internal\/repository/g' .cover.out $(GO) tool cover -func=.cover.out | grep --color "^\|[^0-9]0.0%" test.events: - $(GOTEST) -run Events -covermode count -coverprofile .cover.out -v ./messaging/internal/repository/events*.go ./messaging/internal/repository/flags*.go ./messaging/internal/repository/error*.go + $(GOTEST) -run Events -covermode count -coverprofile .cover.out -v ./messaging/repository/events*.go ./messaging/repository/flags*.go ./messaging/repository/error*.go perl -pi -e 's/command-line-arguments/.\/messaging\/internal\/repository/g' .cover.out $(GO) tool cover -func=.cover.out | grep --color "^\|[^0-9]0.0%" diff --git a/messaging/autosetup.go b/messaging/autosetup.go index 2d294c49d..deb8d7f85 100644 --- a/messaging/autosetup.go +++ b/messaging/autosetup.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" "github.com/titpetric/factory" - "github.com/cortezaproject/corteza-server/messaging/internal/repository" - "github.com/cortezaproject/corteza-server/messaging/internal/service" + "github.com/cortezaproject/corteza-server/messaging/repository" + "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/messaging/types" "github.com/cortezaproject/corteza-server/pkg/cli" ) diff --git a/messaging/messaging.go b/messaging/messaging.go index eee8da2c7..149de5f75 100644 --- a/messaging/messaging.go +++ b/messaging/messaging.go @@ -9,8 +9,8 @@ import ( "github.com/titpetric/factory" migrate "github.com/cortezaproject/corteza-server/messaging/db" - "github.com/cortezaproject/corteza-server/messaging/internal/service" "github.com/cortezaproject/corteza-server/messaging/rest" + "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/messaging/websocket" "github.com/cortezaproject/corteza-server/pkg/cli" "github.com/cortezaproject/corteza-server/pkg/cli/options" diff --git a/messaging/internal/repository/attachment.go b/messaging/repository/attachment.go similarity index 100% rename from messaging/internal/repository/attachment.go rename to messaging/repository/attachment.go diff --git a/messaging/internal/repository/attachment_test.go b/messaging/repository/attachment_test.go similarity index 100% rename from messaging/internal/repository/attachment_test.go rename to messaging/repository/attachment_test.go diff --git a/messaging/internal/repository/channel.go b/messaging/repository/channel.go similarity index 100% rename from messaging/internal/repository/channel.go rename to messaging/repository/channel.go diff --git a/messaging/internal/repository/channel_member.go b/messaging/repository/channel_member.go similarity index 100% rename from messaging/internal/repository/channel_member.go rename to messaging/repository/channel_member.go diff --git a/messaging/internal/repository/channel_test.go b/messaging/repository/channel_test.go similarity index 100% rename from messaging/internal/repository/channel_test.go rename to messaging/repository/channel_test.go diff --git a/messaging/internal/repository/error.go b/messaging/repository/error.go similarity index 100% rename from messaging/internal/repository/error.go rename to messaging/repository/error.go diff --git a/messaging/internal/repository/events.go b/messaging/repository/events.go similarity index 100% rename from messaging/internal/repository/events.go rename to messaging/repository/events.go diff --git a/messaging/internal/repository/events_test.go b/messaging/repository/events_test.go similarity index 100% rename from messaging/internal/repository/events_test.go rename to messaging/repository/events_test.go diff --git a/messaging/internal/repository/main_test.go b/messaging/repository/main_test.go similarity index 100% rename from messaging/internal/repository/main_test.go rename to messaging/repository/main_test.go diff --git a/messaging/internal/repository/mention.go b/messaging/repository/mention.go similarity index 100% rename from messaging/internal/repository/mention.go rename to messaging/repository/mention.go diff --git a/messaging/internal/repository/message.go b/messaging/repository/message.go similarity index 100% rename from messaging/internal/repository/message.go rename to messaging/repository/message.go diff --git a/messaging/internal/repository/message_flag.go b/messaging/repository/message_flag.go similarity index 100% rename from messaging/internal/repository/message_flag.go rename to messaging/repository/message_flag.go diff --git a/messaging/internal/repository/message_flag_test.go b/messaging/repository/message_flag_test.go similarity index 100% rename from messaging/internal/repository/message_flag_test.go rename to messaging/repository/message_flag_test.go diff --git a/messaging/internal/repository/message_test.go b/messaging/repository/message_test.go similarity index 100% rename from messaging/internal/repository/message_test.go rename to messaging/repository/message_test.go diff --git a/messaging/internal/repository/pubsub.go b/messaging/repository/pubsub.go similarity index 100% rename from messaging/internal/repository/pubsub.go rename to messaging/repository/pubsub.go diff --git a/messaging/internal/repository/pubsub_memory.go b/messaging/repository/pubsub_memory.go similarity index 100% rename from messaging/internal/repository/pubsub_memory.go rename to messaging/repository/pubsub_memory.go diff --git a/messaging/internal/repository/pubsub_memory_test.go b/messaging/repository/pubsub_memory_test.go similarity index 100% rename from messaging/internal/repository/pubsub_memory_test.go rename to messaging/repository/pubsub_memory_test.go diff --git a/messaging/internal/repository/pubsub_redis.go b/messaging/repository/pubsub_redis.go similarity index 100% rename from messaging/internal/repository/pubsub_redis.go rename to messaging/repository/pubsub_redis.go diff --git a/messaging/internal/repository/repository.go b/messaging/repository/repository.go similarity index 100% rename from messaging/internal/repository/repository.go rename to messaging/repository/repository.go diff --git a/messaging/internal/repository/repository_test.go b/messaging/repository/repository_test.go similarity index 100% rename from messaging/internal/repository/repository_test.go rename to messaging/repository/repository_test.go diff --git a/messaging/internal/repository/unread.go b/messaging/repository/unread.go similarity index 100% rename from messaging/internal/repository/unread.go rename to messaging/repository/unread.go diff --git a/messaging/internal/repository/util.go b/messaging/repository/util.go similarity index 100% rename from messaging/internal/repository/util.go rename to messaging/repository/util.go diff --git a/messaging/internal/repository/webhook.go b/messaging/repository/webhook.go similarity index 100% rename from messaging/internal/repository/webhook.go rename to messaging/repository/webhook.go diff --git a/messaging/rest/activity.go b/messaging/rest/activity.go index 7cb315837..14dd92a1b 100644 --- a/messaging/rest/activity.go +++ b/messaging/rest/activity.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" "github.com/cortezaproject/corteza-server/internal/auth" - "github.com/cortezaproject/corteza-server/messaging/internal/service" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/messaging/types" ) diff --git a/messaging/rest/attachment.go b/messaging/rest/attachment.go index 791a97491..074d213ac 100644 --- a/messaging/rest/attachment.go +++ b/messaging/rest/attachment.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" "github.com/cortezaproject/corteza-server/internal/auth" - "github.com/cortezaproject/corteza-server/messaging/internal/repository" - "github.com/cortezaproject/corteza-server/messaging/internal/service" + "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/messaging/service" ) var _ = errors.Wrap diff --git a/messaging/rest/channel.go b/messaging/rest/channel.go index 9f21d78ac..9556d36da 100644 --- a/messaging/rest/channel.go +++ b/messaging/rest/channel.go @@ -6,8 +6,8 @@ import ( "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/payload" "github.com/cortezaproject/corteza-server/internal/payload/outgoing" - "github.com/cortezaproject/corteza-server/messaging/internal/service" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/messaging/types" "github.com/pkg/errors" "github.com/titpetric/factory/resputil" diff --git a/messaging/rest/message.go b/messaging/rest/message.go index f04c95746..6db179a39 100644 --- a/messaging/rest/message.go +++ b/messaging/rest/message.go @@ -8,8 +8,8 @@ import ( "github.com/cortezaproject/corteza-server/internal/payload" "github.com/cortezaproject/corteza-server/internal/payload/outgoing" - "github.com/cortezaproject/corteza-server/messaging/internal/service" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/messaging/types" ) diff --git a/messaging/rest/middleware.go b/messaging/rest/middleware.go index 4ea438f23..69dedd72c 100644 --- a/messaging/rest/middleware.go +++ b/messaging/rest/middleware.go @@ -3,7 +3,7 @@ package rest import ( "net/http" - "github.com/cortezaproject/corteza-server/messaging/internal/service" + "github.com/cortezaproject/corteza-server/messaging/service" ) func middlewareAllowedAccess(next http.Handler) http.Handler { diff --git a/messaging/rest/permissions.go b/messaging/rest/permissions.go index 358ceb912..7bbb34200 100644 --- a/messaging/rest/permissions.go +++ b/messaging/rest/permissions.go @@ -6,8 +6,8 @@ import ( "github.com/titpetric/factory/resputil" "github.com/cortezaproject/corteza-server/internal/permissions" - "github.com/cortezaproject/corteza-server/messaging/internal/service" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/messaging/service" ) type ( diff --git a/messaging/rest/search.go b/messaging/rest/search.go index 5d75e49ac..bb47336cc 100644 --- a/messaging/rest/search.go +++ b/messaging/rest/search.go @@ -5,8 +5,8 @@ import ( "github.com/cortezaproject/corteza-server/internal/payload" "github.com/cortezaproject/corteza-server/internal/payload/outgoing" - "github.com/cortezaproject/corteza-server/messaging/internal/service" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/messaging/types" "github.com/pkg/errors" diff --git a/messaging/rest/webhooks.go b/messaging/rest/webhooks.go index cc5132bf0..4ddf850ae 100644 --- a/messaging/rest/webhooks.go +++ b/messaging/rest/webhooks.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" "github.com/cortezaproject/corteza-server/internal/store" - "github.com/cortezaproject/corteza-server/messaging/internal/service" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/messaging/types" ) diff --git a/messaging/rest/webhooks_public.go b/messaging/rest/webhooks_public.go index 54526425c..552cc72f9 100644 --- a/messaging/rest/webhooks_public.go +++ b/messaging/rest/webhooks_public.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" "github.com/cortezaproject/corteza-server/internal/store" - "github.com/cortezaproject/corteza-server/messaging/internal/service" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/messaging/service" ) var _ = errors.Wrap diff --git a/messaging/internal/service/access_control.go b/messaging/service/access_control.go similarity index 100% rename from messaging/internal/service/access_control.go rename to messaging/service/access_control.go diff --git a/messaging/internal/service/attachment.go b/messaging/service/attachment.go similarity index 99% rename from messaging/internal/service/attachment.go rename to messaging/service/attachment.go index e61bcdd1c..cf9ef69de 100644 --- a/messaging/internal/service/attachment.go +++ b/messaging/service/attachment.go @@ -18,7 +18,7 @@ import ( "go.uber.org/zap/zapcore" "github.com/cortezaproject/corteza-server/internal/store" - "github.com/cortezaproject/corteza-server/messaging/internal/repository" + "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/types" "github.com/cortezaproject/corteza-server/pkg/logger" ) diff --git a/messaging/internal/service/channel.go b/messaging/service/channel.go similarity index 99% rename from messaging/internal/service/channel.go rename to messaging/service/channel.go index d084b56ea..c7ad1e207 100644 --- a/messaging/internal/service/channel.go +++ b/messaging/service/channel.go @@ -9,7 +9,7 @@ import ( "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/organization" - "github.com/cortezaproject/corteza-server/messaging/internal/repository" + "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/types" ) diff --git a/messaging/internal/service/channel_test.go b/messaging/service/channel_test.go similarity index 100% rename from messaging/internal/service/channel_test.go rename to messaging/service/channel_test.go diff --git a/messaging/internal/service/command.go b/messaging/service/command.go similarity index 100% rename from messaging/internal/service/command.go rename to messaging/service/command.go diff --git a/messaging/internal/service/error.go b/messaging/service/error.go similarity index 100% rename from messaging/internal/service/error.go rename to messaging/service/error.go diff --git a/messaging/internal/service/event.go b/messaging/service/event.go similarity index 98% rename from messaging/internal/service/event.go rename to messaging/service/event.go index 01e3d83c4..ccac550db 100644 --- a/messaging/internal/service/event.go +++ b/messaging/service/event.go @@ -7,7 +7,7 @@ import ( "github.com/cortezaproject/corteza-server/internal/payload" "github.com/cortezaproject/corteza-server/internal/payload/outgoing" - "github.com/cortezaproject/corteza-server/messaging/internal/repository" + "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/types" ) diff --git a/messaging/internal/service/main_test.go b/messaging/service/main_test.go similarity index 100% rename from messaging/internal/service/main_test.go rename to messaging/service/main_test.go diff --git a/messaging/internal/service/message.go b/messaging/service/message.go similarity index 99% rename from messaging/internal/service/message.go rename to messaging/service/message.go index e0761ed9b..4dcb4f70a 100644 --- a/messaging/internal/service/message.go +++ b/messaging/service/message.go @@ -11,7 +11,7 @@ import ( "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/payload" - "github.com/cortezaproject/corteza-server/messaging/internal/repository" + "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/types" ) diff --git a/messaging/internal/service/message_test.go b/messaging/service/message_test.go similarity index 100% rename from messaging/internal/service/message_test.go rename to messaging/service/message_test.go diff --git a/messaging/internal/service/service.go b/messaging/service/service.go similarity index 95% rename from messaging/internal/service/service.go rename to messaging/service/service.go index 00dd76c44..a8793b1ac 100644 --- a/messaging/internal/service/service.go +++ b/messaging/service/service.go @@ -9,7 +9,7 @@ import ( "github.com/cortezaproject/corteza-server/internal/http" "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/internal/store" - "github.com/cortezaproject/corteza-server/messaging/internal/repository" + "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/pkg/cli/options" ) diff --git a/messaging/internal/service/webhook.go b/messaging/service/webhook.go similarity index 98% rename from messaging/internal/service/webhook.go rename to messaging/service/webhook.go index 9834061ec..1bab64609 100644 --- a/messaging/internal/service/webhook.go +++ b/messaging/service/webhook.go @@ -14,7 +14,7 @@ import ( "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/http" "github.com/cortezaproject/corteza-server/internal/store" - "github.com/cortezaproject/corteza-server/messaging/internal/repository" + "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/types" ) diff --git a/messaging/internal/service/webhook_fortune_test.go b/messaging/service/webhook_fortune_test.go similarity index 100% rename from messaging/internal/service/webhook_fortune_test.go rename to messaging/service/webhook_fortune_test.go diff --git a/messaging/internal/service/webhook_test.go b/messaging/service/webhook_test.go similarity index 97% rename from messaging/internal/service/webhook_test.go rename to messaging/service/webhook_test.go index f5f7afc88..55131318c 100644 --- a/messaging/internal/service/webhook_test.go +++ b/messaging/service/webhook_test.go @@ -11,7 +11,7 @@ import ( "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/http" "github.com/cortezaproject/corteza-server/internal/test" - "github.com/cortezaproject/corteza-server/messaging/internal/repository" + "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/types" ) diff --git a/messaging/websocket/event_queue.go b/messaging/websocket/event_queue.go index 0a2817b2f..de9383ca5 100644 --- a/messaging/websocket/event_queue.go +++ b/messaging/websocket/event_queue.go @@ -9,7 +9,7 @@ import ( "github.com/cortezaproject/corteza-server/internal/payload" "github.com/cortezaproject/corteza-server/internal/payload/outgoing" - "github.com/cortezaproject/corteza-server/messaging/internal/repository" + "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/types" "github.com/cortezaproject/corteza-server/pkg/sentry" ) diff --git a/messaging/websocket/router.go b/messaging/websocket/router.go index 9d90e3e67..292e1db0d 100644 --- a/messaging/websocket/router.go +++ b/messaging/websocket/router.go @@ -7,8 +7,8 @@ import ( "github.com/go-chi/chi" "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/messaging/internal/repository" - "github.com/cortezaproject/corteza-server/messaging/internal/service" + "github.com/cortezaproject/corteza-server/messaging/repository" + "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/pkg/sentry" ) diff --git a/messaging/websocket/session.go b/messaging/websocket/session.go index cda82b941..7f86c6592 100644 --- a/messaging/websocket/session.go +++ b/messaging/websocket/session.go @@ -13,7 +13,7 @@ import ( "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/payload" "github.com/cortezaproject/corteza-server/internal/payload/outgoing" - "github.com/cortezaproject/corteza-server/messaging/internal/service" + "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/messaging/types" "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/pkg/sentry" diff --git a/messaging/websocket/session_outgoing.go b/messaging/websocket/session_outgoing.go index bb9d5d756..24dcf0813 100644 --- a/messaging/websocket/session_outgoing.go +++ b/messaging/websocket/session_outgoing.go @@ -3,7 +3,7 @@ package websocket import ( "time" - "github.com/cortezaproject/corteza-server/messaging/internal/repository" + "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/types" "github.com/cortezaproject/corteza-server/pkg/logger" )