RESTService hinzugefügt.
This commit is contained in:
Marco Kittel
parent
35fd1f595a
commit
c5d27c68c8
@ -2,6 +2,7 @@ package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"os"
|
||||
"os/signal"
|
||||
"sync"
|
||||
@ -19,6 +20,13 @@ const (
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
||||
connectionstr := os.Getenv("CONNECTIONSTRING")
|
||||
if len(connectionstr) == 0 {
|
||||
fmt.Println("Connectionstring fehlt!. Bsp.: <user>:<passwort>@tcp(127.0.0.1:3306)/elio?parseTime=true")
|
||||
return
|
||||
}
|
||||
|
||||
ctx, cancel := signal.NotifyContext(
|
||||
context.Background(),
|
||||
os.Interrupt,
|
||||
@ -27,7 +35,7 @@ func main() {
|
||||
|
||||
defer cancel()
|
||||
var wg sync.WaitGroup
|
||||
db := database.NewDatabaseWriter(&wg)
|
||||
db := database.NewDatabaseWriter(connectionstr)
|
||||
ds := dataservice.NewDataService(ctx)
|
||||
ds.AddListener(db)
|
||||
wg.Add(ds.ListenerCount())
|
||||
|
||||
105
cmd/websrv/main.go
Normal file
105
cmd/websrv/main.go
Normal file
@ -0,0 +1,105 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"net/http"
|
||||
|
||||
"gittea.marcokittel.de/elio/eliotools/datawriter/internal/database"
|
||||
)
|
||||
|
||||
type Container struct {
|
||||
Products map[string]int `json:"products"`
|
||||
Context Context `json:"context"`
|
||||
}
|
||||
|
||||
type Product struct {
|
||||
Warehouse string `json:"warehouse"`
|
||||
Quantity int `json:"quantity"`
|
||||
Delivery int `json:"delivery_time"`
|
||||
}
|
||||
|
||||
type OutgoingProducts struct {
|
||||
Products map[string][]Product `json:"products"`
|
||||
}
|
||||
|
||||
func NewOutgoingProducts() *OutgoingProducts {
|
||||
op := OutgoingProducts{
|
||||
Products: make(map[string][]Product),
|
||||
}
|
||||
return &op
|
||||
}
|
||||
|
||||
type Context struct {
|
||||
Country string `json:"country"`
|
||||
State string `json:"state"`
|
||||
}
|
||||
|
||||
const (
|
||||
connectionString = "root:eliogeheim@tcp(127.0.0.1:3306)/elio_test?parseTime=true"
|
||||
)
|
||||
|
||||
func main() {
|
||||
//Env Variablen nutzen
|
||||
dbr := database.NewDatabaseReader(connectionString)
|
||||
http.HandleFunc("/api/products", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != "POST" {
|
||||
return
|
||||
}
|
||||
defer r.Body.Close()
|
||||
data, err := io.ReadAll(r.Body)
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
return
|
||||
}
|
||||
var foo Container
|
||||
err = json.Unmarshal(data, &foo)
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
return
|
||||
}
|
||||
|
||||
fmt.Println(foo)
|
||||
result := []OutgoingProducts{}
|
||||
for key, item := range foo.Products {
|
||||
//Checken ob die Felder leer sind / Validitätsprüfung einbauen
|
||||
products, err := dbr.GetProductByProductIdDeliveryCountryAndState(key, foo.Context.Country, foo.Context.State)
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
}
|
||||
if len(products) == 0 {
|
||||
continue
|
||||
}
|
||||
gebrauchteProduktAnzahl := item
|
||||
op := NewOutgoingProducts()
|
||||
for _, db_products := range products {
|
||||
if gebrauchteProduktAnzahl <= 0 {
|
||||
continue
|
||||
}
|
||||
if db_products.Amount >= gebrauchteProduktAnzahl {
|
||||
newProduct := Product{Delivery: db_products.DeliveryDays, Quantity: gebrauchteProduktAnzahl, Warehouse: db_products.Warehouse}
|
||||
gebrauchteProduktAnzahl = 0
|
||||
op.Products[key] = append(op.Products[key], newProduct)
|
||||
} else if db_products.Amount < gebrauchteProduktAnzahl {
|
||||
newProduct := Product{Delivery: db_products.DeliveryDays, Quantity: db_products.Amount, Warehouse: db_products.Warehouse}
|
||||
gebrauchteProduktAnzahl -= db_products.Amount
|
||||
op.Products[key] = append(op.Products[key], newProduct)
|
||||
}
|
||||
}
|
||||
result = append(result, *op)
|
||||
fmt.Println(op)
|
||||
}
|
||||
jsonResult, err := json.Marshal(result)
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.WriteHeader(http.StatusOK)
|
||||
fmt.Fprintln(w, string(jsonResult))
|
||||
})
|
||||
|
||||
log.Fatal(http.ListenAndServe(":8080", nil))
|
||||
|
||||
}
|
||||
27
go.mod
27
go.mod
@ -11,5 +11,32 @@ require gittea.marcokittel.de/elio/eliotools/eliofile v0.0.0-20250629191242-28cf
|
||||
|
||||
require (
|
||||
filippo.io/edwards25519 v1.1.0 // indirect
|
||||
github.com/bytedance/sonic v1.11.6 // indirect
|
||||
github.com/bytedance/sonic/loader v0.1.1 // indirect
|
||||
github.com/cloudwego/base64x v0.1.4 // indirect
|
||||
github.com/cloudwego/iasm v0.2.0 // indirect
|
||||
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
|
||||
github.com/gin-contrib/sse v0.1.0 // indirect
|
||||
github.com/gin-gonic/gin v1.10.1 // indirect
|
||||
github.com/go-playground/locales v0.14.1 // indirect
|
||||
github.com/go-playground/universal-translator v0.18.1 // indirect
|
||||
github.com/go-playground/validator/v10 v10.20.0 // indirect
|
||||
github.com/go-sql-driver/mysql v1.9.3 // indirect
|
||||
github.com/goccy/go-json v0.10.2 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
|
||||
github.com/leodido/go-urn v1.4.0 // indirect
|
||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
||||
github.com/ugorji/go/codec v1.2.12 // indirect
|
||||
golang.org/x/arch v0.8.0 // indirect
|
||||
golang.org/x/crypto v0.23.0 // indirect
|
||||
golang.org/x/net v0.25.0 // indirect
|
||||
golang.org/x/sys v0.20.0 // indirect
|
||||
golang.org/x/text v0.15.0 // indirect
|
||||
google.golang.org/protobuf v1.34.1 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
||||
79
go.sum
79
go.sum
@ -1,7 +1,65 @@
|
||||
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
|
||||
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
|
||||
github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
|
||||
github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
|
||||
github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
|
||||
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
|
||||
github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
|
||||
github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
|
||||
github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
|
||||
github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
|
||||
github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
|
||||
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
|
||||
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
|
||||
github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
|
||||
github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
|
||||
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
|
||||
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
|
||||
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
|
||||
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
|
||||
github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8=
|
||||
github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
|
||||
github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
|
||||
github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
|
||||
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
|
||||
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
|
||||
github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
|
||||
github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
|
||||
github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
|
||||
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
|
||||
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
|
||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
|
||||
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
||||
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
|
||||
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
|
||||
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/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
|
||||
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
|
||||
github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
|
||||
gittea.marcokittel.de/elio/eliotools/eliofile v0.0.0-20250626215804-b8e72f5652e6 h1:dru/Bcg52eUmNm2qnWnKPmpYB4VjnFPBdhWXARZOqPo=
|
||||
gittea.marcokittel.de/elio/eliotools/eliofile v0.0.0-20250626215804-b8e72f5652e6/go.mod h1:h9FfBWQD/1+fF3sFaYN89K3xH54t3LHKBKQj8YiAjnU=
|
||||
gittea.marcokittel.de/elio/eliotools/eliofile v0.0.0-20250628161103-9cee287699cf h1:safOKitxO+dbliwBM40U1/1e1sfupXmxTrPGst4PqFA=
|
||||
@ -58,3 +116,24 @@ gittea.marcokittel.de/elio/eliotools/tools v0.0.0-20250628161103-9cee287699cf h1
|
||||
gittea.marcokittel.de/elio/eliotools/tools v0.0.0-20250628161103-9cee287699cf/go.mod h1:jJvuXliNOiG9i8VXrY9vK5Bqv9QwDtswCs3CNIIBvUQ=
|
||||
gittea.marcokittel.de/elio/eliotools/tools v0.0.0-20250628215830-0e90b68e2239 h1:ektVJ1MDFTRSAiP4rwd9zX9EcFFlJQMa/XA8m00BjMo=
|
||||
gittea.marcokittel.de/elio/eliotools/tools v0.0.0-20250628215830-0e90b68e2239/go.mod h1:jJvuXliNOiG9i8VXrY9vK5Bqv9QwDtswCs3CNIIBvUQ=
|
||||
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
||||
golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
|
||||
golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
|
||||
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
|
||||
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
||||
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
|
||||
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
|
||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
|
||||
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
|
||||
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
|
||||
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
|
||||
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=
|
||||
nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
|
||||
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
|
||||
|
||||
@ -16,16 +16,21 @@ import (
|
||||
)
|
||||
|
||||
type DatabaseWriter struct {
|
||||
wg *sync.WaitGroup
|
||||
mu sync.Mutex
|
||||
log logger.Logger
|
||||
db *sql.DB
|
||||
}
|
||||
|
||||
func (d *DatabaseWriter) connectDB() (*sql.DB, error) {
|
||||
// Format: "username:password@tcp(host:port)/dbname?params"
|
||||
//
|
||||
db, err := sql.Open("mysql", "root:eliogeheim@tcp(127.0.0.1:3306)/elio?parseTime=true")
|
||||
type DatabaseReader struct {
|
||||
DatabaseWriter
|
||||
}
|
||||
|
||||
func NewDatabaseReader(connectionString string) *DatabaseReader {
|
||||
return &DatabaseReader{*NewDatabaseWriter(connectionString)}
|
||||
}
|
||||
|
||||
func (d *DatabaseWriter) connectDB(connectionString string) (*sql.DB, error) {
|
||||
db, err := sql.Open("mysql", connectionString)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@ -67,24 +72,22 @@ func (d *DatabaseWriter) createDeliveryTableIfNotExist() error {
|
||||
return err
|
||||
}
|
||||
|
||||
func NewDatabaseWriter(wg *sync.WaitGroup) *DatabaseWriter {
|
||||
db := DatabaseWriter{log: logger.NewMarcoLogger(),
|
||||
wg: wg,
|
||||
}
|
||||
sql, err := db.connectDB()
|
||||
func NewDatabaseWriter(connectionString string) *DatabaseWriter {
|
||||
db := DatabaseWriter{log: logger.NewMarcoLogger()}
|
||||
sql, err := db.connectDB(connectionString)
|
||||
if err != nil {
|
||||
fmt.Printf("Datenbank nicht gefunden. %w", err)
|
||||
fmt.Printf("Datenbank nicht gefunden. %s", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
db.db = sql
|
||||
err = db.createWarehouseTableIfNotExist()
|
||||
if err != nil {
|
||||
fmt.Printf("Warenhaus-Tabellen-Erstellung fehlgeschlagen. %w", err)
|
||||
fmt.Printf("Warenhaus-Tabellen-Erstellung fehlgeschlagen. %s", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
err = db.createDeliveryTableIfNotExist()
|
||||
if err != nil {
|
||||
fmt.Printf("Delivery-Tablellen-Erstellung fehlgeschlagen. %w", err)
|
||||
fmt.Printf("Delivery-Tabellen-Erstellung fehlgeschlagen. %s", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
return &db
|
||||
@ -120,6 +123,44 @@ func (d *DatabaseWriter) UpdateOrInsertDelivery(fromcountry string, tocountry st
|
||||
return nil
|
||||
}
|
||||
|
||||
type ProductDelivery struct {
|
||||
Id int
|
||||
Warehouse string
|
||||
Amount int
|
||||
DeliveryDays int
|
||||
}
|
||||
|
||||
func (d *DatabaseReader) GetProductByProductIdDeliveryCountryAndState(prod_id, delivery_country, delivery_country_state string) ([]ProductDelivery, error) {
|
||||
stmt := `
|
||||
SELECT whp.id, warehouse, amount, d.delivery
|
||||
FROM warehouseproducts whp
|
||||
left join deliverytimes d
|
||||
on whp.warehouse = d.fromcountry
|
||||
where productid = ?
|
||||
and d.tocountry = ?
|
||||
and d.state = ?
|
||||
order by d.delivery asc, amount desc
|
||||
`
|
||||
|
||||
rows, err := d.db.Query(stmt, prod_id, delivery_country, delivery_country_state)
|
||||
defer rows.Close()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var products []ProductDelivery
|
||||
|
||||
for rows.Next() {
|
||||
var pd ProductDelivery
|
||||
if err := rows.Scan(&pd.Id, &pd.Warehouse, &pd.Amount, &pd.DeliveryDays); err != nil {
|
||||
return products, err
|
||||
}
|
||||
products = append(products, pd)
|
||||
}
|
||||
|
||||
return products, nil
|
||||
}
|
||||
|
||||
func (db *DatabaseWriter) HandleData(ctx context.Context, data eliofile.CountryCsvData) error {
|
||||
// a.log.Info("HandleData")
|
||||
if strings.Contains(strings.Join(data.Data, ","), "product_id") || strings.Contains(strings.Join(data.Data, ","), "delivery_time") {
|
||||
|
||||
3017
internal/database/database_setup.go
Normal file
3017
internal/database/database_setup.go
Normal file
File diff suppressed because it is too large
Load Diff
109
internal/database/database_test.go
Normal file
109
internal/database/database_test.go
Normal file
@ -0,0 +1,109 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// Unit Tests sollten niemals auf der Produktivdatenbank stattfinden.
|
||||
// Sie sollten nicht wie Unit Tests betrachtet werden.
|
||||
const (
|
||||
connectionString = "root:eliogeheim@tcp(127.0.0.1:3306)/elio_test?parseTime=true"
|
||||
)
|
||||
|
||||
func Setup(dbr *DatabaseReader) error {
|
||||
_, err := dbr.DatabaseWriter.db.Exec("drop table if exists elio_test.warehouseproducts")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = dbr.DatabaseWriter.db.Exec("drop table if exists elio_test.deliverytimes")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = dbr.DatabaseWriter.createDeliveryTableIfNotExist()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = dbr.DatabaseWriter.createWarehouseTableIfNotExist()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
statements := strings.Split(CreateInserts, ";")
|
||||
statementsDlvry := strings.Split(CreateDeliveryInserts, ";")
|
||||
statements = append(statements, statementsDlvry...)
|
||||
|
||||
tx, err := dbr.db.Begin()
|
||||
defer func() error {
|
||||
if r := recover(); r != nil {
|
||||
tx.Rollback()
|
||||
return fmt.Errorf("Scheiße passiert!")
|
||||
} else if err != nil {
|
||||
_:
|
||||
tx.Rollback()
|
||||
return fmt.Errorf("Scheiße passiert!")
|
||||
} else {
|
||||
err = tx.Commit()
|
||||
if err != nil {
|
||||
return fmt.Errorf("Scheiße passiert!")
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}()
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, stmt := range statements {
|
||||
_, err := tx.Exec(stmt)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func TestDatabaseConnection(t *testing.T) {
|
||||
var dbr = NewDatabaseReader(connectionString)
|
||||
err := dbr.db.Ping()
|
||||
if err != nil {
|
||||
t.Errorf("Datenbankverbindung fehlgeschlagen! %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSelectStatementNoDatasetsAvailable(t *testing.T) {
|
||||
var dbr = NewDatabaseReader(connectionString)
|
||||
err := Setup(dbr)
|
||||
if err != nil {
|
||||
t.Errorf("Setup failed! %s", err)
|
||||
}
|
||||
_, err = dbr.GetProductByProductIdDeliveryCountryAndState("X9299", "EU", "")
|
||||
if err != nil {
|
||||
t.Errorf("Es dürfen keine Datensätze gefunden werden! %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSelectStatement(t *testing.T) {
|
||||
var dbr = NewDatabaseReader(connectionString)
|
||||
data, err := dbr.GetProductByProductIdDeliveryCountryAndState("A6053", "EU", "")
|
||||
if err != nil {
|
||||
t.Errorf("Es sollten keine Datensätze auffinbdar sein! %s", err)
|
||||
}
|
||||
|
||||
if len(data) != 3 {
|
||||
t.Errorf("Es müssen drei Datensätze vorhanden sein. Stattdessen sind es %d", len(data))
|
||||
}
|
||||
|
||||
compareStr := "[{7507 DE 23 2} {500 EU 1 2} {8508 AT 4 4}]"
|
||||
dbResultStr := fmt.Sprintln(data)
|
||||
dbResultStr = strings.Trim(dbResultStr, "\n")
|
||||
if strings.Compare(compareStr, dbResultStr) != 0 {
|
||||
t.Errorf("Error: die Datensätze sind ungleich. \nSoll sein :\n%s\n ist aber: \n%s", compareStr, dbResultStr)
|
||||
}
|
||||
}
|
||||
@ -17,7 +17,6 @@ import (
|
||||
)
|
||||
|
||||
// Daten über Channel aus der Goroutine ausführen. CounterID stellt sicher, dass das Herkunftsland der Daten bekannt ist.
|
||||
|
||||
// Rückgabe eines Closures zur Verbeitung einer CSV Datei. Posix Only. No Windows.
|
||||
func DataServiceDebugHandler(log logger.Logger, baseDir string, processedDir string) func(ctx context.Context, filename string, data chan<- eliofile.CountryCsvData) bool {
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user