added missing application-dev.yml back, i literally feel asleep and deleted it, move a few other classeses

src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationAdminController.java

@@ -1,5 +1,7 @@
 package group.goforward.battlbuilder.classification.admin;
 
+import group.goforward.battlbuilder.classification.admin.dto.ReconcileRequest;
+import group.goforward.battlbuilder.classification.admin.dto.ReconcileResponse;
 import org.springframework.web.bind.annotation.*;
 
 @RestController

src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationReconcileService.java

@@ -2,6 +2,9 @@ package group.goforward.battlbuilder.classification.admin;
 
 import group.goforward.battlbuilder.classification.ClassificationResult;
 import group.goforward.battlbuilder.classification.ProductClassifier;
+import group.goforward.battlbuilder.classification.admin.dto.ReconcileDiffRow;
+import group.goforward.battlbuilder.classification.admin.dto.ReconcileRequest;
+import group.goforward.battlbuilder.classification.admin.dto.ReconcileResponse;
 import group.goforward.battlbuilder.model.MerchantCategoryMap;
 import group.goforward.battlbuilder.model.enums.PartRoleSource;
 import group.goforward.battlbuilder.model.Product;

src/main/java/group/goforward/battlbuilder/classification/admin/dto/ReconcileDiffRow.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.classification.admin;
+package group.goforward.battlbuilder.classification.admin.dto;
 
 import java.util.Map;
 

src/main/java/group/goforward/battlbuilder/classification/admin/dto/ReconcileRequest.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.classification.admin;
+package group.goforward.battlbuilder.classification.admin.dto;
 
 public record ReconcileRequest(
         boolean dryRun,

src/main/java/group/goforward/battlbuilder/classification/admin/dto/ReconcileResponse.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.classification.admin;
+package group.goforward.battlbuilder.classification.admin.dto;
 
 import java.util.List;
 import java.util.Map;

src/main/java/group/goforward/battlbuilder/config/Password2Config.java

@@ -1,16 +0,0 @@
-package group.goforward.battlbuilder.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-
-@Configuration
- public class Password2Config {
-
-   //  @Bean
-     public PasswordEncoder passwordEncoder() {
-//         // BCrypt default password
-         return new BCryptPasswordEncoder();
-     }
- }

src/main/java/group/goforward/battlbuilder/imports/MerchantFeedRow.java

@@ -26,5 +26,29 @@ public record MerchantFeedRow(
         String mediumImageUrl,
         String productContentWidget,
         String googleCategorization,
-        String itemBasedCommission
+        String itemBasedCommission,
-) {}
+        // Fields merged from dto version
+        String mpn,
+        String upc,
+        String avantlinkProductId,
+        boolean inStock,
+        String categoryPath
+) {
+    // Constructor to maintain compatibility with existing usages that don't have the new fields
+    public MerchantFeedRow(
+            String sku, String manufacturerId, String brandName, String productName,
+            String longDescription, String shortDescription, String department,
+            String category, String subCategory, String thumbUrl, String imageUrl,
+            String buyLink, String keywords, String reviews, BigDecimal retailPrice,
+            BigDecimal salePrice, String brandPageLink, String brandLogoImage,
+            String productPageViewTracking, String variantsXml, String mediumImageUrl,
+            String productContentWidget, String googleCategorization, String itemBasedCommission
+    ) {
+        this(sku, manufacturerId, brandName, productName, longDescription, shortDescription,
+                department, category, subCategory, thumbUrl, imageUrl, buyLink, keywords,
+                reviews, retailPrice, salePrice, brandPageLink, brandLogoImage,
+                productPageViewTracking, variantsXml, mediumImageUrl, productContentWidget,
+                googleCategorization, itemBasedCommission,
+                null, null, null, true, null);
+    }
+}

src/main/java/group/goforward/battlbuilder/imports/dto/MerchantFeedRow.java

@@ -1,17 +0,0 @@
-package group.goforward.battlbuilder.imports.dto;
-
-import java.math.BigDecimal;
-
-public record MerchantFeedRow(
-        String brandName,
-        String productName,
-        String mpn,
-        String upc,
-        String avantlinkProductId,
-        String sku,
-        String categoryPath,
-        String buyUrl,
-        BigDecimal price,
-        BigDecimal originalPrice,
-        boolean inStock
-) {}

src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java

@@ -406,7 +406,14 @@ public class MerchantFeedImportServiceImpl implements MerchantFeedImportService
     }
 
     private Boolean parseInStock(Map<String, String> row) {
-        String inStock = trimOrNull(row.get("In Stock"));
+        return parseInStockValue(row.get("In Stock"));
+    }
+
+    private Boolean parseInStock(CSVRecord rec) {
+        return parseInStockValue(getCsvValue(rec, "In Stock"));
+    }
+
+    private Boolean parseInStockValue(String inStock) {
         if (inStock == null) return Boolean.FALSE;
 
         String lower = inStock.toLowerCase(Locale.ROOT);
@@ -557,7 +564,12 @@ public class MerchantFeedImportServiceImpl implements MerchantFeedImportService
                             getCsvValue(rec, "Medium Image URL"),
                             getCsvValue(rec, "Product Content Widget"),
                             getCsvValue(rec, "Google Categorization"),
-                            getCsvValue(rec, "Item Based Commission")
+                            getCsvValue(rec, "Item Based Commission"),
+                            getCsvValue(rec, "MPN"), // New fields
+                            getCsvValue(rec, "UPC"),
+                            getCsvValue(rec, "Avantlink Product Id"),
+                            parseInStock(rec),
+                            getCsvValue(rec, "Category Path")
                     );
 
                     rows.add(row);

src/main/resources/application-dev.yml

@@ -0,0 +1,4 @@
+shortlinks:
+  enabled: true
+  publicBaseUrl: http://localhost:8080
+  frontendBaseUrl: http://localhost:3000