Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion database/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type Connection struct {
env *env.Environment
}

func MakeConnection(env *env.Environment) (*Connection, error) {
func NewConnection(env *env.Environment) (*Connection, error) {
dbEnv := env.DB
driver, err := gorm.Open(postgres.Open(dbEnv.GetDSN()), &gorm.Config{})

Expand Down
4 changes: 2 additions & 2 deletions database/connection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ func setupPostgresConnection(t *testing.T, models ...interface{}) (*database.Con
},
}

conn, err := database.MakeConnection(e)
conn, err := database.NewConnection(e)
if err != nil {
t.Fatalf("make connection: %v", err)
t.Fatalf("new connection: %v", err)
}

if len(models) > 0 {
Expand Down
2 changes: 1 addition & 1 deletion database/repository/categories.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (c Categories) GetAll(paginate pagination.Paginate) (*pagination.Pagination
}

paginate.SetNumItems(numItems)
result := pagination.MakePagination[database.Category](categories, paginate)
result := pagination.NewPagination[database.Category](categories, paginate)

return result, nil
}
Expand Down
2 changes: 1 addition & 1 deletion database/repository/pagination/pagination.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type Pagination[T any] struct {
PreviousPage *int `json:"previous_page,omitempty"`
}

func MakePagination[T any](data []T, paginate Paginate) *Pagination[T] {
func NewPagination[T any](data []T, paginate Paginate) *Pagination[T] {
pSize := float64(paginate.Limit)
if pSize <= 0 {
pSize = 10
Expand Down
4 changes: 2 additions & 2 deletions database/repository/pagination/pagination_func_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ package pagination

import "testing"

func TestMakePagination(t *testing.T) {
func TestNewPagination(t *testing.T) {
p := Paginate{
Page: 2,
Limit: 2,
}

p.SetNumItems(5)

result := MakePagination([]int{1, 2}, p)
result := NewPagination([]int{1, 2}, p)

if result.TotalPages != 3 {
t.Fatalf("expected 3 pages got %d", result.TotalPages)
Expand Down
2 changes: 1 addition & 1 deletion database/repository/posts.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func (p Posts) GetAll(filters queries.PostFilters, paginate pagination.Paginate)
}

paginate.SetNumItems(numItems)
result := pagination.MakePagination[database.Post](posts, paginate)
result := pagination.NewPagination[database.Post](posts, paginate)

return result, nil
}
Expand Down
2 changes: 1 addition & 1 deletion database/repository/queries/posts_filters.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func (f PostFilters) GetTag() string {
}

func (f PostFilters) sanitiseString(seed string) string {
str := portal.MakeStringable(seed)
str := portal.NewStringable(seed)

return strings.TrimSpace(str.ToLower())
}
4 changes: 2 additions & 2 deletions database/repository/repository_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ func setupDB(t *testing.T) *database.Connection {
},
}

conn, err := database.MakeConnection(e)
conn, err := database.NewConnection(e)

if err != nil {
t.Fatalf("make connection: %v", err)
t.Fatalf("new connection: %v", err)
}

t.Cleanup(func() { conn.Close() })
Expand Down
4 changes: 2 additions & 2 deletions database/repository/testhelpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ func newPostgresConnection(t *testing.T, models ...interface{}) *database.Connec
},
}

conn, err := database.MakeConnection(e)
conn, err := database.NewConnection(e)
if err != nil {
t.Fatalf("make connection: %v", err)
t.Fatalf("new connection: %v", err)
}

if len(models) > 0 {
Expand Down
6 changes: 3 additions & 3 deletions database/seeder/importer/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func init() {
secrets := kernel.Ignite("./.env", portal.GetDefaultValidator())

environment = secrets
sentryHub = kernel.MakeSentry(environment)
sentryHub = kernel.NewSentry(environment)
}

func main() {
Expand All @@ -49,8 +49,8 @@ func run(filePath string, environment *env.Environment, sentryHub *portal.Sentry

cli.ClearScreen()

dbConnection := kernel.MakeDbConnection(environment)
logs := kernel.MakeLogs(environment)
dbConnection := kernel.NewDbConnection(environment)
logs := kernel.NewLogs(environment)

defer sentry.Flush(2 * time.Second)
defer logs.Close()
Expand Down
2 changes: 1 addition & 1 deletion database/seeder/importer/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func SeedFromFile(conn *database.Connection, environment *env.Environment, fileP
}

func prepareDatabase(ctx context.Context, conn *database.Connection, environment *env.Environment) error {
truncate := database.MakeTruncate(conn, environment)
truncate := database.NewTruncate(conn, environment)

if err := truncate.Execute(); err != nil {
return fmt.Errorf("importer: truncate database: %w", err)
Expand Down
4 changes: 2 additions & 2 deletions database/seeder/importer/runner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -711,9 +711,9 @@ func setupPostgresConnection(t *testing.T) (*database.Connection, *env.Environme
},
}

conn, err := database.MakeConnection(e)
conn, err := database.NewConnection(e)
if err != nil {
t.Fatalf("make connection: %v", err)
t.Fatalf("new connection: %v", err)
}

cleanup := func() {
Expand Down
8 changes: 4 additions & 4 deletions database/seeder/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@ func init() {
secrets := kernel.Ignite("./.env", portal.GetDefaultValidator())

environment = secrets
sentryHub = kernel.MakeSentry(environment)
sentryHub = kernel.NewSentry(environment)
}

func main() {
cli.ClearScreen()

dbConnection := kernel.MakeDbConnection(environment)
logs := kernel.MakeLogs(environment)
dbConnection := kernel.NewDbConnection(environment)
logs := kernel.NewLogs(environment)

defer sentry.Flush(2 * time.Second)
defer logs.Close()
defer (*dbConnection).Close()
defer kernel.RecoverWithSentry(sentryHub)

// [1] --- Create the Seeder Runner.
seeder := seeds.MakeSeeder(dbConnection, environment)
seeder := seeds.NewSeeder(dbConnection, environment)

// [2] --- Truncate the db.
if err := seeder.TruncateDB(); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion database/seeder/seeds/categories.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ type CategoriesSeed struct {
db *database.Connection
}

func MakeCategoriesSeed(db *database.Connection) *CategoriesSeed {
func NewCategoriesSeed(db *database.Connection) *CategoriesSeed {
return &CategoriesSeed{
db: db,
}
Expand Down
2 changes: 1 addition & 1 deletion database/seeder/seeds/comments.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type CommentsSeed struct {
db *database.Connection
}

func MakeCommentsSeed(db *database.Connection) *CommentsSeed {
func NewCommentsSeed(db *database.Connection) *CommentsSeed {
return &CommentsSeed{
db: db,
}
Expand Down
24 changes: 12 additions & 12 deletions database/seeder/seeds/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type Seeder struct {
environment *env.Environment
}

func MakeSeeder(dbConnection *database.Connection, environment *env.Environment) *Seeder {
func NewSeeder(dbConnection *database.Connection, environment *env.Environment) *Seeder {
return &Seeder{
dbConn: dbConnection,
environment: environment,
Expand All @@ -26,7 +26,7 @@ func (s *Seeder) TruncateDB() error {
return fmt.Errorf("cannot truncate db at the seeder level")
}

truncate := database.MakeTruncate(s.dbConn, s.environment)
truncate := database.NewTruncate(s.dbConn, s.environment)

if err := truncate.Execute(); err != nil {
panic(err)
Expand All @@ -36,7 +36,7 @@ func (s *Seeder) TruncateDB() error {
}

func (s *Seeder) SeedUsers() (database.User, database.User) {
users := MakeUsersSeed(s.dbConn)
users := NewUsersSeed(s.dbConn)

UserA, err := users.Create(database.UsersAttrs{
Username: "gocanto",
Expand All @@ -62,7 +62,7 @@ func (s *Seeder) SeedUsers() (database.User, database.User) {
}

func (s *Seeder) SeedPosts(UserA, UserB database.User) []database.Post {
posts := MakePostsSeed(s.dbConn)
posts := NewPostsSeed(s.dbConn)
timex := time.Now()

PostsA, err := posts.CreatePosts(database.PostsAttrs{
Expand Down Expand Up @@ -95,7 +95,7 @@ func (s *Seeder) SeedPosts(UserA, UserB database.User) []database.Post {
}

func (s *Seeder) SeedCategories() []database.Category {
categories := MakeCategoriesSeed(s.dbConn)
categories := NewCategoriesSeed(s.dbConn)

result, err := categories.Create(database.CategoriesAttrs{
Slug: fmt.Sprintf("category-slug-%s", uuid.NewString()),
Expand All @@ -111,7 +111,7 @@ func (s *Seeder) SeedCategories() []database.Category {
}

func (s *Seeder) SeedTags() []database.Tag {
seed := MakeTagsSeed(s.dbConn)
seed := NewTagsSeed(s.dbConn)

tags, err := seed.Create()

Expand All @@ -123,7 +123,7 @@ func (s *Seeder) SeedTags() []database.Tag {
}

func (s *Seeder) SeedComments(posts ...database.Post) {
seed := MakeCommentsSeed(s.dbConn)
seed := NewCommentsSeed(s.dbConn)

timex := time.Now()
var values []database.CommentsAttrs
Expand All @@ -144,7 +144,7 @@ func (s *Seeder) SeedComments(posts ...database.Post) {
}

func (s *Seeder) SeedLikes(posts ...database.Post) {
seed := MakeLikesSeed(s.dbConn)
seed := NewLikesSeed(s.dbConn)
var values []database.LikesAttrs

for _, post := range posts {
Expand All @@ -166,7 +166,7 @@ func (s *Seeder) SeedPostsCategories(categories []database.Category, posts []dat
return
}

seed := MakePostCategoriesSeed(s.dbConn)
seed := NewPostCategoriesSeed(s.dbConn)

var post database.Post
var category database.Category
Expand All @@ -192,7 +192,7 @@ func (s *Seeder) SeedPostTags(tags []database.Tag, posts []database.Post) {
return
}

seed := MakePostTagsSeed(s.dbConn)
seed := NewPostTagsSeed(s.dbConn)

var post database.Post
var label database.Tag
Expand All @@ -218,7 +218,7 @@ func (s *Seeder) SeedPostViews(posts []database.Post, users ...database.User) {
return
}

seed := MakePostViewsSeed(s.dbConn)
seed := NewPostViewsSeed(s.dbConn)

var values []database.PostViewsAttr

Expand Down Expand Up @@ -261,7 +261,7 @@ func (s *Seeder) SeedNewsLetters() error {
UnsubscribedAt: &currentTime,
}

seed := MakeNewslettersSeed(s.dbConn)
seed := NewNewslettersSeed(s.dbConn)
newsletters = append(newsletters, a, b)

if err := seed.Create(newsletters); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion database/seeder/seeds/likes.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ type LikesSeed struct {
db *database.Connection
}

func MakeLikesSeed(db *database.Connection) *LikesSeed {
func NewLikesSeed(db *database.Connection) *LikesSeed {
return &LikesSeed{
db: db,
}
Expand Down
2 changes: 1 addition & 1 deletion database/seeder/seeds/newsletters.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type NewslettersSeed struct {
db *database.Connection
}

func MakeNewslettersSeed(db *database.Connection) *NewslettersSeed {
func NewNewslettersSeed(db *database.Connection) *NewslettersSeed {
return &NewslettersSeed{
db: db,
}
Expand Down
2 changes: 1 addition & 1 deletion database/seeder/seeds/post_categories.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type PostCategoriesSeed struct {
db *database.Connection
}

func MakePostCategoriesSeed(db *database.Connection) *PostCategoriesSeed {
func NewPostCategoriesSeed(db *database.Connection) *PostCategoriesSeed {
return &PostCategoriesSeed{
db: db,
}
Expand Down
2 changes: 1 addition & 1 deletion database/seeder/seeds/post_tags.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type PostTagsSeed struct {
db *database.Connection
}

func MakePostTagsSeed(db *database.Connection) *PostTagsSeed {
func NewPostTagsSeed(db *database.Connection) *PostTagsSeed {
return &PostTagsSeed{
db: db,
}
Expand Down
2 changes: 1 addition & 1 deletion database/seeder/seeds/post_views.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type PostViewsSeed struct {
db *database.Connection
}

func MakePostViewsSeed(db *database.Connection) *PostViewsSeed {
func NewPostViewsSeed(db *database.Connection) *PostViewsSeed {
return &PostViewsSeed{
db: db,
}
Expand Down
2 changes: 1 addition & 1 deletion database/seeder/seeds/posts.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ type PostsSeed struct {
db *database.Connection
}

func MakePostsSeed(db *database.Connection) *PostsSeed {
func NewPostsSeed(db *database.Connection) *PostsSeed {
return &PostsSeed{
db: db,
}
Expand Down
6 changes: 3 additions & 3 deletions database/seeder/seeds/seeder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ func testConnection(t *testing.T, e *env.Environment) *database.Connection {
TimeZone: "UTC",
}

conn, err := database.MakeConnection(e)
conn, err := database.NewConnection(e)

if err != nil {
t.Fatalf("make connection: %v", err)
t.Fatalf("new connection: %v", err)
}

t.Cleanup(func() { conn.Close() })
Expand Down Expand Up @@ -92,7 +92,7 @@ func setupSeeder(t *testing.T) *Seeder {

conn := testConnection(t, e)

return MakeSeeder(conn, e)
return NewSeeder(conn, e)
}

func TestSeederWorkflow(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion database/seeder/seeds/tags.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ type TagsSeed struct {
db *database.Connection
}

func MakeTagsSeed(db *database.Connection) *TagsSeed {
func NewTagsSeed(db *database.Connection) *TagsSeed {
return &TagsSeed{
db: db,
}
Expand Down
4 changes: 2 additions & 2 deletions database/seeder/seeds/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ type UsersSeed struct {
db *database.Connection
}

func MakeUsersSeed(db *database.Connection) *UsersSeed {
func NewUsersSeed(db *database.Connection) *UsersSeed {
return &UsersSeed{
db: db,
}
}

func (s UsersSeed) Create(attrs database.UsersAttrs) (database.User, error) {
pass, err := portal.MakePassword("password")
pass, err := portal.NewPassword("password")
if err != nil {
return database.User{}, fmt.Errorf("failed to generate seed password: %w", err)
}
Expand Down
Loading
Loading