From 193b82725fc9ab7b487002456f7ef37c0970955b Mon Sep 17 00:00:00 2001 From: aespin Date: Mon, 7 Oct 2024 10:38:01 +0200 Subject: [PATCH] wip --- cmd/app.go | 18 ++++++++++++++++- go.mod | 11 ++++++++--- go.sum | 23 ++++++++++++++++++---- storage/storage.go | 48 +++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 89 insertions(+), 11 deletions(-) diff --git a/cmd/app.go b/cmd/app.go index 30b237c..8c547c6 100644 --- a/cmd/app.go +++ b/cmd/app.go @@ -17,6 +17,11 @@ import ( func Run() error { logLevel := flag.String("log-level", "debug", "trace log level") httpAddr := flag.String("http-addr", ":3000", "http bind address") + dbUsername := flag.String("db-username", "postgres", "database username") + dbPassword := flag.String("db-password", "Me8140@01", "database user password") + dbHost := flag.String("db-host", "db", "database host address") + dbPort := flag.Int("db-port", 5432, "database tcp port") + dbName := flag.String("db-name", "falcon", "database user password") // setup logger log := logger.New(os.Stdout, *logLevel) // log fields @@ -25,7 +30,18 @@ func Run() error { "log_level": *logLevel, } // create storage - storage := storage.New() + storage, err := storage.New(&storage.DBConfig{ + Username: *dbUsername, + Password: *dbPassword, + Host: *dbHost, + Port: *dbPort, + Name: *dbName, + }) + // handle error + if err != nil { + log.Error("create storage failed", err, logFields) + return err + } // create router router := httprouter.New() // create routes diff --git a/go.mod b/go.mod index 97f666f..a2e8a8a 100644 --- a/go.mod +++ b/go.mod @@ -5,15 +5,20 @@ go 1.23.1 require ( git.espin.casa/albert/logger v1.0.0 github.com/julienschmidt/httprouter v1.3.0 + gorm.io/driver/postgres v1.5.9 gorm.io/gorm v1.25.12 ) require ( + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/pgx/v5 v5.5.5 // indirect + github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/sirupsen/logrus v1.9.3 // indirect - github.com/stretchr/testify v1.7.1 // indirect - golang.org/x/sys v0.5.0 // indirect + golang.org/x/crypto v0.17.0 // indirect + golang.org/x/sync v0.1.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index ecb8948..80274c7 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,14 @@ git.espin.casa/albert/logger v1.0.0/go.mod h1:TXbZ7mayDtJvcs+DucVbs2klio9jq5k1eW github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.5.5 h1:amBjrZVmksIdNjxGW/IiIMzxMKZFelXbUoPNb+8sjQw= +github.com/jackc/pgx/v5 v5.5.5/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A= +github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= +github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= @@ -14,17 +22,24 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8= +gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI= gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8= gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= diff --git a/storage/storage.go b/storage/storage.go index bc2bc90..087045b 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -3,10 +3,21 @@ package storage import ( "context" "fmt" + "sync" "git.espin.casa/albert/cml04-falcon-ui/types" + "gorm.io/driver/postgres" + "gorm.io/gorm" ) +type DBConfig struct { + Username string + Password string + Host string + Port int + Name string +} + type Storager interface { Barcode(ctx context.Context, reading string) (barcode *types.Barcode, err error) ListBarcode(ctx context.Context, lb types.LoadingBed, inicio, final string) (barcodes []types.Barcode, err error) @@ -14,7 +25,10 @@ type Storager interface { ListBundle(ctx context.Context) } -type storage struct{} +type storage struct { + db *gorm.DB + mux sync.RWMutex +} // ListBundle implements Storager. func (s *storage) ListBundle(ctx context.Context) { @@ -38,6 +52,34 @@ func (s *storage) Barcode(ctx context.Context, reading string) (barcode *types.B return &types.Barcode{}, nil } -func New() Storager { - return &storage{} +func ProductionDataBase(conf *DBConfig) (*gorm.DB, error) { + // create dsn string + dsn := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=disable TimeZone=Europe/Madrid", + conf.Host, + conf.Username, + conf.Password, + conf.Name, + conf.Port, + ) + // create open database connection + db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{}) + if err != nil { + return nil, err + } + return db, nil +} + +func New(conf *DBConfig) (Storager, error) { + // database holder + var db *gorm.DB + // producctio + db, err := ProductionDataBase(conf) + if err != nil { + return nil, err + } + // done + return &storage{ + db: db, + mux: sync.RWMutex{}, + }, nil }