WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/offercircular/ScopeConfig.java

         private final boolean keep;
         private final String reason;
         private final String brand;
         private final int categoryId;
         private final List<Pattern> includeOnly;
+        private final String canonicalLabel;
         private Decision(boolean keep, String reason, String brand, int categoryId,
-                         List<Pattern> includeOnly) {
+                         List<Pattern> includeOnly, String canonicalLabel) {
             this.keep = keep;
             this.reason = reason;
             this.brand = brand;
             this.categoryId = categoryId;
             this.includeOnly = includeOnly;
+            this.canonicalLabel = canonicalLabel;
+        }
         public boolean isKeep() { return keep; }
         public String getReason() { return reason; }
         public String getBrand() { return brand; }
         public int getCategoryId() { return categoryId; }
+        /**
+         * The division's own label, with any alias already resolved. Everything that
+         * looks a division up by name must use THIS and not the label the PDF printed -
+         * see CircularIngestRepository.selectDivisionAliases for what goes wrong
+         * otherwise.
+         */
+        public String getCanonicalLabel() { return canonicalLabel; }
         /** Drops entities that no INCLUDE_ONLY rule accepts (Apple -> iPhone only). */
         public List<String> filterEntities(List<String> entities) {
             if (includeOnly == null || includeOnly.isEmpty()) {
                 return entities;
+            }
+    }
     private final Map<String, Division> divisions = new LinkedHashMap<>();
     private final Map<String, List<Rule>> rules = new LinkedHashMap<>();
     private final Map<String, String> brandByLabel = new LinkedHashMap<>();
+    /** alias label -> the division's own label. Never the other way round. */
+    private final Map<String, String> aliases = new LinkedHashMap<>();
     private ScopeConfig() { }
     public static ScopeConfig load(CircularIngestRepository repository) {
         ScopeConfig config = new ScopeConfig();
             String brand = row.length > 3 && row[3] != null ? (String) row[3] : "";
             if (!brand.isEmpty()) {
                 config.brandByLabel.put(label, brand);
+            }
+        }
+        for (Object[] row : repository.selectDivisionAliases()) {
+            String alias = (String) row[0];
+            String target = (String) row[1];
+            // A label that is a division in its own right must never be shadowed by an
+            // alias - it would resolve two ways and which won would depend on load order.
+            // The controller refuses to save such an alias; this is the second guard, for
+            // rows that predate it or were inserted by hand.
+            if (alias == null || target == null || config.divisions.containsKey(alias)) {
+                continue;
+            }
+            config.aliases.put(alias, target);
+        }
         for (Object[] row : repository.selectScopeRules()) {
             String label = row[0] == null ? "" : (String) row[0];
             config.rules.computeIfAbsent(label, k -> new ArrayList<>())
                     .add(new Rule((String) row[1],
                             Pattern.compile((String) row[2], Pattern.CASE_INSENSITIVE)));
             return ((Number) value).intValue() == 1;
+        }
         return value != null && "1".equals(value.toString());
+    }
+    /**
+     * The label this one really means - itself, unless it is a known alias.
+     *
+     * Callers must run every label through this BEFORE writing anything, and must keep
+     * using the result for the division lookup, the offer insert and the product-alias
+     * lookup. The one place the raw label survives is offer_raw_row, which records what
+     * the PDF actually said.
+     */
+    public String canonicalLabel(String label) {
+        String target = aliases.get(label);
+        return target == null ? label : target;
+    }
-    public Decision evaluate(String label, String products) {
+    public Decision evaluate(String rawLabel, String products) {
+        String label = canonicalLabel(rawLabel);
         Division division = divisions.get(label);
         if (division == null) {
-            return new Decision(false, "UNKNOWN division label: " + label, null, 0, null);
+            return new Decision(false, "UNKNOWN division label: " + rawLabel, null, 0, null, label);
+        }
         if (!division.inScope) {
-            return new Decision(false, "out of scope by config: " + label, null, 0, null);
+            return new Decision(false, "out of scope by config: " + label, null, 0, null, label);
+        }
         String haystack = products == null ? "" : products;
         List<Pattern> includeOnly = new ArrayList<>();
         // division-specific rules first, then global ones (label "")
         for (String scope : new String[]{label, ""}) {
+            }
             for (Rule rule : scoped) {
                 if (EXCLUDE.equals(rule.type) && rule.pattern.matcher(haystack).find()) {
                     return new Decision(false,
                             "EXCLUDE rule /" + rule.pattern.pattern() + "/ on "
-                                    + (scope.isEmpty() ? "all" : scope), null, 0, null);
+                                    + (scope.isEmpty() ? "all" : scope), null, 0, null, label);
+                }
+            }
             List<Pattern> includes = new ArrayList<>();
             for (Rule rule : scoped) {
                 if (INCLUDE_ONLY.equals(rule.type)) {
                         break;
+                    }
+                }
                 if (!any) {
                     return new Decision(false, "no INCLUDE_ONLY rule matched on " + label,
-                            null, 0, null);
+                            null, 0, null, label);
+                }
                 includeOnly.addAll(includes);
+            }
+        }
         String brand = brandByLabel.get(label);
         return new Decision(true, null, brand == null ? label.split(" ")[0] : brand,
-                division.categoryId, includeOnly);
+                division.categoryId, includeOnly, label);
+    }
+}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/offercircular/ScopeConfig.java – Rev 37337 → 37526