aplied renamer

cmd/main.go

@@ -3,9 +3,9 @@ package main
 import (
 	"context"
 	"fmt"
+	"gitea.pena/PenaSide/heruvym/internal/app"
+	"gitea.pena/PenaSide/heruvym/internal/initialize"
 	_ "gitea.pena/PenaSide/linters-golang/pkg/dummy"
-	"heruvym/internal/app"
-	"heruvym/internal/initialize"
 	"log"
 	"os"
 	"os/signal"

internal/app/app.go

@@ -3,12 +3,12 @@ package app
 import (
 	"context"
 	"errors"
+	"gitea.pena/PenaSide/heruvym/internal/initialize"
+	"gitea.pena/PenaSide/heruvym/internal/server/http"
+	"gitea.pena/PenaSide/heruvym/internal/utils/middleware"
+	"gitea.pena/PenaSide/heruvym/pkg/closer"
 	"gitea.pena/PenaSide/hlog"
 	"go.uber.org/zap"
-	"heruvym/internal/initialize"
-	"heruvym/internal/server/http"
-	"heruvym/internal/utils/middleware"
-	"heruvym/pkg/closer"
 	"penahub.gitlab.yandexcloud.net/external/trashlog/app"
 	"strconv"
 	"time"

internal/controllers/other/other.go

@@ -5,16 +5,16 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"gitea.pena/PenaSide/heruvym/internal/repository/minio"
+	"gitea.pena/PenaSide/heruvym/internal/repository/mongo"
+	"gitea.pena/PenaSide/heruvym/internal/utils/helpers"
+	"gitea.pena/PenaSide/heruvym/internal/utils/jwt_adapter"
+	"gitea.pena/PenaSide/heruvym/internal/utils/middleware"
 	"github.com/go-redis/redis/v8"
 	"github.com/gofiber/fiber/v2"
 	"github.com/rs/xid"
 	"gopkg.in/telebot.v3"
 	tb "gopkg.in/tucnak/telebot.v2"
-	"heruvym/internal/repository/minio"
-	"heruvym/internal/repository/mongo"
-	"heruvym/internal/utils/helpers"
-	"heruvym/internal/utils/jwt_adapter"
-	"heruvym/internal/utils/middleware"
 	"io"
 	"strings"
 	"sync"

internal/controllers/tickets/route.go

@@ -1,8 +1,8 @@
 package tickets
 
 import (
+	"gitea.pena/PenaSide/heruvym/internal/tools"
 	"github.com/gofiber/fiber/v2"
-	"heruvym/internal/tools"
 )
 
 func (t *TicketController) Register(router fiber.Router) {

internal/controllers/tickets/tickets.go

@@ -5,16 +5,16 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	our_errors "gitea.pena/PenaSide/heruvym/internal/controllers/errors"
+	"gitea.pena/PenaSide/heruvym/internal/model"
+	"gitea.pena/PenaSide/heruvym/internal/repository/mongo"
+	"gitea.pena/PenaSide/heruvym/internal/tools"
+	"gitea.pena/PenaSide/heruvym/internal/utils/jwt_adapter"
+	"gitea.pena/PenaSide/heruvym/internal/utils/middleware"
 	"gitea.pena/PenaSide/hlog"
 	"github.com/gofiber/fiber/v2"
 	"go.uber.org/zap"
 	"gopkg.in/telebot.v3"
-	our_errors "heruvym/internal/controllers/errors"
-	"heruvym/internal/model"
-	"heruvym/internal/repository/mongo"
-	"heruvym/internal/tools"
-	"heruvym/internal/utils/jwt_adapter"
-	"heruvym/internal/utils/middleware"
 )
 
 type Deps struct {

internal/initialize/controllers.go

@@ -1,12 +1,12 @@
 package initialize
 
 import (
+	"gitea.pena/PenaSide/heruvym/internal/controllers/other"
+	"gitea.pena/PenaSide/heruvym/internal/controllers/tickets"
 	"gitea.pena/PenaSide/hlog"
 	"github.com/go-redis/redis/v8"
 	"go.uber.org/zap"
 	"gopkg.in/telebot.v3"
-	"heruvym/internal/controllers/other"
-	"heruvym/internal/controllers/tickets"
 )
 
 type ControllersDeps struct {

internal/initialize/repository.go

@@ -2,11 +2,11 @@ package initialize
 
 import (
 	"context"
+	"gitea.pena/PenaSide/heruvym/internal/repository/minio"
+	"gitea.pena/PenaSide/heruvym/internal/repository/mongo"
 	"gitea.pena/PenaSide/hlog"
 	minioClient "github.com/minio/minio-go/v7"
 	mongoDatabase "go.mongodb.org/mongo-driver/mongo"
-	"heruvym/internal/repository/minio"
-	"heruvym/internal/repository/mongo"
 )
 
 type DepsRepositories struct {

internal/repository/mongo/dal.go

@@ -4,15 +4,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
-<<<<<<< HEAD:internal/repository/mongo/dal.go
+	"gitea.pena/PenaSide/heruvym/internal/model"
-	"heruvym/internal/model"
-=======
-	"gitea.pena/PenaSide/heruvym/model"
->>>>>>> 7af3f682b88d1d8b7a3c1405138f71de18b091d7:dal/mongo/dal.go
 	"time"
 
-	"github.com/rs/xid"
 	"gitea.pena/PenaSide/hlog"
+	"github.com/rs/xid"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"

internal/repository/mongo/dal_test.go

@@ -2,14 +2,10 @@ package mongo
 
 import (
 	"context"
-	"github.com/stretchr/testify/suite"
+	"gitea.pena/PenaSide/heruvym/internal/model"
 	"gitea.pena/PenaSide/hlog"
+	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
-<<<<<<< HEAD:internal/repository/mongo/dal_test.go
-	"heruvym/internal/model"
-=======
-	"gitea.pena/PenaSide/heruvym/model"
->>>>>>> 7af3f682b88d1d8b7a3c1405138f71de18b091d7:dal/mongo/dal_test.go
 	"testing"
 )
 

internal/server/http/http_server.go

@@ -3,10 +3,10 @@ package http
 import (
 	"context"
 	"fmt"
+	"gitea.pena/PenaSide/heruvym/internal/utils/middleware"
 	"gitea.pena/PenaSide/hlog"
 	"github.com/gofiber/fiber/v2"
 	"go.uber.org/zap"
-	"heruvym/internal/utils/middleware"
 )
 
 type ServerConfig struct {

internal/utils/middleware/http_middleware.go

@@ -2,8 +2,8 @@ package middleware
 
 import (
 	"fmt"
+	"gitea.pena/PenaSide/heruvym/internal/utils/jwt_adapter"
 	"github.com/gofiber/fiber/v2"
-	"heruvym/internal/utils/jwt_adapter"
 	"strings"
 	"time"
 

internal/utils/middleware/middleware.go

@@ -1,9 +1,9 @@
 package middleware
 
 import (
+	"gitea.pena/PenaSide/heruvym/internal/utils/jwt_adapter"
 	"gitea.pena/PenaSide/hlog"
 	"github.com/gofiber/fiber/v2"
-	"heruvym/internal/utils/jwt_adapter"
 )
 
 // todo useless?

internal/utils/middleware/sse_middleware.go

@@ -1,8 +1,8 @@
 package middleware
 
 import (
+	"gitea.pena/PenaSide/heruvym/internal/utils/jwt_adapter"
 	"github.com/gofiber/fiber/v2"
-	"heruvym/internal/utils/jwt_adapter"
 )
 
 func (mw *Middleware) MiddlewareGetJwt(c *fiber.Ctx) error {

script/main.go

@@ -3,16 +3,12 @@ package main
 import (
 	"context"
 	"fmt"
+	"gitea.pena/PenaSide/heruvym/internal/model"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-<<<<<<< HEAD
-	"heruvym/internal/model"
-=======
-	"gitea.pena/PenaSide/heruvym/model"
->>>>>>> 7af3f682b88d1d8b7a3c1405138f71de18b091d7
 )
 
 const (
@@ -33,12 +29,12 @@ func main() {
 		fmt.Println("Ошибка подключения к монго:", err)
 		return
 	}
-	defer func() { 
+	defer func() {
 		err := client.Disconnect(ctx)
 		if err != nil {
 			fmt.Println("CAN NOT DISCONNECT", err)
 		}
-	} ()
+	}()
 
 	collection := client.Database(mongoDBName).Collection(collectionName)
 

test/main_test.go

@@ -7,31 +7,22 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"gitea.pena/PenaSide/heruvym/internal/controllers/tickets"
+	"gitea.pena/PenaSide/heruvym/internal/model"
+	"gitea.pena/PenaSide/heruvym/internal/utils/jwt_adapter"
 	"github.com/skeris/appInit"
-<<<<<<< HEAD
-	"heruvym/internal/model"
-	"heruvym/internal/utils/jwt_adapter"
-=======
-	"gitea.pena/PenaSide/heruvym/model"
->>>>>>> 7af3f682b88d1d8b7a3c1405138f71de18b091d7
 	"io"
 	"io/ioutil"
 	"mime/multipart"
 	"net/http"
 	"os"
+	"penahub.gitlab.yandexcloud.net/external/trashlog/app"
 	"strings"
 	"testing"
 	"time"
 
-	"gitea.pena/PenaSide/heruvym/app"
-	"gitea.pena/PenaSide/heruvym/service"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/themakers/bdd"
-<<<<<<< HEAD
-=======
-	"gitea.pena/PenaSide/heruvym/jwt_adapter"
->>>>>>> 7af3f682b88d1d8b7a3c1405138f71de18b091d7
 )
 
 ///create+
@@ -47,7 +38,7 @@ func TestTicket(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	bdd.Scenario(t, "SupportChat", func(t *testing.T, runID string) {
-		var ticket service.CreateTicketResp
+		var ticket tickets.CreateTicketResp
 		var msgs = make(chan []byte)
 		var token string
 		go func() {
@@ -82,7 +73,7 @@ func TestTicket(t *testing.T) {
 			fmt.Println("client")
 			bdd.Test(t, "CreateTicket", func() {
 
-				buf, err := json.Marshal(service.CreateTicketReq{
+				buf, err := json.Marshal(tickets.CreateTicketReq{
 					Title:   "TestTitle",
 					Message: "test",
 				})
@@ -176,7 +167,7 @@ func TestTicket(t *testing.T) {
 			})
 			bdd.Test(t, "send message", func() {
 
-				buf, err := json.Marshal(service.ReqPutMessage{
+				buf, err := json.Marshal(tickets.ReqPutMessage{
 					Message:  "test",
 					TicketID: ticket.Ticket,
 					Lang:     "ru",
@@ -344,7 +335,7 @@ func TestTicket(t *testing.T) {
 			})
 			bdd.Test(t, "/getTickets, tools.HandlerWrapper(h.GetTickets)", func() {
 				client := &http.Client{}
-				reqBody := service.GetTicketsReq{
+				reqBody := tickets.GetTicketsReq{
 					Amount: 10,
 					Page:   1,
 					Search: "test",
@@ -362,14 +353,14 @@ func TestTicket(t *testing.T) {
 
 				assert.Equal(t, http.StatusOK, resp.StatusCode)
 
-				var respBody service.GetTicketsResp
+				var respBody tickets.GetTicketsResp
 				err = json.NewDecoder(resp.Body).Decode(&respBody)
 				assert.NoError(t, err)
 				fmt.Println(respBody)
 			})
 			bdd.Test(t, "/getMessages, tools.HandlerWrapper(h.GetMessages)", func() {
 				client := &http.Client{}
-				reqBody := service.GetMessagesReq{
+				reqBody := tickets.GetMessagesReq{
 					Amount:   0,
 					Page:     0,
 					Search:   "test",