From ed7ecd875808e402d835e31926057701ed645977 Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Fri, 16 Jul 2021 17:44:41 +0200 Subject: [PATCH] delete the pkg directory --- {pkg/fstorage => fstorage}/config.go | 0 {pkg/fstorage => fstorage}/filestorage.go | 0 {pkg/fstorage => fstorage}/fstorageutil/generate_filename.go | 0 {pkg/fstorage => fstorage}/interface.go | 0 internal/auth/usecase/usecase.go | 2 +- internal/graphql/directive/directive.go | 2 +- internal/profession/repository/pg_repository.go | 2 +- internal/qualification/repository/pg_repository.go | 2 +- internal/question/repository/pg_repository.go | 4 ++-- internal/question/repository/repository.go | 4 ++-- internal/user/repository/pg_repository.go | 2 +- main.go | 2 +- {pkg/util => util}/errorutil/error.go | 0 13 files changed, 10 insertions(+), 10 deletions(-) rename {pkg/fstorage => fstorage}/config.go (100%) rename {pkg/fstorage => fstorage}/filestorage.go (100%) rename {pkg/fstorage => fstorage}/fstorageutil/generate_filename.go (100%) rename {pkg/fstorage => fstorage}/interface.go (100%) rename {pkg/util => util}/errorutil/error.go (100%) diff --git a/pkg/fstorage/config.go b/fstorage/config.go similarity index 100% rename from pkg/fstorage/config.go rename to fstorage/config.go diff --git a/pkg/fstorage/filestorage.go b/fstorage/filestorage.go similarity index 100% rename from pkg/fstorage/filestorage.go rename to fstorage/filestorage.go diff --git a/pkg/fstorage/fstorageutil/generate_filename.go b/fstorage/fstorageutil/generate_filename.go similarity index 100% rename from pkg/fstorage/fstorageutil/generate_filename.go rename to fstorage/fstorageutil/generate_filename.go diff --git a/pkg/fstorage/interface.go b/fstorage/interface.go similarity index 100% rename from pkg/fstorage/interface.go rename to fstorage/interface.go diff --git a/internal/auth/usecase/usecase.go b/internal/auth/usecase/usecase.go index ef1cbae..201f20a 100644 --- a/internal/auth/usecase/usecase.go +++ b/internal/auth/usecase/usecase.go @@ -8,7 +8,7 @@ import ( "github.com/zdam-egzamin-zawodowy/backend/internal/auth/jwt" "github.com/zdam-egzamin-zawodowy/backend/internal/model" "github.com/zdam-egzamin-zawodowy/backend/internal/user" - "github.com/zdam-egzamin-zawodowy/backend/pkg/util/errorutil" + "github.com/zdam-egzamin-zawodowy/backend/util/errorutil" ) type Config struct { diff --git a/internal/graphql/directive/directive.go b/internal/graphql/directive/directive.go index 7e39bbe..b7ae9c9 100644 --- a/internal/graphql/directive/directive.go +++ b/internal/graphql/directive/directive.go @@ -8,7 +8,7 @@ import ( "github.com/zdam-egzamin-zawodowy/backend/internal/gin/middleware" "github.com/zdam-egzamin-zawodowy/backend/internal/model" - "github.com/zdam-egzamin-zawodowy/backend/pkg/util/errorutil" + "github.com/zdam-egzamin-zawodowy/backend/util/errorutil" ) type Directive struct{} diff --git a/internal/profession/repository/pg_repository.go b/internal/profession/repository/pg_repository.go index 2014895..534cb32 100644 --- a/internal/profession/repository/pg_repository.go +++ b/internal/profession/repository/pg_repository.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "strings" - "github.com/zdam-egzamin-zawodowy/backend/pkg/util/errorutil" + "github.com/zdam-egzamin-zawodowy/backend/util/errorutil" "github.com/go-pg/pg/v10" diff --git a/internal/qualification/repository/pg_repository.go b/internal/qualification/repository/pg_repository.go index 9e0a5ad..e409ec5 100644 --- a/internal/qualification/repository/pg_repository.go +++ b/internal/qualification/repository/pg_repository.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "strings" - "github.com/zdam-egzamin-zawodowy/backend/pkg/util/errorutil" + "github.com/zdam-egzamin-zawodowy/backend/util/errorutil" "github.com/go-pg/pg/v10" diff --git a/internal/question/repository/pg_repository.go b/internal/question/repository/pg_repository.go index 2958368..25a13b3 100644 --- a/internal/question/repository/pg_repository.go +++ b/internal/question/repository/pg_repository.go @@ -9,10 +9,10 @@ import ( "github.com/go-pg/pg/v10" + "github.com/zdam-egzamin-zawodowy/backend/fstorage" "github.com/zdam-egzamin-zawodowy/backend/internal/model" "github.com/zdam-egzamin-zawodowy/backend/internal/question" - "github.com/zdam-egzamin-zawodowy/backend/pkg/fstorage" - "github.com/zdam-egzamin-zawodowy/backend/pkg/util/errorutil" + "github.com/zdam-egzamin-zawodowy/backend/util/errorutil" ) type PGRepositoryConfig struct { diff --git a/internal/question/repository/repository.go b/internal/question/repository/repository.go index e32a3e7..2a9a04d 100644 --- a/internal/question/repository/repository.go +++ b/internal/question/repository/repository.go @@ -3,12 +3,12 @@ package repository import ( "path/filepath" - "github.com/zdam-egzamin-zawodowy/backend/pkg/fstorage/fstorageutil" + "github.com/zdam-egzamin-zawodowy/backend/fstorage/fstorageutil" "github.com/99designs/gqlgen/graphql" + "github.com/zdam-egzamin-zawodowy/backend/fstorage" "github.com/zdam-egzamin-zawodowy/backend/internal/model" - "github.com/zdam-egzamin-zawodowy/backend/pkg/fstorage" ) type repository struct { diff --git a/internal/user/repository/pg_repository.go b/internal/user/repository/pg_repository.go index 58f25d1..af52da2 100644 --- a/internal/user/repository/pg_repository.go +++ b/internal/user/repository/pg_repository.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "strings" - "github.com/zdam-egzamin-zawodowy/backend/pkg/util/errorutil" + "github.com/zdam-egzamin-zawodowy/backend/util/errorutil" "github.com/go-pg/pg/v10" diff --git a/main.go b/main.go index 613c2d8..22c1332 100644 --- a/main.go +++ b/main.go @@ -35,7 +35,7 @@ import ( "github.com/joho/godotenv" "github.com/sirupsen/logrus" - "github.com/zdam-egzamin-zawodowy/backend/pkg/fstorage" + "github.com/zdam-egzamin-zawodowy/backend/fstorage" ) func init() { diff --git a/pkg/util/errorutil/error.go b/util/errorutil/error.go similarity index 100% rename from pkg/util/errorutil/error.go rename to util/errorutil/error.go