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

fixed enaum path issue in namedqueires, God only knows how that even works

Browse Source
This commit is contained in:
Don Strawsburg
2026-01-06 16:11:59 -05:00
parent 3f1e6f7f42
commit 70a54354c8
6 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/group/goforward/battlbuilder/config/PasswordConfig.java → src/main/java/group/goforward/battlbuilder/config/Password2Config.java
View File

@@ -1,5 +1,4 @@
/* package group.goforward.battlbuilder.config;
package group.goforward.battlbuilder.configuration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@@ -7,11 +6,11 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
@Configuration @Configuration
public class PasswordConfig { public class Password2Config {
@Bean // @Bean
public PasswordEncoder passwordEncoder() { public PasswordEncoder passwordEncoder() {
// // BCrypt default password // // BCrypt default password
return new BCryptPasswordEncoder(); return new BCryptPasswordEncoder();
} }
}*/ }

58
src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java
View File

@@ -1,31 +1,31 @@
//package group.goforward.battlbuilder.controllers; package group.goforward.battlbuilder.controllers;
// //
//import group.goforward.battlbuilder.services.PartRoleMappingService; import group.goforward.battlbuilder.services.PartRoleMappingService;
//import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto; import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto;
//import group.goforward.battlbuilder.web.dto.PartRoleToCategoryDto; import group.goforward.battlbuilder.web.dto.PartRoleToCategoryDto;
//import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
// //
//import java.util.List; @RestController
// @RequestMapping({"/api/part-role-mappings", "/api/v1/part-role-mappings"})
//@RestController public class PartRoleMappingController {
//@RequestMapping({"/api/part-role-mappings", "/api/v1/part-role-mappings"})
//public class PartRoleMappingController { private final PartRoleMappingService service;
//
// private final PartRoleMappingService service; public PartRoleMappingController(PartRoleMappingService service) {
// this.service = service;
// public PartRoleMappingController(PartRoleMappingService service) { }
// this.service = service;
// } // Full view for admin UI
// @GetMapping("/{platform}")
// // Full view for admin UI public List<PartRoleMappingDto> getMappings(@PathVariable String platform) {
// @GetMapping("/{platform}") return service.getMappingsForPlatform(platform);
// public List<PartRoleMappingDto> getMappings(@PathVariable String platform) { }
// return service.getMappingsForPlatform(platform);
// } // Thin mapping for the builder
// @GetMapping("/{platform}/map")
// // Thin mapping for the builder public List<PartRoleToCategoryDto> getRoleMap(@PathVariable String platform) {
// @GetMapping("/{platform}/map") return service.getRoleToCategoryMap(platform);
// public List<PartRoleToCategoryDto> getRoleMap(@PathVariable String platform) { }
// return service.getRoleToCategoryMap(platform); }
// }
//}

6
src/main/java/group/goforward/battlbuilder/model/EmailRequest.java
View File

@@ -10,15 +10,15 @@ import java.time.LocalDateTime;
@NamedQueries({ @NamedQueries({
@NamedQuery( @NamedQuery(
name = "EmailRequest.findSent", name = "EmailRequest.findSent",
query = "SELECT e FROM EmailRequest e WHERE e.status = group.goforward.battlbuilder.model.EmailStatus.SENT" query = "SELECT e FROM EmailRequest e WHERE e.status = group.goforward.battlbuilder.model.enums.EmailStatus.SENT"
), ),
@NamedQuery( @NamedQuery(
name = "EmailRequest.findFailed", name = "EmailRequest.findFailed",
query = "SELECT e FROM EmailRequest e WHERE e.status = group.goforward.battlbuilder.model.EmailStatus.FAILED" query = "SELECT e FROM EmailRequest e WHERE e.status = group.goforward.battlbuilder.model.enums.EmailStatus.FAILED"
), ),
@NamedQuery( @NamedQuery(
name = "EmailRequest.findPending", name = "EmailRequest.findPending",
query = "SELECT e FROM EmailRequest e WHERE e.status = group.goforward.battlbuilder.model.EmailStatus.PENDING" query = "SELECT e FROM EmailRequest e WHERE e.status = group.goforward.battlbuilder.model.enums.EmailStatus.PENDING"
) )
}) })
public class EmailRequest { public class EmailRequest {

2
src/main/java/group/goforward/battlbuilder/model/MerchantCategoryMap.java
View File

@@ -9,7 +9,7 @@ import java.time.OffsetDateTime;
import java.time.ZoneOffset; import java.time.ZoneOffset;
@Entity @Entity
@Table(name = "merchant_category_map") @Table(name = "merchant_category_map", schema = "public")
public class MerchantCategoryMap { public class MerchantCategoryMap {
@Id @Id

4
src/main/java/group/goforward/battlbuilder/repos/ProductRepository.java
View File

@@ -377,7 +377,7 @@ where po.product_id = p.id
JOIN p.offers o JOIN p.offers o
JOIN o.merchant m JOIN o.merchant m
WHERE p.deletedAt IS NULL WHERE p.deletedAt IS NULL
AND (p.importStatus = group.goforward.battlbuilder.model.ImportStatus.PENDING_MAPPING AND (p.importStatus = group.goforward.battlbuilder.model.enums.ImportStatus.PENDING_MAPPING
OR p.partRole IS NULL OR p.partRole IS NULL
OR LOWER(p.partRole) = 'unknown') OR LOWER(p.partRole) = 'unknown')
AND p.rawCategoryKey IS NOT NULL AND p.rawCategoryKey IS NOT NULL
@@ -458,7 +458,7 @@ ORDER BY productCount DESC
FROM Product p FROM Product p
JOIN p.offers o JOIN p.offers o
WHERE o.merchant.id = :merchantId WHERE o.merchant.id = :merchantId
AND p.importStatus = group.goforward.battlbuilder.model.ImportStatus.PENDING_MAPPING AND p.importStatus = group.goforward.battlbuilder.model.enums.ImportStatus.PENDING_MAPPING
AND p.deletedAt IS NULL AND p.deletedAt IS NULL
""") """)
List<Product> findPendingMappingByMerchantId(@Param("merchantId") Integer merchantId); List<Product> findPendingMappingByMerchantId(@Param("merchantId") Integer merchantId);

2
src/main/java/group/goforward/battlbuilder/services/impl/CatalogQueryServiceImpl.java
View File

@@ -4,7 +4,7 @@ import group.goforward.battlbuilder.model.Product;
import group.goforward.battlbuilder.model.ProductOffer; import group.goforward.battlbuilder.model.ProductOffer;
import group.goforward.battlbuilder.repos.ProductOfferRepository; import group.goforward.battlbuilder.repos.ProductOfferRepository;
import group.goforward.battlbuilder.repos.ProductRepository; import group.goforward.battlbuilder.repos.ProductRepository;
import group.goforward.battlbuilder.repos.spec.CatalogProductSpecifications; import group.goforward.battlbuilder.repos.catalog.spec.CatalogProductSpecifications;
import group.goforward.battlbuilder.services.CatalogQueryService; import group.goforward.battlbuilder.services.CatalogQueryService;
import group.goforward.battlbuilder.services.ShortLinkService; import group.goforward.battlbuilder.services.ShortLinkService;
import group.goforward.battlbuilder.web.dto.product.ProductSummaryDto; import group.goforward.battlbuilder.web.dto.product.ProductSummaryDto;