changed package structure

Klass-lk · Nov 8, 2024 · b51ae0c · b51ae0c
1 parent 5eb22b3
commit b51ae0c
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 40 deletions.
diff --git a/ginboot/api.go → api.go b/ginboot/api.go → api.go
@@ -3,43 +3,42 @@ package ginboot
 import (
 	"errors"
 	"github.com/gin-gonic/gin"
-	"github.com/klass-lk/ginboot/types"
 	"net/http"
 	"strconv"
 	"strings"
 )
 
-func GetAuthContext(c *gin.Context) (types.AuthContext, error) {
+func GetAuthContext(c *gin.Context) (AuthContext, error) {
 	userId, exists := c.Get("user_id")
 	if !exists {
 		c.AbortWithStatus(http.StatusUnauthorized)
-		return types.AuthContext{}, errors.New("operation not permitted")
+		return AuthContext{}, errors.New("operation not permitted")
 	}
 	role, exists := c.Get("role")
 	if !exists {
 		c.AbortWithStatus(http.StatusUnauthorized)
-		return types.AuthContext{}, errors.New("operation not permitted")
+		return AuthContext{}, errors.New("operation not permitted")
 	}
-	return types.AuthContext{
+	return AuthContext{
 		UserId: userId.(string),
 		Role:   role.(string),
 	}, nil
 }
 
-func BuildAuthRequestContext[T interface{}](c *gin.Context) (T, types.AuthContext, error) {
+func BuildAuthRequestContext[T interface{}](c *gin.Context) (T, AuthContext, error) {
 	request, err := BuildRequest[T](c)
 	if err != nil {
-		return request, types.AuthContext{}, err
+		return request, AuthContext{}, err
 	}
 	authContext, err := GetAuthContext(c)
 	if err != nil {
 		c.AbortWithStatus(http.StatusBadRequest)
-		return request, types.AuthContext{}, err
+		return request, AuthContext{}, err
 	}
 	return request, authContext, nil
 }
 
-func BuildPageRequest(c *gin.Context) types.PageRequest {
+func BuildPageRequest(c *gin.Context) PageRequest {
 	pageString := c.DefaultQuery("page", "1")
 	sizeString := c.DefaultQuery("size", "10")
 	sortString := c.DefaultQuery("sort", "_id,asc")
@@ -52,24 +51,24 @@ func BuildPageRequest(c *gin.Context) types.PageRequest {
 		c.AbortWithStatus(http.StatusBadRequest)
 	}
 	sortSplit := strings.Split(sortString, ",")
-	var sort types.SortField
+	var sort SortField
 	if len(sortSplit) > 1 {
 		direction := 1
 		if sortSplit[1] == "desc" {
 			direction = -1
 		}
-		sort = types.SortField{
+		sort = SortField{
 			Field:     sortSplit[0],
 			Direction: direction,
 		}
 	} else {
-		sort = types.SortField{
+		sort = SortField{
 			Field:     sortSplit[0],
 			Direction: 1,
 		}
 	}
 
-	return types.PageRequest{Page: int(page), Size: int(size), Sort: sort}
+	return PageRequest{Page: int(page), Size: int(size), Sort: sort}
 }
 
 func BuildRequest[T interface{}](c *gin.Context) (T, error) {

diff --git a/types/auth_context.go → auth_context.go b/types/auth_context.go → auth_context.go
@@ -1,4 +1,4 @@
-package types
+package ginboot
 
 type AuthContext struct {
 	UserId string

diff --git a/security/crypt.go → crypt.go b/security/crypt.go → crypt.go
@@ -1,4 +1,4 @@
-package security
+package ginboot
 
 import "golang.org/x/crypto/bcrypt"
 

diff --git a/types/db_types.go → db_types.go b/types/db_types.go → db_types.go
@@ -1,4 +1,4 @@
-package types
+package ginboot
 
 type SortField struct {
 	Field     string `json:"field"`

diff --git a/errors/error_lib.go → error_lib.go b/errors/error_lib.go → error_lib.go
@@ -1,4 +1,4 @@
-package errors
+package ginboot
 
 import (
 	"errors"

diff --git a/generic_repository.go b/generic_repository.go
@@ -1,12 +1,11 @@
-package GinBoot
+package ginboot
 
 import (
-	"github.com/klass-lk/ginboot/types"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
-type GenericRepository[T types.Document] interface {
+type GenericRepository[T Document] interface {
 	Query() *mongo.Collection
 	FindById(id interface{}) (T, error)
 	FindAllById(idList []string) ([]T, error)
@@ -20,8 +19,8 @@ type GenericRepository[T types.Document] interface {
 	FindBy(field string, value interface{}) ([]T, error)
 	FindByMultiple(filters map[string]interface{}) ([]T, error)
 	FindAll(opts ...*options.FindOptions) ([]T, error)
-	FindAllPaginated(pageRequest types.PageRequest) (types.PageResponse[T], error)
-	FindByPaginated(pageRequest types.PageRequest, filters map[string]interface{}) (types.PageResponse[T], error)
+	FindAllPaginated(pageRequest PageRequest) (PageResponse[T], error)
+	FindByPaginated(pageRequest PageRequest, filters map[string]interface{}) (PageResponse[T], error)
 	CountBy(field string, value interface{}) (int64, error)
 	CountByFilters(filters map[string]interface{}) (int64, error)
 	ExistsBy(field string, value interface{}) (bool, error)

diff --git a/security/jwt.go → jwt.go b/security/jwt.go → jwt.go
@@ -1,4 +1,4 @@
-package security
+package ginboot
 
 import (
 	"errors"

diff --git a/types/mongo_document.go → mongo_document.go b/types/mongo_document.go → mongo_document.go
@@ -1,4 +1,4 @@
-package types
+package ginboot
 
 type Document interface {
 	GetID() string

diff --git a/mongo_repository.go b/mongo_repository.go
@@ -1,21 +1,20 @@
-package GinBoot
+package ginboot
 
 import (
 	"context"
 	"fmt"
-	"github.com/klass-lk/ginboot/types"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"math"
 	"time"
 )
 
-type MongoRepository[T types.Document] struct {
+type MongoRepository[T Document] struct {
 	collection *mongo.Collection
 }
 
-func NewMongoRepository[T types.Document](db *mongo.Database) *MongoRepository[T] {
+func NewMongoRepository[T Document](db *mongo.Database) *MongoRepository[T] {
 	var doc T
 	return &MongoRepository[T]{
 		collection: db.Collection(doc.GetCollectionName()),
@@ -191,7 +190,7 @@ func (r *MongoRepository[T]) FindAll(opts ...*options.FindOptions) ([]T, error)
 	return results, err
 }
 
-func (r *MongoRepository[T]) FindAllPaginated(pageRequest types.PageRequest) (types.PageResponse[T], error) {
+func (r *MongoRepository[T]) FindAllPaginated(pageRequest PageRequest) (PageResponse[T], error) {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 	skip := bson.D{{"$skip", (pageRequest.Page - 1) * pageRequest.Size}}
@@ -204,21 +203,21 @@ func (r *MongoRepository[T]) FindAllPaginated(pageRequest types.PageRequest) (ty
 	cursor, err := r.Query().Aggregate(ctx, aggregationPipeline)
 	if err != nil {
 		fmt.Println("Error running aggregation:", err)
-		return types.PageResponse[T]{}, err
+		return PageResponse[T]{}, err
 	}
 	defer cursor.Close(ctx)
 
 	var results []T
 	if err = cursor.All(ctx, &results); err != nil {
 		fmt.Println("Error retrieving results:", err)
-		return types.PageResponse[T]{}, err
+		return PageResponse[T]{}, err
 	}
 	count, err := r.Query().CountDocuments(ctx, bson.M{})
 	if err != nil {
-		return types.PageResponse[T]{}, err
+		return PageResponse[T]{}, err
 	}
 	totalPages := int(math.Ceil(float64(count) / float64(pageRequest.Size)))
-	pageResponse := types.PageResponse[T]{
+	pageResponse := PageResponse[T]{
 		Contents:         results,
 		NumberOfElements: pageRequest.Size,
 		Pageable:         pageRequest,
@@ -228,7 +227,7 @@ func (r *MongoRepository[T]) FindAllPaginated(pageRequest types.PageRequest) (ty
 	return pageResponse, nil
 }
 
-func (r *MongoRepository[T]) FindByPaginated(pageRequest types.PageRequest, filters map[string]interface{}) (types.PageResponse[T], error) {
+func (r *MongoRepository[T]) FindByPaginated(pageRequest PageRequest, filters map[string]interface{}) (PageResponse[T], error) {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 
@@ -248,21 +247,21 @@ func (r *MongoRepository[T]) FindByPaginated(pageRequest types.PageRequest, filt
 	cursor, err := r.Query().Aggregate(ctx, aggregationPipeline)
 	if err != nil {
 		fmt.Println("Error running aggregation:", err)
-		return types.PageResponse[T]{}, err
+		return PageResponse[T]{}, err
 	}
 	defer cursor.Close(ctx)
 
 	var results []T
 	if err = cursor.All(ctx, &results); err != nil {
 		fmt.Println("Error retrieving results:", err)
-		return types.PageResponse[T]{}, err
+		return PageResponse[T]{}, err
 	}
 	count, err := r.Query().CountDocuments(ctx, filter)
 	if err != nil {
-		return types.PageResponse[T]{}, err
+		return PageResponse[T]{}, err
 	}
 	totalPages := int(math.Ceil(float64(count) / float64(pageRequest.Size)))
-	pageResponse := types.PageResponse[T]{
+	pageResponse := PageResponse[T]{
 		Contents:         results,
 		NumberOfElements: pageRequest.Size,
 		Pageable:         pageRequest,

diff --git a/security/password_encoder.go → password_encoder.go b/security/password_encoder.go → password_encoder.go
@@ -1,4 +1,4 @@
-package security
+package ginboot
 
 type PasswordEncoder interface {
 	GetPasswordHash(password string) (string, error)

diff --git a/security/pbkdf2_encoder.go → pbkdf2_encoder.go b/security/pbkdf2_encoder.go → pbkdf2_encoder.go
@@ -1,4 +1,4 @@
-package security
+package ginboot
 
 import (
 	"crypto/sha512"