zdam-egzamin-zawodowy
/
backend
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move/rename packages

This commit is contained in:
Dawid Wysokiński 2021-05-02 09:15:10 +02:00
parent 7de549f183
commit 89ce683e08
16 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
internal/graphql/delivery/http/http_handler.go → internal/graphql/delivery/httpdelivery/http_handler.go
View File

12
internal/graphql/querycomplexity/querycomplexity.go
View File

@ -8,7 +8,7 @@ import (
"github.com/zdam-egzamin-zawodowy/backend/internal/qualification"
"github.com/zdam-egzamin-zawodowy/backend/internal/question"
"github.com/zdam-egzamin-zawodowy/backend/internal/user"
"github.com/zdam-egzamin-zawodowy/backend/pkg/util/safepointer"
"github.com/zdam-egzamin-zawodowy/backend/pkg/util/safeptr"
)
const (
@ -40,7 +40,7 @@ func GetComplexityRoot() generated.ComplexityRoot {
) int {
return computeComplexity(
childComplexity,
safepointer.SafeIntPointer(limit, profession.FetchDefaultLimit),
safeptr.SafeIntPointer(limit, profession.FetchDefaultLimit),
professionsTotalFieldComplexity,
1,
)
@ -56,7 +56,7 @@ func GetComplexityRoot() generated.ComplexityRoot {
) int {
return computeComplexity(
childComplexity,
safepointer.SafeIntPointer(limit, qualification.FetchDefaultLimit),
safeptr.SafeIntPointer(limit, qualification.FetchDefaultLimit),
qualificationsTotalFieldComplexity,
1,
)
@ -72,7 +72,7 @@ func GetComplexityRoot() generated.ComplexityRoot {
) int {
return computeComplexity(
childComplexity,
safepointer.SafeIntPointer(limit, question.FetchDefaultLimit),
safeptr.SafeIntPointer(limit, question.FetchDefaultLimit),
questionsTotalFieldComplexity,
1,
)
@ -80,7 +80,7 @@ func GetComplexityRoot() generated.ComplexityRoot {
complexityRoot.Query.GenerateTest = func(childComplexity int, qualificationIDs []int, limit *int) int {
return computeComplexity(
childComplexity,
safepointer.SafeIntPointer(limit, question.TestMaxLimit),
safeptr.SafeIntPointer(limit, question.TestMaxLimit),
0,
3,
)
@ -96,7 +96,7 @@ func GetComplexityRoot() generated.ComplexityRoot {
) int {
return computeComplexity(
childComplexity,
safepointer.SafeIntPointer(limit, user.FetchMaxLimit),
safeptr.SafeIntPointer(limit, user.FetchMaxLimit),
usersTotalFieldComplexity,
1,
)

6
internal/graphql/resolvers/profession.resolvers.go → internal/graphql/resolvers/profession_resolver.go
View File

@ -6,7 +6,7 @@ package resolvers
import (
"context"
"github.com/zdam-egzamin-zawodowy/backend/internal/gin/middleware"
"github.com/zdam-egzamin-zawodowy/backend/pkg/util/safepointer"
"github.com/zdam-egzamin-zawodowy/backend/pkg/util/safeptr"
"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
"github.com/zdam-egzamin-zawodowy/backend/internal/models"
@ -41,8 +41,8 @@ func (r *queryResolver) Professions(
&profession.FetchConfig{
Count: shouldCount(ctx),
Filter: filter,
Limit: safepointer.SafeIntPointer(limit, profession.FetchDefaultLimit),
Offset: safepointer.SafeIntPointer(offset, 0),
Limit: safeptr.SafeIntPointer(limit, profession.FetchDefaultLimit),
Offset: safeptr.SafeIntPointer(offset, 0),
Sort: sort,
},
)

10
internal/graphql/resolvers/qualification.resolvers.go → internal/graphql/resolvers/qualification_resolver.go
View File

@ -5,7 +5,7 @@ package resolvers
import (
"context"
"github.com/zdam-egzamin-zawodowy/backend/pkg/util/safepointer"
"github.com/zdam-egzamin-zawodowy/backend/pkg/util/safeptr"
"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
"github.com/zdam-egzamin-zawodowy/backend/internal/models"
@ -40,8 +40,8 @@ func (r *queryResolver) Qualifications(
&qualification.FetchConfig{
Count: shouldCount(ctx),
Filter: filter,
Limit: safepointer.SafeIntPointer(limit, qualification.FetchDefaultLimit),
Offset: safepointer.SafeIntPointer(offset, 0),
Limit: safeptr.SafeIntPointer(limit, qualification.FetchDefaultLimit),
Offset: safeptr.SafeIntPointer(offset, 0),
Sort: sort,
},
)
@ -62,8 +62,8 @@ func (r *queryResolver) SimilarQualifications(
&qualification.GetSimilarConfig{
Count: shouldCount(ctx),
QualificationID: qualificationID,
Limit: safepointer.SafeIntPointer(limit, qualification.FetchDefaultLimit),
Offset: safepointer.SafeIntPointer(offset, 0),
Limit: safeptr.SafeIntPointer(limit, qualification.FetchDefaultLimit),
Offset: safeptr.SafeIntPointer(offset, 0),
Sort: sort,
},
)

8
internal/graphql/resolvers/question.resolvers.go → internal/graphql/resolvers/question_resolver.go
View File

@ -5,7 +5,7 @@ package resolvers
import (
"context"
"github.com/zdam-egzamin-zawodowy/backend/pkg/util/safepointer"
"github.com/zdam-egzamin-zawodowy/backend/pkg/util/safeptr"
"github.com/zdam-egzamin-zawodowy/backend/internal/gin/middleware"
"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
@ -30,7 +30,7 @@ func (r *mutationResolver) DeleteQuestions(ctx context.Context, ids []int) ([]*m
func (r *queryResolver) GenerateTest(ctx context.Context, qualificationIDs []int, limit *int) ([]*models.Question, error) {
return r.QuestionUsecase.GenerateTest(ctx, &question.GenerateTestConfig{
Qualifications: qualificationIDs,
Limit: safepointer.SafeIntPointer(limit, question.TestMaxLimit),
Limit: safeptr.SafeIntPointer(limit, question.TestMaxLimit),
})
}
@ -48,8 +48,8 @@ func (r *queryResolver) Questions(
&question.FetchConfig{
Count: shouldCount(ctx),
Filter: filter,
Limit: safepointer.SafeIntPointer(limit, question.FetchDefaultLimit),
Offset: safepointer.SafeIntPointer(offset, 0),
Limit: safeptr.SafeIntPointer(limit, question.FetchDefaultLimit),
Offset: safeptr.SafeIntPointer(offset, 0),
Sort: sort,
},
)

8
internal/graphql/resolvers/user.resolvers.go → internal/graphql/resolvers/user_resolver.go
View File

@ -5,7 +5,7 @@ package resolvers
import (
"context"
"github.com/zdam-egzamin-zawodowy/backend/pkg/util/safepointer"
"github.com/zdam-egzamin-zawodowy/backend/pkg/util/safeptr"
"github.com/zdam-egzamin-zawodowy/backend/internal/gin/middleware"
"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/generated"
@ -49,7 +49,7 @@ func (r *mutationResolver) SignIn(
ctx,
email,
password,
safepointer.SafeBoolPointer(staySignedIn, false),
safeptr.SafeBoolPointer(staySignedIn, false),
)
if err != nil {
return nil, err
@ -71,8 +71,8 @@ func (r *queryResolver) Users(
&user.FetchConfig{
Count: shouldCount(ctx),
Filter: filter,
Limit: safepointer.SafeIntPointer(limit, user.FetchMaxLimit),
Offset: safepointer.SafeIntPointer(offset, 0),
Limit: safeptr.SafeIntPointer(limit, user.FetchMaxLimit),
Offset: safeptr.SafeIntPointer(offset, 0),
Sort: sort,
},
)

2
internal/db/db.go → internal/postgres/postgres.go
View File

@ -1,4 +1,4 @@
package db
package postgres
import (
"context"

2
internal/db/sort.go → internal/postgres/sort.go
View File

@ -1,4 +1,4 @@
package db
package postgres
import (
"strings"

8
internal/question/repository/pg_repository.go
View File

@ -8,10 +8,10 @@ import (
"time"
"github.com/go-pg/pg/v10"
"github.com/zdam-egzamin-zawodowy/backend/internal/db"
"github.com/zdam-egzamin-zawodowy/backend/internal/models"
"github.com/zdam-egzamin-zawodowy/backend/internal/postgres"
"github.com/zdam-egzamin-zawodowy/backend/internal/question"
"github.com/zdam-egzamin-zawodowy/backend/pkg/filestorage"
"github.com/zdam-egzamin-zawodowy/backend/pkg/fstorage"
"github.com/zdam-egzamin-zawodowy/backend/pkg/util/errorutil"
)
@ -22,7 +22,7 @@ type pgRepository struct {
type PGRepositoryConfig struct {
DB *pg.DB
FileStorage filestorage.FileStorage
FileStorage fstorage.FileStorage
}
func NewPGRepository(cfg *PGRepositoryConfig) (question.Repository, error) {
@ -123,7 +123,7 @@ func (repo *pgRepository) Fetch(ctx context.Context, cfg *question.FetchConfig)
Context(ctx).
Limit(cfg.Limit).
Offset(cfg.Offset).
Apply(db.Sort{
Apply(postgres.Sort{
Relationships: map[string]string{
"qualification": "qualification",
},

8
internal/question/repository/repository.go
View File

@ -1,16 +1,16 @@
package repository
import (
"github.com/zdam-egzamin-zawodowy/backend/pkg/filestorage/filestorageutil"
"github.com/zdam-egzamin-zawodowy/backend/pkg/fstorage/fstorageutil"
"path/filepath"
"github.com/99designs/gqlgen/graphql"
"github.com/zdam-egzamin-zawodowy/backend/internal/models"
"github.com/zdam-egzamin-zawodowy/backend/pkg/filestorage"
"github.com/zdam-egzamin-zawodowy/backend/pkg/fstorage"
)
type repository struct {
fileStorage filestorage.FileStorage
fileStorage fstorage.FileStorage
}
func (repo *repository) saveImages(destination *models.Question, input *models.QuestionInput) {
@ -34,7 +34,7 @@ func (repo *repository) saveImages(destination *models.Question, input *models.Q
generated := false
if filenames[index] == "" {
generated = true
filenames[index] = filestorageutil.GenerateFilename(filepath.Ext(file.Filename))
filenames[index] = fstorageutil.GenerateFilename(filepath.Ext(file.Filename))
}
err := repo.fileStorage.Put(file.File, filenames[index])
if err != nil && generated {

10
main.go
View File

@ -7,16 +7,16 @@ import (
"os/signal"
"time"
graphqlhttpdelivery "github.com/zdam-egzamin-zawodowy/backend/internal/graphql/delivery/http"
graphqlhttpdelivery "github.com/zdam-egzamin-zawodowy/backend/internal/graphql/delivery/httpdelivery"
"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/directive"
"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/resolvers"
"github.com/pkg/errors"
"github.com/zdam-egzamin-zawodowy/backend/internal/auth/jwt"
authusecase "github.com/zdam-egzamin-zawodowy/backend/internal/auth/usecase"
"github.com/zdam-egzamin-zawodowy/backend/internal/db"
"github.com/zdam-egzamin-zawodowy/backend/internal/gin/middleware"
"github.com/zdam-egzamin-zawodowy/backend/internal/graphql/dataloader"
"github.com/zdam-egzamin-zawodowy/backend/internal/postgres"
professionrepository "github.com/zdam-egzamin-zawodowy/backend/internal/profession/repository"
professionusecase "github.com/zdam-egzamin-zawodowy/backend/internal/profession/usecase"
qualificationrepository "github.com/zdam-egzamin-zawodowy/backend/internal/qualification/repository"
@ -31,7 +31,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/joho/godotenv"
"github.com/sirupsen/logrus"
"github.com/zdam-egzamin-zawodowy/backend/pkg/filestorage"
"github.com/zdam-egzamin-zawodowy/backend/pkg/fstorage"
"github.com/zdam-egzamin-zawodowy/backend/pkg/mode"
"github.com/zdam-egzamin-zawodowy/backend/pkg/util/envutil"
)
@ -47,11 +47,11 @@ func init() {
}
func main() {
fileStorage := filestorage.New(&filestorage.Config{
fileStorage := fstorage.New(&fstorage.Config{
BasePath: os.Getenv("FILE_STORAGE_PATH"),
})
dbConn, err := db.Connect(&db.Config{
dbConn, err := postgres.Connect(&postgres.Config{
LogQueries: envutil.GetenvBool("LOG_DB_QUERIES"),
})
if err != nil {

2
pkg/filestorage/config.go → pkg/fstorage/config.go
View File

@ -1,4 +1,4 @@
package filestorage
package fstorage
import "os"

2
pkg/filestorage/filestorage.go → pkg/fstorage/filestorage.go
View File

@ -1,4 +1,4 @@
package filestorage
package fstorage
import (
"io"

2
pkg/filestorage/filestorageutil/generate_filename.go → pkg/fstorage/fstorageutil/generate_filename.go
View File

@ -1,4 +1,4 @@
package filestorageutil
package fstorageutil
import (
"strings"

2
pkg/filestorage/interface.go → pkg/fstorage/interface.go
View File

@ -1,4 +1,4 @@
package filestorage
package fstorage
import "io"

2
pkg/util/safepointer/safe_pointer.go → pkg/util/safeptr/safe_pointer.go
View File

@ -1,4 +1,4 @@
package safepointer
package safeptr
func SafeBoolPointer(v *bool, def bool) bool {
if v == nil {