Forward/ballistic-builder-spring
2
0
Fork 0
mirror of https://gitea.gofwd.group/Forward_Group/ballistic-builder-spring.git synced 2026-01-20 16:51:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Don Strawsburg
2026-01-07 18:01:07 -05:00
parent 70a54354c8
commit a0ab520d5a
10 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationAdminController.java
View File

@@ -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

3
src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationReconcileService.java
View File

@@ -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;

2
src/main/java/group/goforward/battlbuilder/classification/admin/ReconcileDiffRow.java → src/main/java/group/goforward/battlbuilder/classification/admin/dto/ReconcileDiffRow.java
View File

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

2
src/main/java/group/goforward/battlbuilder/classification/admin/ReconcileRequest.java → src/main/java/group/goforward/battlbuilder/classification/admin/dto/ReconcileRequest.java
View File

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

2
src/main/java/group/goforward/battlbuilder/classification/admin/ReconcileResponse.java → src/main/java/group/goforward/battlbuilder/classification/admin/dto/ReconcileResponse.java
View File

@@ -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;

16
src/main/java/group/goforward/battlbuilder/config/Password2Config.java
View File

@@ -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();
}
}

28
src/main/java/group/goforward/battlbuilder/imports/MerchantFeedRow.java
View File

@@ -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);
}
}

17
src/main/java/group/goforward/battlbuilder/imports/dto/MerchantFeedRow.java
View File

@@ -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
) {}

16
src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java
View File

@@ -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);

4
src/main/resources/application-dev.yml Normal file
View File

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