Merge remote-tracking branch 'origin/master'

svc/routes/wholesale_campaigns.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -420,6 +421,18 @@ type wholesaleVariantRow struct {
 	CampaignLast  string  `json:"campaign_last_dttm"`
 }
 
+func buildNebimVariantDisplayCode(colorCode string, dim3Code string) string {
+	colorCode = strings.TrimSpace(colorCode)
+	dim3Code = strings.TrimSpace(dim3Code)
+	if colorCode != "" && dim3Code != "" {
+		return colorCode + "-" + dim3Code
+	}
+	if colorCode != "" {
+		return colorCode
+	}
+	return dim3Code
+}
+
 type wholesaleCampaignHistoryRow struct {
 	ID           int64   `json:"id"`
 	CampaignID   *int64  `json:"campaign_id"`
@@ -736,6 +749,7 @@ DO UPDATE SET dim_id = EXCLUDED.dim_id, updated_at = EXCLUDED.updated_at
 			ItemID      int64
 			Dim1        int64
 			Dim3Key     int64
+			HasMSSQL    bool
 		}
 
 		// Build base variant keys from PG's authoritative table (mmitem_dim).
@@ -805,7 +819,8 @@ WHERE mmitem_id = ANY($1::bigint[])
 			rows.Close()
 		}
 
-		// Resolve dim ids -> tokens for a readable VariantCode.
+		// Resolve dim ids -> tokens for a fallback readable VariantCode.
+		// MSSQL/Nebim tokens override this below; PG ids are only storage keys.
 		idToToken := map[int64]string{}
 		if len(dimIDs) > 0 {
 			// uniq
@@ -900,23 +915,23 @@ ORDER BY dim_id, updated_at DESC;
 			key := fmt.Sprintf("%d|%d|%d", itemID, d1, d3k)
 			prev, ok := tmpMap[key]
 			if !ok {
-				// If PG does not have mmitem_dim rows for this item yet, seed it from MSSQL and include it.
-				if !hasMMItemDim[itemID] {
-					var v2 any = nil
-					if d3k > 0 {
-						v2 = d3k
-					}
-					v3 := int64(0)
-					if id, ok := resolveDimID("dimval1", dim3Code); ok {
-						v3 = id
-					}
-					mmdimID := int64(2)
-					var v3any any = nil
-					if v3 > 0 {
-						mmdimID = 3
-						v3any = v3
-					}
-					_, _ = pg.ExecContext(ctx, `
+				// Seed missing MSSQL combos even when the product already has some mmitem_dim rows.
+				// PG remains the storage key source, but MSSQL may reveal new/missing color or dim3 combos.
+				var v2 any = nil
+				if sizeID, ok := resolveDimID("dimval1", dim1Code); ok && sizeID > 0 {
+					v2 = sizeID
+				}
+				v3 := int64(0)
+				if id, ok := resolveDimID("dimval1", dim3Code); ok {
+					v3 = id
+				}
+				mmdimID := int64(2)
+				var v3any any = nil
+				if v3 > 0 {
+					mmdimID = 3
+					v3any = v3
+				}
+				_, _ = pg.ExecContext(ctx, `
 INSERT INTO mmitem_dim (mmitem_id, mmdim_id, val1, val2, val3, is_active, qty)
 SELECT $1, $2, $3, $4, $5, TRUE, 0
 WHERE NOT EXISTS (
@@ -930,26 +945,25 @@ WHERE NOT EXISTS (
   LIMIT 1
 );
 `, itemID, mmdimID, d1, v2, v3any)
-					hasMMItemDim[itemID] = true
+				hasMMItemDim[itemID] = true
 
-					code := strings.TrimSpace(itemToCode[itemID])
-					if code != "" {
-						tmpMap[key] = tmpRow{
-							ProductCode: code,
-							VariantCode: "",
-							StockQty:    0,
-							ItemID:      itemID,
-							Dim1:        d1,
-							Dim3Key:     d3k,
-						}
-						// Keep dim token cache for VariantCode formatting.
-						dimIDs = append(dimIDs, d1)
-						if d3k > 0 {
-							dimIDs = append(dimIDs, d3k)
-						}
-						prev = tmpMap[key]
-						ok = true
+				code := strings.TrimSpace(itemToCode[itemID])
+				if code != "" {
+					tmpMap[key] = tmpRow{
+						ProductCode: code,
+						VariantCode: "",
+						StockQty:    0,
+						ItemID:      itemID,
+						Dim1:        d1,
+						Dim3Key:     d3k,
 					}
+					// Keep dim token cache for VariantCode formatting.
+					dimIDs = append(dimIDs, d1)
+					if d3k > 0 {
+						dimIDs = append(dimIDs, d3k)
+					}
+					prev = tmpMap[key]
+					ok = true
 				}
 				if !ok {
 					continue
@@ -960,6 +974,8 @@ WHERE NOT EXISTS (
 				q = qty.Float64
 			}
 			prev.StockQty += q
+			prev.VariantCode = buildNebimVariantDisplayCode(colorCode, dim3Code)
+			prev.HasMSSQL = true
 			tmpMap[key] = prev
 			_ = colorCode // display-only
 		}
@@ -968,6 +984,15 @@ WHERE NOT EXISTS (
 		for _, v := range tmpMap {
 			tmp = append(tmp, v)
 		}
+		sort.SliceStable(tmp, func(i, j int) bool {
+			if tmp[i].ProductCode != tmp[j].ProductCode {
+				return tmp[i].ProductCode < tmp[j].ProductCode
+			}
+			if tmp[i].HasMSSQL != tmp[j].HasMSSQL {
+				return tmp[i].HasMSSQL
+			}
+			return strings.TrimSpace(tmp[i].VariantCode) < strings.TrimSpace(tmp[j].VariantCode)
+		})
 
 		// Bulk load campaign assignment for each (mmitem_id, dim1, dim3_key)
 		type keyRec struct {