Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -11,13 +11,51 @@ import (
|
||||
"time"
|
||||
)
|
||||
|
||||
func readStockAttrFilters(r *http.Request) (kategori, urunAnaGrubu, urunAltGrubu, renk, renk2, urunIcerigi, fit, drop, beden string) {
|
||||
q := r.URL.Query()
|
||||
|
||||
kategori = strings.TrimSpace(firstNonEmpty(q.Get("kategori"), q.Get("att44")))
|
||||
urunAnaGrubu = strings.TrimSpace(firstNonEmpty(q.Get("urun_ana_grubu"), q.Get("att01")))
|
||||
urunAltGrubu = strings.TrimSpace(firstNonEmpty(q.Get("urun_alt_grubu"), q.Get("att02")))
|
||||
renk = strings.TrimSpace(q.Get("renk"))
|
||||
renk2 = strings.TrimSpace(firstNonEmpty(q.Get("renk2"), q.Get("yaka")))
|
||||
urunIcerigi = strings.TrimSpace(firstNonEmpty(q.Get("urun_icerigi"), q.Get("att41")))
|
||||
fit = strings.TrimSpace(firstNonEmpty(q.Get("fit"), q.Get("att38")))
|
||||
drop = strings.TrimSpace(firstNonEmpty(q.Get("drop"), q.Get("att11")))
|
||||
beden = strings.TrimSpace(q.Get("beden"))
|
||||
return
|
||||
}
|
||||
|
||||
func firstNonEmpty(vals ...string) string {
|
||||
for _, v := range vals {
|
||||
if strings.TrimSpace(v) != "" {
|
||||
return v
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// GetProductStockAttributeOptionsHandler
|
||||
// GET /api/product-stock-attribute-options
|
||||
func GetProductStockAttributeOptionsHandler(w http.ResponseWriter, _ *http.Request) {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
|
||||
func GetProductStockAttributeOptionsHandler(w http.ResponseWriter, r *http.Request) {
|
||||
kategori, urunAnaGrubu, urunAltGrubu, renk, renk2, urunIcerigi, fit, drop, beden := readStockAttrFilters(r)
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
|
||||
defer cancel()
|
||||
|
||||
rows, err := db.MssqlDB.QueryContext(ctx, queries.GetProductStockAttributeOptionsQuery)
|
||||
rows, err := db.MssqlDB.QueryContext(
|
||||
ctx,
|
||||
queries.GetProductStockAttributeOptionsQuery,
|
||||
kategori,
|
||||
urunAnaGrubu,
|
||||
urunAltGrubu,
|
||||
renk,
|
||||
renk2,
|
||||
urunIcerigi,
|
||||
fit,
|
||||
drop,
|
||||
beden,
|
||||
)
|
||||
if err != nil {
|
||||
log.Printf("[PRODUCT-STOCK-ATTR-OPTIONS] SQL hatasi: %v", err)
|
||||
http.Error(w, "SQL hatasi: "+err.Error(), http.StatusInternalServerError)
|
||||
@@ -26,14 +64,15 @@ func GetProductStockAttributeOptionsHandler(w http.ResponseWriter, _ *http.Reque
|
||||
defer rows.Close()
|
||||
|
||||
result := map[string][]string{
|
||||
"att01": {},
|
||||
"att02": {},
|
||||
"att10": {},
|
||||
"att11": {},
|
||||
"att21": {},
|
||||
"att35": {},
|
||||
"att36": {},
|
||||
"att44": {},
|
||||
"kategori": {},
|
||||
"urun_ana_grubu": {},
|
||||
"urun_alt_grubu": {},
|
||||
"renk": {},
|
||||
"renk2": {},
|
||||
"urun_icerigi": {},
|
||||
"fit": {},
|
||||
"drop": {},
|
||||
"beden": {},
|
||||
}
|
||||
|
||||
for rows.Next() {
|
||||
@@ -59,20 +98,12 @@ func GetProductStockAttributeOptionsHandler(w http.ResponseWriter, _ *http.Reque
|
||||
}
|
||||
|
||||
// GetProductStockQueryByAttributesHandler
|
||||
// GET /api/product-stock-query-by-attributes?att01=...&att02=...
|
||||
// GET /api/product-stock-query-by-attributes
|
||||
func GetProductStockQueryByAttributesHandler(w http.ResponseWriter, r *http.Request) {
|
||||
att01 := strings.TrimSpace(r.URL.Query().Get("att01"))
|
||||
att02 := strings.TrimSpace(r.URL.Query().Get("att02"))
|
||||
att10 := strings.TrimSpace(r.URL.Query().Get("att10"))
|
||||
att11 := strings.TrimSpace(r.URL.Query().Get("att11"))
|
||||
att21 := strings.TrimSpace(r.URL.Query().Get("att21"))
|
||||
att35 := strings.TrimSpace(r.URL.Query().Get("att35"))
|
||||
att36 := strings.TrimSpace(r.URL.Query().Get("att36"))
|
||||
att44 := strings.TrimSpace(r.URL.Query().Get("att44"))
|
||||
kategori, urunAnaGrubu, urunAltGrubu, renk, renk2, urunIcerigi, fit, drop, beden := readStockAttrFilters(r)
|
||||
|
||||
hasAny := att01 != "" || att02 != "" || att10 != "" || att11 != "" || att21 != "" || att35 != "" || att36 != "" || att44 != ""
|
||||
if !hasAny {
|
||||
http.Error(w, "En az bir urun ozelligi secilmelidir", http.StatusBadRequest)
|
||||
if kategori == "" || urunAnaGrubu == "" {
|
||||
http.Error(w, "Kategori ve Urun Ana Grubu secimi zorunludur", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -80,11 +111,23 @@ func GetProductStockQueryByAttributesHandler(w http.ResponseWriter, r *http.Requ
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 90*time.Second)
|
||||
defer cancel()
|
||||
log.Printf(
|
||||
"[PRODUCT-STOCK-BY-ATTRS] request att01=%q att02=%q att10=%q att11=%q att21=%q att35=%q att36=%q att44=%q",
|
||||
att01, att02, att10, att11, att21, att35, att36, att44,
|
||||
"[PRODUCT-STOCK-BY-ATTRS] request kategori=%q urun_ana_grubu=%q urun_alt_grubu=%q renk=%q renk2=%q urun_icerigi=%q fit=%q drop=%q beden=%q",
|
||||
kategori, urunAnaGrubu, urunAltGrubu, renk, renk2, urunIcerigi, fit, drop, beden,
|
||||
)
|
||||
|
||||
rows, err := db.MssqlDB.QueryContext(ctx, queries.GetProductStockQueryByAttributes, att01, att02, att10, att11, att21, att35, att36, att44)
|
||||
rows, err := db.MssqlDB.QueryContext(
|
||||
ctx,
|
||||
queries.GetProductStockQueryByAttributes,
|
||||
kategori,
|
||||
urunAnaGrubu,
|
||||
urunAltGrubu,
|
||||
renk,
|
||||
renk2,
|
||||
urunIcerigi,
|
||||
fit,
|
||||
drop,
|
||||
beden,
|
||||
)
|
||||
if err != nil {
|
||||
log.Printf("[PRODUCT-STOCK-BY-ATTRS] SQL hatasi: %v", err)
|
||||
http.Error(w, "SQL hatasi: "+err.Error(), http.StatusInternalServerError)
|
||||
|
||||
Reference in New Issue
Block a user