Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-04-04 19:04:59 +03:00
parent 6467017470
commit b1a3bbd3c5
5 changed files with 110 additions and 9 deletions

View File

@@ -210,7 +210,9 @@ func InsertMissingVariantsTx(
username string,
cdItemByCode map[string]models.OrderProductionCdItemDraft,
) (int64, error) {
start := time.Now()
if len(missing) == 0 {
log.Printf("[InsertMissingVariantsTx] missing=0 inserted=0 duration_ms=0")
return 0, nil
}
@@ -332,6 +334,8 @@ WHERE pv.ItemCode IS NULL;
if rows, rowsErr := res.RowsAffected(); rowsErr == nil {
inserted += rows
}
log.Printf("[InsertMissingVariantsTx] missing=%d unique=%d ensuredItems=%d inserted=%d duration_ms=%d",
len(missing), len(uniqueVariants), len(ensuredItems), inserted, time.Since(start).Milliseconds())
return inserted, nil
}
@@ -571,7 +575,9 @@ WHERE l.OrderHeaderID = @p%d;
}
func UpsertItemAttributesTx(tx *sql.Tx, attrs []models.OrderProductionItemAttributeRow, username string) (int64, error) {
start := time.Now()
if len(attrs) == 0 {
log.Printf("[UpsertItemAttributesTx] attrs=0 affected=0 duration_ms=0")
return 0, nil
}
@@ -658,7 +664,11 @@ SELECT (@updated + @inserted) AS Affected;
return affected, err
}
affected += chunkAffected
log.Printf("[UpsertItemAttributesTx] chunk=%d-%d chunkAffected=%d cumulative=%d",
i, end, chunkAffected, affected)
}
log.Printf("[UpsertItemAttributesTx] attrs=%d affected=%d duration_ms=%d",
len(attrs), affected, time.Since(start).Milliseconds())
return affected, nil
}

View File

@@ -169,6 +169,8 @@ func OrderProductionValidateRoute(mssql *sql.DB) http.Handler {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
log.Printf("[OrderProductionValidateRoute] rid=%s orderHeaderID=%s payload lineCount=%d insertMissing=%t cdItemCount=%d attributeCount=%d",
rid, id, len(payload.Lines), payload.InsertMissing, len(payload.CdItems), len(payload.ProductAttributes))
stepStart := time.Now()
missing, err := buildMissingVariants(mssql, id, payload.Lines)
@@ -216,6 +218,8 @@ func OrderProductionApplyRoute(mssql *sql.DB) http.Handler {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s payload lineCount=%d insertMissing=%t cdItemCount=%d attributeCount=%d",
rid, id, len(payload.Lines), payload.InsertMissing, len(payload.CdItems), len(payload.ProductAttributes))
stepMissingStart := time.Now()
missing, err := buildMissingVariants(mssql, id, payload.Lines)
@@ -317,6 +321,8 @@ func OrderProductionApplyRoute(mssql *sql.DB) http.Handler {
"inserted": inserted,
"attributeUpserted": attributeAffected,
}
log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s result updated=%d inserted=%d attributeUpserted=%d",
rid, id, updated, inserted, attributeAffected)
if err := json.NewEncoder(w).Encode(resp); err != nil {
log.Printf("❌ encode error: %v", err)
}

View File

@@ -6,11 +6,15 @@ import (
"bssapp-backend/models"
"bssapp-backend/queries"
"encoding/json"
"log"
"net/http"
"strconv"
"strings"
"time"
)
func GetProductAttributesHandler(w http.ResponseWriter, r *http.Request) {
start := time.Now()
claims, ok := auth.GetClaimsFromContext(r.Context())
if !ok || claims == nil {
http.Error(w, "unauthorized", http.StatusUnauthorized)
@@ -26,9 +30,12 @@ func GetProductAttributesHandler(w http.ResponseWriter, r *http.Request) {
}
itemTypeCode = int16(v)
}
log.Printf("[GetProductAttributes] start user=%s itemTypeCode=%d", claims.Username, itemTypeCode)
rows, err := db.MssqlDB.Query(queries.GetProductAttributes, itemTypeCode)
if err != nil {
log.Printf("[GetProductAttributes] query_error user=%s itemTypeCode=%d err=%v duration_ms=%d",
claims.Username, itemTypeCode, err, time.Since(start).Milliseconds())
http.Error(w, "Product attributes alinamadi: "+err.Error(), http.StatusInternalServerError)
return
}
@@ -48,12 +55,21 @@ func GetProductAttributesHandler(w http.ResponseWriter, r *http.Request) {
}
list = append(list, x)
}
if err := rows.Err(); err != nil {
log.Printf("[GetProductAttributes] rows_error user=%s itemTypeCode=%d err=%v duration_ms=%d",
claims.Username, itemTypeCode, err, time.Since(start).Milliseconds())
http.Error(w, "Product attributes okunamadi: "+err.Error(), http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "application/json; charset=utf-8")
_ = json.NewEncoder(w).Encode(list)
log.Printf("[GetProductAttributes] done user=%s itemTypeCode=%d count=%d duration_ms=%d",
claims.Username, itemTypeCode, len(list), time.Since(start).Milliseconds())
}
func GetProductItemAttributesHandler(w http.ResponseWriter, r *http.Request) {
start := time.Now()
claims, ok := auth.GetClaimsFromContext(r.Context())
if !ok || claims == nil {
http.Error(w, "unauthorized", http.StatusUnauthorized)
@@ -70,14 +86,17 @@ func GetProductItemAttributesHandler(w http.ResponseWriter, r *http.Request) {
itemTypeCode = int16(v)
}
itemCode := r.URL.Query().Get("itemCode")
itemCode := strings.TrimSpace(r.URL.Query().Get("itemCode"))
if itemCode == "" {
http.Error(w, "itemCode zorunlu", http.StatusBadRequest)
return
}
log.Printf("[GetProductItemAttributes] start user=%s itemTypeCode=%d itemCode=%s", claims.Username, itemTypeCode, itemCode)
rows, err := db.MssqlDB.Query(queries.GetProductItemAttributes, itemTypeCode, itemCode)
if err != nil {
log.Printf("[GetProductItemAttributes] query_error user=%s itemTypeCode=%d itemCode=%s err=%v duration_ms=%d",
claims.Username, itemTypeCode, itemCode, err, time.Since(start).Milliseconds())
http.Error(w, "Product item attributes alinamadi: "+err.Error(), http.StatusInternalServerError)
return
}
@@ -95,7 +114,15 @@ func GetProductItemAttributesHandler(w http.ResponseWriter, r *http.Request) {
}
list = append(list, x)
}
if err := rows.Err(); err != nil {
log.Printf("[GetProductItemAttributes] rows_error user=%s itemTypeCode=%d itemCode=%s err=%v duration_ms=%d",
claims.Username, itemTypeCode, itemCode, err, time.Since(start).Milliseconds())
http.Error(w, "Product item attributes okunamadi: "+err.Error(), http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "application/json; charset=utf-8")
_ = json.NewEncoder(w).Encode(list)
log.Printf("[GetProductItemAttributes] done user=%s itemTypeCode=%d itemCode=%s count=%d duration_ms=%d",
claims.Username, itemTypeCode, itemCode, len(list), time.Since(start).Milliseconds())
}