From a0ab520d5a46c0a92be3d7d335bc132024893272 Mon Sep 17 00:00:00 2001 From: Don Strawsburg Date: Wed, 7 Jan 2026 18:01:07 -0500 Subject: [PATCH] added missing application-dev.yml back, i literally feel asleep and deleted it, move a few other classeses --- .../admin/ClassificationAdminController.java | 2 ++ .../admin/ClassificationReconcileService.java | 3 ++ .../admin/{ => dto}/ReconcileDiffRow.java | 2 +- .../admin/{ => dto}/ReconcileRequest.java | 2 +- .../admin/{ => dto}/ReconcileResponse.java | 2 +- .../battlbuilder/config/Password2Config.java | 16 ----------- .../battlbuilder/imports/MerchantFeedRow.java | 28 +++++++++++++++++-- .../imports/dto/MerchantFeedRow.java | 17 ----------- .../impl/MerchantFeedImportServiceImpl.java | 16 +++++++++-- src/main/resources/application-dev.yml | 4 +++ 10 files changed, 52 insertions(+), 40 deletions(-) rename src/main/java/group/goforward/battlbuilder/classification/admin/{ => dto}/ReconcileDiffRow.java (90%) rename src/main/java/group/goforward/battlbuilder/classification/admin/{ => dto}/ReconcileRequest.java (82%) rename src/main/java/group/goforward/battlbuilder/classification/admin/{ => dto}/ReconcileResponse.java (76%) delete mode 100644 src/main/java/group/goforward/battlbuilder/config/Password2Config.java delete mode 100644 src/main/java/group/goforward/battlbuilder/imports/dto/MerchantFeedRow.java create mode 100644 src/main/resources/application-dev.yml diff --git a/src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationAdminController.java b/src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationAdminController.java index 9618651..56b7ec2 100644 --- a/src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationAdminController.java +++ b/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 diff --git a/src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationReconcileService.java b/src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationReconcileService.java index 4b2118a..c48a3b7 100644 --- a/src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationReconcileService.java +++ b/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; diff --git a/src/main/java/group/goforward/battlbuilder/classification/admin/ReconcileDiffRow.java b/src/main/java/group/goforward/battlbuilder/classification/admin/dto/ReconcileDiffRow.java similarity index 90% rename from src/main/java/group/goforward/battlbuilder/classification/admin/ReconcileDiffRow.java rename to src/main/java/group/goforward/battlbuilder/classification/admin/dto/ReconcileDiffRow.java index b1283c4..269b419 100644 --- a/src/main/java/group/goforward/battlbuilder/classification/admin/ReconcileDiffRow.java +++ b/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; diff --git a/src/main/java/group/goforward/battlbuilder/classification/admin/ReconcileRequest.java b/src/main/java/group/goforward/battlbuilder/classification/admin/dto/ReconcileRequest.java similarity index 82% rename from src/main/java/group/goforward/battlbuilder/classification/admin/ReconcileRequest.java rename to src/main/java/group/goforward/battlbuilder/classification/admin/dto/ReconcileRequest.java index b5f0c1b..0625b1e 100644 --- a/src/main/java/group/goforward/battlbuilder/classification/admin/ReconcileRequest.java +++ b/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, diff --git a/src/main/java/group/goforward/battlbuilder/classification/admin/ReconcileResponse.java b/src/main/java/group/goforward/battlbuilder/classification/admin/dto/ReconcileResponse.java similarity index 76% rename from src/main/java/group/goforward/battlbuilder/classification/admin/ReconcileResponse.java rename to src/main/java/group/goforward/battlbuilder/classification/admin/dto/ReconcileResponse.java index 64bd2f0..64fae4a 100644 --- a/src/main/java/group/goforward/battlbuilder/classification/admin/ReconcileResponse.java +++ b/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; diff --git a/src/main/java/group/goforward/battlbuilder/config/Password2Config.java b/src/main/java/group/goforward/battlbuilder/config/Password2Config.java deleted file mode 100644 index c69bfd1..0000000 --- a/src/main/java/group/goforward/battlbuilder/config/Password2Config.java +++ /dev/null @@ -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(); - } - } diff --git a/src/main/java/group/goforward/battlbuilder/imports/MerchantFeedRow.java b/src/main/java/group/goforward/battlbuilder/imports/MerchantFeedRow.java index f6377ee..794a924 100644 --- a/src/main/java/group/goforward/battlbuilder/imports/MerchantFeedRow.java +++ b/src/main/java/group/goforward/battlbuilder/imports/MerchantFeedRow.java @@ -26,5 +26,29 @@ public record MerchantFeedRow( String mediumImageUrl, String productContentWidget, String googleCategorization, - String itemBasedCommission -) {} \ No newline at end of file + 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); + } +} \ No newline at end of file diff --git a/src/main/java/group/goforward/battlbuilder/imports/dto/MerchantFeedRow.java b/src/main/java/group/goforward/battlbuilder/imports/dto/MerchantFeedRow.java deleted file mode 100644 index 6fd50fd..0000000 --- a/src/main/java/group/goforward/battlbuilder/imports/dto/MerchantFeedRow.java +++ /dev/null @@ -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 -) {} \ No newline at end of file diff --git a/src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java b/src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java index 130917b..df45e01 100644 --- a/src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java @@ -406,7 +406,14 @@ public class MerchantFeedImportServiceImpl implements MerchantFeedImportService } private Boolean parseInStock(Map 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); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..784df03 --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,4 @@ +shortlinks: + enabled: true + publicBaseUrl: http://localhost:8080 + frontendBaseUrl: http://localhost:3000 \ No newline at end of file