Skip to content

Commit

Permalink
Sale order products were added
Browse files Browse the repository at this point in the history
  • Loading branch information
kiaplayer committed Jul 13, 2024
1 parent 189e098 commit ef66f97
Show file tree
Hide file tree
Showing 29 changed files with 1,479 additions and 613 deletions.
6 changes: 4 additions & 2 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import (
"github.com/joho/godotenv"
_ "github.com/mattn/go-sqlite3"

"github.com/kiaplayer/clean-architecture-example/internal/adapters/repositories/sale_order"
"github.com/kiaplayer/clean-architecture-example/internal/adapters/repositories/document/sale_order"
"github.com/kiaplayer/clean-architecture-example/internal/adapters/repositories/reference/product"
saleorderservice "github.com/kiaplayer/clean-architecture-example/internal/domain/service/sale_order"
createsaleorderusecase "github.com/kiaplayer/clean-architecture-example/internal/domain/use_case/create_sale_order"
getsaleorderusecase "github.com/kiaplayer/clean-architecture-example/internal/domain/use_case/get_sale_order"
Expand Down Expand Up @@ -42,7 +43,8 @@ func main() {
timeGenerator := generators.NewTimeGenerator()
numberGenerator := generators.NewNumberGenerator()
saleOrderRepo := sale_order.NewRepository(dbConn)
saleOrderService := saleorderservice.NewService(saleOrderRepo)
productRepo := product.NewRepository(dbConn)
saleOrderService := saleorderservice.NewService(saleOrderRepo, productRepo)

createSaleOrderHandler := create_sale_order.NewHandler(
createsaleorderusecase.NewUseCase(timeGenerator, numberGenerator, saleOrderService),
Expand Down
1 change: 1 addition & 0 deletions db/migrations/000001_create_products_table.down.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DROP TABLE IF EXISTS product;
6 changes: 6 additions & 0 deletions db/migrations/000001_create_products_table.up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CREATE TABLE IF NOT EXISTS product
(
id INTEGER PRIMARY KEY,
name TEXT NOT NULL,
status INTEGER NOT NULL DEFAULT 0
);
1 change: 0 additions & 1 deletion db/migrations/000001_create_sale_orders.down.sql

This file was deleted.

7 changes: 0 additions & 7 deletions db/migrations/000001_create_sale_orders.up.sql

This file was deleted.

3 changes: 3 additions & 0 deletions db/migrations/000002_create_sale_orders_tables.down.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
DROP TABLE IF EXISTS sale_order_product;

DROP TABLE IF EXISTS sale_order;
18 changes: 18 additions & 0 deletions db/migrations/000002_create_sale_orders_tables.up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
CREATE TABLE IF NOT EXISTS sale_order
(
id INTEGER PRIMARY KEY,
number TEXT UNIQUE NOT NULL,
date TIMESTAMP WITH TIME ZONE NOT NULL,
status INTEGER NOT NULL DEFAULT 0
);

CREATE TABLE IF NOT EXISTS sale_order_product
(
id INTEGER PRIMARY KEY,
parent_id INTEGER,
product_id INTEGER NOT NULL,
quantity DECIMAL NOT NULL,
price DECIMAL NOT NULL,
FOREIGN KEY(parent_id) REFERENCES sale_order(id),
FOREIGN KEY(product_id) REFERENCES product(id)
);
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ go 1.22
require (
github.com/DATA-DOG/go-sqlmock v1.5.1
github.com/golang-migrate/migrate/v4 v4.17.1
github.com/golang/mock v1.6.0
github.com/joho/godotenv v1.5.1
github.com/mattn/go-sqlite3 v1.14.22
github.com/stretchr/testify v1.8.4
go.uber.org/mock v0.4.0
)

require (
Expand Down
27 changes: 2 additions & 25 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/golang-migrate/migrate/v4 v4.17.1 h1:4zQ6iqL6t6AiItphxJctQb3cFqWiSpMnX7wLTPnnYO4=
github.com/golang-migrate/migrate/v4 v4.17.1/go.mod h1:m8hinFyWBn0SA4QKHuKh175Pm9wjmxj3S2Mia7dbXzM=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
Expand Down Expand Up @@ -37,31 +35,10 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
Expand Down
189 changes: 189 additions & 0 deletions internal/adapters/repositories/document/sale_order/sale_order.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
package sale_order

import (
"context"
"database/sql"
"fmt"
"slices"

"github.com/kiaplayer/clean-architecture-example/internal/domain/entity/document"
"github.com/kiaplayer/clean-architecture-example/internal/domain/entity/reference"
"github.com/kiaplayer/clean-architecture-example/pkg/helpers"
"github.com/kiaplayer/clean-architecture-example/pkg/storage/db"
)

type Repository struct {
*db.TransactionalRepository
}

func NewRepository(qe db.QueryExecutor) *Repository {
return &Repository{
TransactionalRepository: db.NewTransactionalRepository(qe),
}
}

func (r *Repository) CreateOrder(ctx context.Context, order *document.SaleOrder) (*document.SaleOrder, error) {
insertResult, err := r.DB(ctx).ExecContext(
ctx,
"INSERT INTO sale_order (number, date, status) VALUES (?, ?, ?)",
order.Number,
helpers.TimeToString(order.Date),
order.Status,
)
if err != nil {
return nil, err
}

lastID, err := insertResult.LastInsertId()
if err != nil {
return nil, err
}
order.ID = uint64(lastID)

for i, product := range order.Products {
insertResult, err := r.DB(ctx).ExecContext(
ctx,
"INSERT INTO sale_order_product (parent_id, product_id, quantity, price) VALUES (?, ?, ?, ?)",
order.ID,
product.Product.ID,
product.Quantity,
product.Price,
)
if err != nil {
return nil, err
}

lastID, err := insertResult.LastInsertId()
if err != nil {
return nil, err
}

order.Products[i].ID = uint64(lastID)
}

return order, nil
}

func (r *Repository) GetByID(ctx context.Context, id uint64) (*document.SaleOrder, error) {
saleOrderDTO := struct {
ID uint64
Number string
Date string
Status int
}{}

queryResult, err := r.DB(ctx).QueryContext(
ctx,
"SELECT id, date, number, status FROM sale_order WHERE id = ?",
id,
)
if err != nil {
return nil, err
}

defer func(queryResult *sql.Rows) {
_ = queryResult.Close()
}(queryResult)

if queryResult.Next() {
err = queryResult.Scan(&saleOrderDTO.ID, &saleOrderDTO.Date, &saleOrderDTO.Number, &saleOrderDTO.Status)
if err != nil {
return nil, err
}
} else {
if queryResult.Err() != nil {
return nil, queryResult.Err()
}
return nil, nil
}

date, err := helpers.StringToTime(saleOrderDTO.Date)
if err != nil {
return nil, fmt.Errorf("bad date: %s", saleOrderDTO.Date)
}

status := document.Status(saleOrderDTO.Status)
if !slices.Contains(document.ValidStatuses, status) {
return nil, fmt.Errorf("bad status: %d", status)
}

result := &document.SaleOrder{
Document: document.Document{
ID: saleOrderDTO.ID,
Number: saleOrderDTO.Number,
Date: date,
Status: status,
},
}

saleOrderProductDTO := struct {
ID uint64
ProductID uint64
ProductName string
ProductStatus int
Quantity int
Price float32
}{}

queryResult, err = r.DB(ctx).QueryContext(
ctx,
`
SELECT
sop.id,
sop.product_id,
sop.quantity,
sop.price,
p.name,
p.status
FROM sale_order_product AS sop
LEFT JOIN product AS p ON p.id = sop.product_id
WHERE sop.parent_id = ?
`,
result.ID,
)
if err != nil {
return nil, err
}

defer func(queryResult *sql.Rows) {
_ = queryResult.Close()
}(queryResult)

for queryResult.Next() {
err = queryResult.Scan(
&saleOrderProductDTO.ID,
&saleOrderProductDTO.ProductID,
&saleOrderProductDTO.Quantity,
&saleOrderProductDTO.Price,
&saleOrderProductDTO.ProductName,
&saleOrderProductDTO.ProductStatus,
)
if err != nil {
return nil, err
}

productStatus := reference.Status(saleOrderProductDTO.ProductStatus)
if !slices.Contains(reference.ValidStatuses, productStatus) {
return nil, fmt.Errorf("bad status: %d", productStatus)
}

result.Products = append(result.Products, document.SaleOrderProduct{
ID: saleOrderProductDTO.ID,
Product: reference.Product{
Reference: reference.Reference{
ID: saleOrderProductDTO.ProductID,
Name: saleOrderProductDTO.ProductName,
Status: productStatus,
},
},
Quantity: saleOrderProductDTO.Quantity,
Price: saleOrderProductDTO.Price,
})
}

if queryResult.Err() != nil {
return nil, queryResult.Err()
}

return result, nil
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (rts *TestRepositorySuite) SetupSuite() {
}

m, err := migrate.NewWithDatabaseInstance(
"file://../../../../db/migrations",
"file://./../../../../../db/migrations",
"sqlite3",
driver,
)
Expand Down
Loading

0 comments on commit ef66f97

Please sign in to comment.