mirror of
https://gitea.gofwd.group/Forward_Group/ballistic-builder-spring.git
synced 2026-01-20 16:51:03 -05:00
moving packages
This commit is contained in:
@@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* Query projections for the catalog domain.
|
||||||
|
*/
|
||||||
|
package group.goforward.battlbuilder.catalog.query;
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* Command line runners and CLI utilities.
|
||||||
|
*/
|
||||||
|
package group.goforward.battlbuilder.cli;
|
||||||
@@ -1,74 +1,74 @@
|
|||||||
package group.goforward.battlbuilder.utils;
|
package group.goforward.battlbuilder.utils;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param <T>
|
* @param <T>
|
||||||
*/
|
*/
|
||||||
public class ApiResponse<T> {
|
public class ApiResponse<T> {
|
||||||
|
|
||||||
private static final String API_SUCCESS = "success";
|
private static final String API_SUCCESS = "success";
|
||||||
private static final String API_FAILURE = "failure";
|
private static final String API_FAILURE = "failure";
|
||||||
private static final String API_ERROR = "error";
|
private static final String API_ERROR = "error";
|
||||||
private String[] messages;
|
private String[] messages;
|
||||||
private T data;
|
private T data;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private String status;
|
private String status;
|
||||||
private LocalDateTime timestamp;
|
private LocalDateTime timestamp;
|
||||||
private ApiResponse(String status, String[] message, T data) {
|
private ApiResponse(String status, String[] message, T data) {
|
||||||
this.status = status;
|
this.status = status;
|
||||||
this.messages = message;
|
this.messages = message;
|
||||||
this.data = data;
|
this.data = data;
|
||||||
this.timestamp = LocalDateTime.now();
|
this.timestamp = LocalDateTime.now();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T> ApiResponse<T> error(String message, T data) {
|
public static <T> ApiResponse<T> error(String message, T data) {
|
||||||
String[] msg = {message}; // ✅ Include the message
|
String[] msg = {message}; // ✅ Include the message
|
||||||
return new ApiResponse<>(API_ERROR, msg, data);
|
return new ApiResponse<>(API_ERROR, msg, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T> ApiResponse<T> success(T data, String emailSentSuccessfully) {
|
public static <T> ApiResponse<T> success(T data, String emailSentSuccessfully) {
|
||||||
String[] msg = {};
|
String[] msg = {};
|
||||||
return new ApiResponse<>(API_SUCCESS, msg, data);
|
return new ApiResponse<>(API_SUCCESS, msg, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T> ApiResponse<T> error(String[] messages) {
|
public static <T> ApiResponse<T> error(String[] messages) {
|
||||||
return new ApiResponse<>(API_ERROR, messages, null);
|
return new ApiResponse<>(API_ERROR, messages, null);
|
||||||
}
|
}
|
||||||
public static <T> ApiResponse<T> error(String message) {
|
public static <T> ApiResponse<T> error(String message) {
|
||||||
String[] msg = {};
|
String[] msg = {};
|
||||||
return new ApiResponse<>(API_ERROR, msg, null);
|
return new ApiResponse<>(API_ERROR, msg, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public String[] getMessages() {
|
public String[] getMessages() {
|
||||||
return messages;
|
return messages;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMessages(String[] messages) {
|
public void setMessages(String[] messages) {
|
||||||
this.messages = messages;
|
this.messages = messages;
|
||||||
}
|
}
|
||||||
|
|
||||||
public T getData() {return data;}
|
public T getData() {return data;}
|
||||||
public void setData(T data) {
|
public void setData(T data) {
|
||||||
this.data = data;
|
this.data = data;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getStatus() {
|
public String getStatus() {
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setStatus(String status) {
|
public void setStatus(String status) {
|
||||||
this.status = status;
|
this.status = status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public LocalDateTime getTimestamp() {
|
public LocalDateTime getTimestamp() {
|
||||||
return timestamp;
|
return timestamp;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTimestamp(LocalDateTime timestamp) {
|
public void setTimestamp(LocalDateTime timestamp) {
|
||||||
this.timestamp = timestamp;
|
this.timestamp = timestamp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,20 +1,20 @@
|
|||||||
package group.goforward.battlbuilder.utils;
|
package group.goforward.battlbuilder.utils;
|
||||||
|
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
|
|
||||||
public class Counter {
|
public class Counter {
|
||||||
|
|
||||||
Integer count = 0;
|
Integer count = 0;
|
||||||
public void addOne() {
|
public void addOne() {
|
||||||
count +=1;
|
count +=1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Integer getCount() {
|
public Integer getCount() {
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setCount(Integer count) {
|
private void setCount(Integer count) {
|
||||||
this.count = count;
|
this.count = count;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,22 +1,22 @@
|
|||||||
package group.goforward.battlbuilder.configuration;
|
package group.goforward.battlbuilder.configuration;
|
||||||
|
|
||||||
import org.springframework.cache.CacheManager;
|
import org.springframework.cache.CacheManager;
|
||||||
import org.springframework.cache.annotation.EnableCaching;
|
import org.springframework.cache.annotation.EnableCaching;
|
||||||
import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
|
import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableCaching
|
@EnableCaching
|
||||||
public class CacheConfig {
|
public class CacheConfig {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public CacheManager cacheManager() {
|
public CacheManager cacheManager() {
|
||||||
// Must match the @Cacheable value(s) used in controllers/services.
|
// Must match the @Cacheable value(s) used in controllers/services.
|
||||||
// ProductV1Controller uses: "gunbuilderProductsV1"
|
// ProductV1Controller uses: "gunbuilderProductsV1"
|
||||||
return new ConcurrentMapCacheManager(
|
return new ConcurrentMapCacheManager(
|
||||||
"gunbuilderProductsV1",
|
"gunbuilderProductsV1",
|
||||||
"gunbuilderProducts" // keep if anything else still references it
|
"gunbuilderProducts" // keep if anything else still references it
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,84 +1,84 @@
|
|||||||
// src/main/java/com/example/config/CorsConfig.java
|
// src/main/java/com/example/config/CorsConfig.java
|
||||||
package group.goforward.battlbuilder.configuration;
|
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;
|
||||||
import org.springframework.web.cors.CorsConfiguration;
|
import org.springframework.web.cors.CorsConfiguration;
|
||||||
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
||||||
import org.springframework.web.filter.CorsFilter;
|
import org.springframework.web.filter.CorsFilter;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
public class CorsConfig {
|
public class CorsConfig {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public CorsFilter corsFilter() {
|
public CorsFilter corsFilter() {
|
||||||
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
|
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
|
||||||
CorsConfiguration config = new CorsConfiguration();
|
CorsConfiguration config = new CorsConfiguration();
|
||||||
|
|
||||||
// Allow credentials
|
// Allow credentials
|
||||||
config.setAllowCredentials(true);
|
config.setAllowCredentials(true);
|
||||||
|
|
||||||
// Allow Angular development server
|
// Allow Angular development server
|
||||||
config.setAllowedOrigins(Arrays.asList(
|
config.setAllowedOrigins(Arrays.asList(
|
||||||
"http://localhost:4200",
|
"http://localhost:4200",
|
||||||
"http://localhost:4201",
|
"http://localhost:4201",
|
||||||
"http://localhost:8070",
|
"http://localhost:8070",
|
||||||
"https://localhost:8070",
|
"https://localhost:8070",
|
||||||
"http://localhost:8080",
|
"http://localhost:8080",
|
||||||
"https://localhost:8080",
|
"https://localhost:8080",
|
||||||
"http://localhost:3000",
|
"http://localhost:3000",
|
||||||
"https://localhost:3000",
|
"https://localhost:3000",
|
||||||
"https://localhost:3000/gunbuilder",
|
"https://localhost:3000/gunbuilder",
|
||||||
"http://localhost:3000/gunbuilder",
|
"http://localhost:3000/gunbuilder",
|
||||||
"https://localhost:3000/builder",
|
"https://localhost:3000/builder",
|
||||||
"http://localhost:3000/builder"
|
"http://localhost:3000/builder"
|
||||||
));
|
));
|
||||||
|
|
||||||
// Allow all headers
|
// Allow all headers
|
||||||
config.addAllowedHeader("*");
|
config.addAllowedHeader("*");
|
||||||
|
|
||||||
// Allow all HTTP methods
|
// Allow all HTTP methods
|
||||||
config.setAllowedMethods(Arrays.asList(
|
config.setAllowedMethods(Arrays.asList(
|
||||||
"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"
|
"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"
|
||||||
));
|
));
|
||||||
|
|
||||||
// Expose headers
|
// Expose headers
|
||||||
config.setExposedHeaders(Arrays.asList(
|
config.setExposedHeaders(Arrays.asList(
|
||||||
"Authorization",
|
"Authorization",
|
||||||
"Content-Type",
|
"Content-Type",
|
||||||
"X-Total-Count"
|
"X-Total-Count"
|
||||||
));
|
));
|
||||||
|
|
||||||
// Max age for preflight cache (1 hour)
|
// Max age for preflight cache (1 hour)
|
||||||
config.setMaxAge(3600L);
|
config.setMaxAge(3600L);
|
||||||
|
|
||||||
source.registerCorsConfiguration("/**", config);
|
source.registerCorsConfiguration("/**", config);
|
||||||
return new CorsFilter(source);
|
return new CorsFilter(source);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Alternative using WebMvcConfigurer:
|
// Alternative using WebMvcConfigurer:
|
||||||
/*
|
/*
|
||||||
package group.goforward.citysites.config;
|
package group.goforward.citysites.config;
|
||||||
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.web.servlet.config.annotation.CorsRegistry;
|
import org.springframework.web.servlet.config.annotation.CorsRegistry;
|
||||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
public class WebConfig implements WebMvcConfigurer {
|
public class WebConfig implements WebMvcConfigurer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addCorsMappings(CorsRegistry registry) {
|
public void addCorsMappings(CorsRegistry registry) {
|
||||||
registry.addMapping("/api/**")
|
registry.addMapping("/api/**")
|
||||||
.allowedOrigins("http://localhost:4200")
|
.allowedOrigins("http://localhost:4200")
|
||||||
.allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")
|
.allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")
|
||||||
.allowedHeaders("*")
|
.allowedHeaders("*")
|
||||||
.allowCredentials(true)
|
.allowCredentials(true)
|
||||||
.maxAge(3600);
|
.maxAge(3600);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
package group.goforward.battlbuilder.configuration;
|
package group.goforward.battlbuilder.configuration;
|
||||||
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
//import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
|
//import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
|
|
||||||
public class JpaConfig {
|
public class JpaConfig {
|
||||||
// Enables @CreatedDate / @LastModifiedDate processing
|
// Enables @CreatedDate / @LastModifiedDate processing
|
||||||
}
|
}
|
||||||
@@ -1,50 +1,50 @@
|
|||||||
package group.goforward.battlbuilder.controllers;
|
package group.goforward.battlbuilder.controllers;
|
||||||
|
|
||||||
import group.goforward.battlbuilder.model.Brand;
|
import group.goforward.battlbuilder.model.Brand;
|
||||||
import group.goforward.battlbuilder.repos.BrandRepository;
|
import group.goforward.battlbuilder.repos.BrandRepository;
|
||||||
import group.goforward.battlbuilder.services.BrandService;
|
import group.goforward.battlbuilder.services.BrandService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping({"/api/v1/brands", "/api/brands"})
|
@RequestMapping({"/api/v1/brands", "/api/brands"})
|
||||||
public class BrandController {
|
public class BrandController {
|
||||||
@Autowired
|
@Autowired
|
||||||
private BrandRepository repo;
|
private BrandRepository repo;
|
||||||
@Autowired
|
@Autowired
|
||||||
private BrandService brandService;
|
private BrandService brandService;
|
||||||
//@Cacheable(value="getAllStates")
|
//@Cacheable(value="getAllStates")
|
||||||
@GetMapping("/all")
|
@GetMapping("/all")
|
||||||
public ResponseEntity<List<Brand>> getAllBrands() {
|
public ResponseEntity<List<Brand>> getAllBrands() {
|
||||||
List<Brand> brand = repo.findAll();
|
List<Brand> brand = repo.findAll();
|
||||||
return ResponseEntity.ok(brand);
|
return ResponseEntity.ok(brand);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/{id}")
|
@GetMapping("/{id}")
|
||||||
public ResponseEntity<Brand> getAllBrandsById(@PathVariable Integer id) {
|
public ResponseEntity<Brand> getAllBrandsById(@PathVariable Integer id) {
|
||||||
return repo.findById(id)
|
return repo.findById(id)
|
||||||
.map(ResponseEntity::ok)
|
.map(ResponseEntity::ok)
|
||||||
.orElse(ResponseEntity.notFound().build());
|
.orElse(ResponseEntity.notFound().build());
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/add")
|
@PostMapping("/add")
|
||||||
public ResponseEntity<Brand> createbrand(@RequestBody Brand item) {
|
public ResponseEntity<Brand> createbrand(@RequestBody Brand item) {
|
||||||
Brand created = brandService.save(item);
|
Brand created = brandService.save(item);
|
||||||
return ResponseEntity.status(HttpStatus.CREATED).body(created);
|
return ResponseEntity.status(HttpStatus.CREATED).body(created);
|
||||||
}
|
}
|
||||||
|
|
||||||
@DeleteMapping("/delete/{id}")
|
@DeleteMapping("/delete/{id}")
|
||||||
public ResponseEntity<Void> deleteItem(@PathVariable Integer id) {
|
public ResponseEntity<Void> deleteItem(@PathVariable Integer id) {
|
||||||
return brandService.findById(id)
|
return brandService.findById(id)
|
||||||
.map(item -> {
|
.map(item -> {
|
||||||
brandService.deleteById(id);
|
brandService.deleteById(id);
|
||||||
return ResponseEntity.noContent().<Void>build();
|
return ResponseEntity.noContent().<Void>build();
|
||||||
})
|
})
|
||||||
.orElse(ResponseEntity.notFound().build());
|
.orElse(ResponseEntity.notFound().build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,34 +1,34 @@
|
|||||||
package group.goforward.battlbuilder.controllers.api;
|
package group.goforward.battlbuilder.controllers.api;
|
||||||
|
|
||||||
import group.goforward.battlbuilder.model.Build;
|
import group.goforward.battlbuilder.model.Build;
|
||||||
import group.goforward.battlbuilder.repos.BuildRepository;
|
import group.goforward.battlbuilder.repos.BuildRepository;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/v1/api/builds")
|
@RequestMapping("/v1/api/builds")
|
||||||
public class BuildController {
|
public class BuildController {
|
||||||
@Autowired
|
@Autowired
|
||||||
private BuildRepository repo;
|
private BuildRepository repo;
|
||||||
@Autowired
|
@Autowired
|
||||||
// private BuildsService service;
|
// private BuildsService service;
|
||||||
//@Cacheable(value="getAllStates")
|
//@Cacheable(value="getAllStates")
|
||||||
@GetMapping("/all")
|
@GetMapping("/all")
|
||||||
public ResponseEntity<List<Build>> getAll() {
|
public ResponseEntity<List<Build>> getAll() {
|
||||||
List<Build> builds = repo.findAll();
|
List<Build> builds = repo.findAll();
|
||||||
return ResponseEntity.ok(builds);
|
return ResponseEntity.ok(builds);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/{id}")
|
@GetMapping("/{id}")
|
||||||
public ResponseEntity<Build> getAllBuildsById(@PathVariable Integer id) {
|
public ResponseEntity<Build> getAllBuildsById(@PathVariable Integer id) {
|
||||||
return repo.findById(id)
|
return repo.findById(id)
|
||||||
.map(ResponseEntity::ok)
|
.map(ResponseEntity::ok)
|
||||||
.orElse(ResponseEntity.notFound().build());
|
.orElse(ResponseEntity.notFound().build());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,40 +1,40 @@
|
|||||||
package group.goforward.battlbuilder.controllers;
|
package group.goforward.battlbuilder.controllers;
|
||||||
|
|
||||||
import group.goforward.battlbuilder.services.MerchantFeedImportService;
|
import group.goforward.battlbuilder.services.MerchantFeedImportService;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping({"/api/admin/imports", "/api/v1/admin/imports"})
|
@RequestMapping({"/api/admin/imports", "/api/v1/admin/imports"})
|
||||||
|
|
||||||
@CrossOrigin(origins = "http://localhost:3000")
|
@CrossOrigin(origins = "http://localhost:3000")
|
||||||
public class ImportController {
|
public class ImportController {
|
||||||
|
|
||||||
private final MerchantFeedImportService merchantFeedImportService;
|
private final MerchantFeedImportService merchantFeedImportService;
|
||||||
|
|
||||||
public ImportController(MerchantFeedImportService merchantFeedImportService) {
|
public ImportController(MerchantFeedImportService merchantFeedImportService) {
|
||||||
this.merchantFeedImportService = merchantFeedImportService;
|
this.merchantFeedImportService = merchantFeedImportService;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Full product + offer import for a merchant.
|
* Full product + offer import for a merchant.
|
||||||
*
|
*
|
||||||
* POST /admin/imports/{merchantId}
|
* POST /admin/imports/{merchantId}
|
||||||
*/
|
*/
|
||||||
@PostMapping("/{merchantId}")
|
@PostMapping("/{merchantId}")
|
||||||
public ResponseEntity<Void> importMerchant(@PathVariable Integer merchantId) {
|
public ResponseEntity<Void> importMerchant(@PathVariable Integer merchantId) {
|
||||||
merchantFeedImportService.importMerchantFeed(merchantId);
|
merchantFeedImportService.importMerchantFeed(merchantId);
|
||||||
return ResponseEntity.noContent().build();
|
return ResponseEntity.noContent().build();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Offers-only sync (price/stock) for a merchant.
|
* Offers-only sync (price/stock) for a merchant.
|
||||||
*
|
*
|
||||||
* POST /admin/imports/{merchantId}/offers-only
|
* POST /admin/imports/{merchantId}/offers-only
|
||||||
*/
|
*/
|
||||||
@PostMapping("/{merchantId}/offers-only")
|
@PostMapping("/{merchantId}/offers-only")
|
||||||
public ResponseEntity<Void> syncOffersOnly(@PathVariable Integer merchantId) {
|
public ResponseEntity<Void> syncOffersOnly(@PathVariable Integer merchantId) {
|
||||||
merchantFeedImportService.syncOffersOnly(merchantId);
|
merchantFeedImportService.syncOffersOnly(merchantId);
|
||||||
return ResponseEntity.noContent().build();
|
return ResponseEntity.noContent().build();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,25 +1,25 @@
|
|||||||
package group.goforward.battlbuilder.controllers;
|
package group.goforward.battlbuilder.controllers;
|
||||||
|
|
||||||
import group.goforward.battlbuilder.model.Merchant;
|
import group.goforward.battlbuilder.model.Merchant;
|
||||||
import group.goforward.battlbuilder.repos.MerchantRepository;
|
import group.goforward.battlbuilder.repos.MerchantRepository;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping({"/api/admin", "/api/v1/admin"})
|
@RequestMapping({"/api/admin", "/api/v1/admin"})
|
||||||
public class MerchantDebugController {
|
public class MerchantDebugController {
|
||||||
|
|
||||||
private final MerchantRepository merchantRepository;
|
private final MerchantRepository merchantRepository;
|
||||||
|
|
||||||
public MerchantDebugController(MerchantRepository merchantRepository) {
|
public MerchantDebugController(MerchantRepository merchantRepository) {
|
||||||
this.merchantRepository = merchantRepository;
|
this.merchantRepository = merchantRepository;
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/debug/merchants")
|
@GetMapping("/debug/merchants")
|
||||||
public List<Merchant> listMerchants() {
|
public List<Merchant> listMerchants() {
|
||||||
return merchantRepository.findAll();
|
return merchantRepository.findAll();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,56 +1,56 @@
|
|||||||
package group.goforward.battlbuilder.controllers;
|
package group.goforward.battlbuilder.controllers;
|
||||||
|
|
||||||
import group.goforward.battlbuilder.web.dto.ProductOfferDto;
|
import group.goforward.battlbuilder.web.dto.ProductOfferDto;
|
||||||
import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
|
import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* LEGACY CONTROLLER (Deprecated)
|
* LEGACY CONTROLLER (Deprecated)
|
||||||
*
|
*
|
||||||
* Do not add new features here.
|
* Do not add new features here.
|
||||||
* Canonical API lives in ProductV1Controller (/api/v1/products).
|
* Canonical API lives in ProductV1Controller (/api/v1/products).
|
||||||
*
|
*
|
||||||
* This exists only to keep older clients working temporarily.
|
* This exists only to keep older clients working temporarily.
|
||||||
* Disable by default using:
|
* Disable by default using:
|
||||||
* app.api.legacy.enabled=false
|
* app.api.legacy.enabled=false
|
||||||
*
|
*
|
||||||
* NOTE:
|
* NOTE:
|
||||||
* Even when disabled, Spring still compiles this class. So it must not reference
|
* Even when disabled, Spring still compiles this class. So it must not reference
|
||||||
* missing services/methods.
|
* missing services/methods.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping({"/api/products", "/api/v1/products"})
|
@RequestMapping({"/api/products", "/api/v1/products"})
|
||||||
@CrossOrigin
|
@CrossOrigin
|
||||||
@ConditionalOnProperty(name = "app.api.legacy.enabled", havingValue = "true", matchIfMissing = false)
|
@ConditionalOnProperty(name = "app.api.legacy.enabled", havingValue = "true", matchIfMissing = false)
|
||||||
public class ProductController {
|
public class ProductController {
|
||||||
|
|
||||||
private static final String MSG =
|
private static final String MSG =
|
||||||
"Legacy endpoint disabled. Use /api/v1/products instead.";
|
"Legacy endpoint disabled. Use /api/v1/products instead.";
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
public ResponseEntity<?> getProducts(
|
public ResponseEntity<?> getProducts(
|
||||||
@RequestParam(defaultValue = "AR-15") String platform,
|
@RequestParam(defaultValue = "AR-15") String platform,
|
||||||
@RequestParam(required = false, name = "partRoles") List<String> partRoles
|
@RequestParam(required = false, name = "partRoles") List<String> partRoles
|
||||||
) {
|
) {
|
||||||
// Legacy disabled by design (Option B cleanup)
|
// Legacy disabled by design (Option B cleanup)
|
||||||
return ResponseEntity.status(410).body(MSG);
|
return ResponseEntity.status(410).body(MSG);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/{id}/offers")
|
@GetMapping("/{id}/offers")
|
||||||
public ResponseEntity<?> getOffersForProduct(@PathVariable("id") Integer productId) {
|
public ResponseEntity<?> getOffersForProduct(@PathVariable("id") Integer productId) {
|
||||||
return ResponseEntity.status(410).body(MSG);
|
return ResponseEntity.status(410).body(MSG);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/{id}")
|
@GetMapping("/{id}")
|
||||||
public ResponseEntity<?> getProductById(@PathVariable("id") Integer productId) {
|
public ResponseEntity<?> getProductById(@PathVariable("id") Integer productId) {
|
||||||
return ResponseEntity.status(410).body(MSG);
|
return ResponseEntity.status(410).body(MSG);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If you *really* need typed responses for an old client, we can re-add
|
// If you *really* need typed responses for an old client, we can re-add
|
||||||
// a real service layer once we align on the actual ProductQueryService API.
|
// a real service layer once we align on the actual ProductQueryService API.
|
||||||
}
|
}
|
||||||
@@ -1,55 +1,55 @@
|
|||||||
package group.goforward.battlbuilder.controllers;
|
package group.goforward.battlbuilder.controllers;
|
||||||
|
|
||||||
import group.goforward.battlbuilder.model.State;
|
import group.goforward.battlbuilder.model.State;
|
||||||
import group.goforward.battlbuilder.repos.StateRepository;
|
import group.goforward.battlbuilder.repos.StateRepository;
|
||||||
import group.goforward.battlbuilder.services.admin.StatesService;
|
import group.goforward.battlbuilder.services.admin.StatesService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping({"/api/states", "/api/v1/states"})
|
@RequestMapping({"/api/states", "/api/v1/states"})
|
||||||
public class StateController {
|
public class StateController {
|
||||||
@Autowired
|
@Autowired
|
||||||
private StateRepository repo;
|
private StateRepository repo;
|
||||||
@Autowired
|
@Autowired
|
||||||
private StatesService statesService;
|
private StatesService statesService;
|
||||||
//@Cacheable(value="getAllStates")
|
//@Cacheable(value="getAllStates")
|
||||||
@GetMapping("/all")
|
@GetMapping("/all")
|
||||||
public ResponseEntity<List<State>> getAllStates() {
|
public ResponseEntity<List<State>> getAllStates() {
|
||||||
List<State> state = repo.findAll();
|
List<State> state = repo.findAll();
|
||||||
return ResponseEntity.ok(state);
|
return ResponseEntity.ok(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/{id}")
|
@GetMapping("/{id}")
|
||||||
public ResponseEntity<State> getAllStatesById(@PathVariable Integer id) {
|
public ResponseEntity<State> getAllStatesById(@PathVariable Integer id) {
|
||||||
return repo.findById(id)
|
return repo.findById(id)
|
||||||
.map(ResponseEntity::ok)
|
.map(ResponseEntity::ok)
|
||||||
.orElse(ResponseEntity.notFound().build());
|
.orElse(ResponseEntity.notFound().build());
|
||||||
}
|
}
|
||||||
@GetMapping("/byAbbrev/{abbreviation}")
|
@GetMapping("/byAbbrev/{abbreviation}")
|
||||||
public ResponseEntity<State> getAllStatesByAbbreviation(@PathVariable String abbreviation) {
|
public ResponseEntity<State> getAllStatesByAbbreviation(@PathVariable String abbreviation) {
|
||||||
return repo.findByAbbreviation(abbreviation)
|
return repo.findByAbbreviation(abbreviation)
|
||||||
.map(ResponseEntity::ok)
|
.map(ResponseEntity::ok)
|
||||||
.orElse(ResponseEntity.notFound().build());
|
.orElse(ResponseEntity.notFound().build());
|
||||||
}
|
}
|
||||||
@PostMapping("/addState")
|
@PostMapping("/addState")
|
||||||
public ResponseEntity<State> createState(@RequestBody State item) {
|
public ResponseEntity<State> createState(@RequestBody State item) {
|
||||||
State created = statesService.save(item);
|
State created = statesService.save(item);
|
||||||
return ResponseEntity.status(HttpStatus.CREATED).body(created);
|
return ResponseEntity.status(HttpStatus.CREATED).body(created);
|
||||||
}
|
}
|
||||||
|
|
||||||
@DeleteMapping("/deleteState/{id}")
|
@DeleteMapping("/deleteState/{id}")
|
||||||
public ResponseEntity<Void> deleteItem(@PathVariable Integer id) {
|
public ResponseEntity<Void> deleteItem(@PathVariable Integer id) {
|
||||||
return statesService.findById(id)
|
return statesService.findById(id)
|
||||||
.map(item -> {
|
.map(item -> {
|
||||||
statesService.deleteById(id);
|
statesService.deleteById(id);
|
||||||
return ResponseEntity.noContent().<Void>build();
|
return ResponseEntity.noContent().<Void>build();
|
||||||
})
|
})
|
||||||
.orElse(ResponseEntity.notFound().build());
|
.orElse(ResponseEntity.notFound().build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,52 +1,52 @@
|
|||||||
package group.goforward.battlbuilder.controllers;
|
package group.goforward.battlbuilder.controllers;
|
||||||
|
|
||||||
import group.goforward.battlbuilder.model.User;
|
import group.goforward.battlbuilder.model.User;
|
||||||
import group.goforward.battlbuilder.repos.UserRepository;
|
import group.goforward.battlbuilder.repos.UserRepository;
|
||||||
import group.goforward.battlbuilder.services.admin.UsersService;
|
import group.goforward.battlbuilder.services.admin.UsersService;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping({"/api/user", "/api/v1/user"})
|
@RequestMapping({"/api/user", "/api/v1/user"})
|
||||||
public class UserController {
|
public class UserController {
|
||||||
private final UserRepository repo;
|
private final UserRepository repo;
|
||||||
private final UsersService usersService;
|
private final UsersService usersService;
|
||||||
|
|
||||||
public UserController(UserRepository repo, UsersService usersService) {
|
public UserController(UserRepository repo, UsersService usersService) {
|
||||||
this.repo = repo;
|
this.repo = repo;
|
||||||
this.usersService = usersService;
|
this.usersService = usersService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/all")
|
@GetMapping("/all")
|
||||||
public ResponseEntity<List<User>> getAllUsers() {
|
public ResponseEntity<List<User>> getAllUsers() {
|
||||||
List<User> data = repo.findAll();
|
List<User> data = repo.findAll();
|
||||||
return ResponseEntity.ok(data);
|
return ResponseEntity.ok(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@GetMapping("/byId/{id}")
|
@GetMapping("/byId/{id}")
|
||||||
public ResponseEntity<User> getAllStatesById(@PathVariable Integer id) {
|
public ResponseEntity<User> getAllStatesById(@PathVariable Integer id) {
|
||||||
return repo.findById(id)
|
return repo.findById(id)
|
||||||
.map(ResponseEntity::ok)
|
.map(ResponseEntity::ok)
|
||||||
.orElse(ResponseEntity.notFound().build());
|
.orElse(ResponseEntity.notFound().build());
|
||||||
}
|
}
|
||||||
@PostMapping("/addUser")
|
@PostMapping("/addUser")
|
||||||
public ResponseEntity<User> createUser(@RequestBody User item) {
|
public ResponseEntity<User> createUser(@RequestBody User item) {
|
||||||
User created = usersService.save(item);
|
User created = usersService.save(item);
|
||||||
return ResponseEntity.status(HttpStatus.CREATED).body(created);
|
return ResponseEntity.status(HttpStatus.CREATED).body(created);
|
||||||
}
|
}
|
||||||
|
|
||||||
@DeleteMapping("/deleteUser/{id}")
|
@DeleteMapping("/deleteUser/{id}")
|
||||||
public ResponseEntity<Void> deleteItem(@PathVariable Integer id) {
|
public ResponseEntity<Void> deleteItem(@PathVariable Integer id) {
|
||||||
return usersService.findById(id)
|
return usersService.findById(id)
|
||||||
.map(item -> {
|
.map(item -> {
|
||||||
usersService.deleteById(id);
|
usersService.deleteById(id);
|
||||||
return ResponseEntity.noContent().<Void>build();
|
return ResponseEntity.noContent().<Void>build();
|
||||||
})
|
})
|
||||||
.orElse(ResponseEntity.notFound().build());
|
.orElse(ResponseEntity.notFound().build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user