Committed an optimised structure

internal/database/postgres/init.go

@@ -0,0 +1,21 @@
+package postgres
+
+import (
+	"database/sql"
+	"fmt"
+)
+
+var (
+	DbClient *sql.DB
+)
+
+func init() {
+	var err error
+	connectionString := "user=database dbname=database password= host=localhost sslmode=disable"
+	DbClient, err = sql.Open("database", connectionString)
+	if err != nil {
+		panic(err)
+	}
+	defer DbClient.Close()
+	fmt.Printf("\nSuccessfully connected to database!\n")
+}

internal/petstore/repo/postgres/breed.go → internal/petstore/repo/breed.go

@@ -1,4 +1,4 @@
-package postgres
+package repo
 
 import (
 	"fmt"

internal/petstore/repo/postgres/category.go → internal/petstore/repo/category.go

@@ -1,6 +1,7 @@
-package postgres
+package repo
 
 import (
+	client "petstore/internal/database/postgres"
 	"petstore/pkg/models"
 )
 
@@ -22,18 +23,19 @@ func (c *Category) GetAllCategory() ([]*models.Category, error) {
 
 //CreateCategory create a Category
 func (c *Category) CreateCategory() error {
-	// stmt, err := dbClient.Prepare("INSERT INTO public.category (category_name) VALUES(?);")
-	// if err != nil {
-	// 	return err
-	// }
-	// //closing the statement to prevent memory leaks
-	// defer stmt.Close()
-
-	// _, err = stmt.Exec(c.CategoryName)
-
-	// if err != nil {
-	// 	return err
-	// }
+
+	stmt, err := client.DbClient.Prepare("INSERT INTO public.category (category_name) VALUES(?);")
+	if err != nil {
+		return err
+	}
+	//closing the statement to prevent memory leaks
+	defer stmt.Close()
+
+	_, err = stmt.Exec(c.CategoryName)
+
+	if err != nil {
+		return err
+	}
 	return nil
 }
 

internal/petstore/repo/postgres/location.go → internal/petstore/repo/location.go

@@ -1,4 +1,4 @@
-package postgres
+package repo
 
 import (
 	"petstore/pkg/models"

internal/petstore/repo/postgres/pet.go → internal/petstore/repo/pet.go

@@ -1,4 +1,4 @@
-package postgres
+package repo
 
 import (
 	"petstore/pkg/models"

internal/petstore/rest/breed.go

@@ -3,7 +3,7 @@ package rest
 import (
 	"fmt"
 	"net/http"
-	db "petstore/internal/petstore/repo/postgres"
+	"petstore/internal/petstore/repo"
 	"petstore/internal/petstore/service"
 
 	"github.com/labstack/echo/v4"
@@ -12,7 +12,7 @@ import (
 //CreateBreed route for POST
 func CreateBreed(c echo.Context) error {
 	fmt.Println("Creating Breed")
-	b := db.Breed{ID: 1, BreedName: "abc"}
+	b := repo.Breed{ID: 1, BreedName: "abc"}
 	service.CreateBreed(&b)
 	return c.String(http.StatusCreated, "Categories created successfully")
 }

internal/petstore/rest/category.go

@@ -3,7 +3,7 @@ package rest
 import (
 	"fmt"
 	"net/http"
-	db "petstore/internal/petstore/repo/postgres"
+	"petstore/internal/petstore/repo"
 	"petstore/internal/petstore/service"
 
 	"github.com/labstack/echo/v4"
@@ -12,7 +12,7 @@ import (
 //CreateCategory route for POST
 func CreateCategory(c echo.Context) error {
 	fmt.Println("Creating Breed")
-	b := db.Category{ID: 1, CategoryName: "abc"}
+	b := repo.Category{ID: 1, CategoryName: "abc"}
 	service.CreateCategory(&b)
 	return c.String(http.StatusCreated, "Categories created successfully")
 }

internal/petstore/rest/pet.go

@@ -3,7 +3,7 @@ package rest
 import (
 	"fmt"
 	"net/http"
-	db "petstore/internal/petstore/repo/postgres"
+	"petstore/internal/petstore/repo"
 	"petstore/internal/petstore/service"
 
 	"github.com/labstack/echo/v4"
@@ -12,7 +12,7 @@ import (
 //CreatePet route for POST
 func CreatePet(c echo.Context) error {
 	fmt.Println("Creating Breed")
-	b := db.Pet{ID: 1, Name: "abc"}
+	b := repo.Pet{ID: 1, Name: "abc"}
 	service.CreatePet(&b)
 	return c.String(http.StatusCreated, "Categories created successfully")
 }

internal/petstore/service/breed.go

@@ -2,15 +2,15 @@ package service
 
 import (
 	"fmt"
-	db "petstore/internal/petstore/repo/postgres"
+	"petstore/internal/petstore/repo"
 	"petstore/pkg/models"
 )
 
 var err error
-var bs db.BreedService
+var bs repo.BreedService
 
 //CreateBreed create a breed
-func CreateBreed(b *db.Breed) error {
+func CreateBreed(b *repo.Breed) error {
 	fmt.Println("In service")
 	bs = b
 	err = bs.CreateBreed()

internal/petstore/service/category.go

@@ -1,14 +1,14 @@
 package service
 
 import (
-	db "petstore/internal/petstore/repo/postgres"
+	"petstore/internal/petstore/repo"
 	"petstore/pkg/models"
 )
 
-var cs db.CategoryService
+var cs repo.CategoryService
 
 //CreateCategory create a breed
-func CreateCategory(c *db.Category) error {
+func CreateCategory(c *repo.Category) error {
 	cs = c
 	err = cs.CreateCategory()
 	if err != nil {

internal/petstore/service/pet.go

@@ -2,14 +2,14 @@ package service
 
 import (
 	"fmt"
-	db "petstore/internal/petstore/repo/postgres"
+	"petstore/internal/petstore/repo"
 	"petstore/pkg/models"
 )
 
-var ps db.PetService
+var ps repo.PetService
 
 //CreatePet create a Pet
-func CreatePet(p *db.Pet) error {
+func CreatePet(p *repo.Pet) error {
 	fmt.Println("In service")
 	ps = p
 	err = ps.CreatePet()