merge commit 7af3f682b88d1d8b7a3c1405138f71de18b091d7

go.mod

@@ -1,4 +1,4 @@
-module heruvym
+module gitea.pena/PenaSide/heruvym
 
 go 1.23.2
 
@@ -12,9 +12,7 @@ require (
 	github.com/joho/godotenv v1.5.1
 	github.com/minio/minio-go/v7 v7.0.43
 	github.com/rs/xid v1.4.0
-	github.com/skeris/appInit v1.0.2
+	github.com/skeris/appInit v1.0.2 // indirect
-	github.com/stretchr/testify v1.8.4
-	github.com/themakers/bdd v0.0.0-20210316111417-6b1dfe326f33
 	github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf // indirect
 	go.mongodb.org/mongo-driver v1.13.1
 	go.uber.org/zap v1.27.0
@@ -29,10 +27,8 @@ require (
 	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
-	github.com/fatih/color v1.13.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.4.0 // indirect
@@ -47,7 +43,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/montanaflynn/stats v0.6.6 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.3 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
@@ -68,7 +63,6 @@ require (
 	google.golang.org/grpc v1.47.0 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 require github.com/pkg/errors v0.9.1 // indirect

go.sum

@@ -307,11 +307,9 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -410,7 +408,6 @@ github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
 github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY=
 github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
@@ -981,7 +978,6 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=

internal/repository/mongo/dal.go

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

internal/repository/mongo/dal_test.go

@@ -5,7 +5,11 @@ import (
 	"github.com/stretchr/testify/suite"
 	"gitea.pena/PenaSide/hlog"
 	"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"
 )
 

script/main.go

@@ -8,7 +8,11 @@ import (
 	"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 (

test/main_test.go

@@ -8,8 +8,12 @@ import (
 	"errors"
 	"fmt"
 	"github.com/skeris/appInit"
+<<<<<<< HEAD
 	"heruvym/internal/model"
 	"heruvym/internal/utils/jwt_adapter"
+=======
+	"gitea.pena/PenaSide/heruvym/model"
+>>>>>>> 7af3f682b88d1d8b7a3c1405138f71de18b091d7
 	"io"
 	"io/ioutil"
 	"mime/multipart"
@@ -19,11 +23,15 @@ import (
 	"testing"
 	"time"
 
-	"heruvym/app"
+	"gitea.pena/PenaSide/heruvym/app"
-	"heruvym/service"
+	"gitea.pena/PenaSide/heruvym/service"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/themakers/bdd"
+<<<<<<< HEAD
+=======
+	"gitea.pena/PenaSide/heruvym/jwt_adapter"
+>>>>>>> 7af3f682b88d1d8b7a3c1405138f71de18b091d7
 )
 
 ///create+