From 9c8bb13fb092e882675d52e67bc43d6a915a25c5 Mon Sep 17 00:00:00 2001 From: Don Strawsburg Date: Tue, 20 Jan 2026 22:41:51 -0500 Subject: [PATCH] fixing cors for prod --- docker/backend/Dockerfile | 1 - docker/docker-compose.yaml | 4 ++-- .../group/goforward/battlbuilder/config/CorsConfig.java | 3 ++- .../enrichment/ai/AiEnrichmentOrchestrator.java | 6 ++++++ src/main/resources/application.properties | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 42ebf9b..54bfefc 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -19,7 +19,6 @@ RUN mvn clean package -DskipTests # Use a smaller Java Runtime Environment (JRE) image for a smaller footprint FROM eclipse-temurin:21-jre -ENV SPRING_PROFILES_ACTIVE=prod # Set the working directory in the final image WORKDIR /app diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 073fbb1..c9c97a4 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -11,8 +11,8 @@ services: - SPRING_DATASOURCE_URL=jdbc:postgresql://ash.gofwd.group:5433/ss_builder - SPRING_DATASOURCE_USERNAME=dba - SPRING_DATASOURCE_PASSWORD=!@#Qwerty - - SPRING_PROFILES_ACTIVE=prod - - AI_ENRICHMENT_PROVIDER=off + - SPRING_PROFILES_ACTIVE=openai,prod + - AI_ENRICHMENT_PROVIDER=openai networks: - app-network diff --git a/src/main/java/group/goforward/battlbuilder/config/CorsConfig.java b/src/main/java/group/goforward/battlbuilder/config/CorsConfig.java index d923961..9879d8c 100644 --- a/src/main/java/group/goforward/battlbuilder/config/CorsConfig.java +++ b/src/main/java/group/goforward/battlbuilder/config/CorsConfig.java @@ -33,7 +33,8 @@ public class CorsConfig { "https://localhost:3000/gunbuilder", "http://localhost:3000/gunbuilder", "https://localhost:3000/builder", - "http://localhost:3000/builder" + "http://localhost:3000/builder", + "https://battl.builders" )); // Allow all headers diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/ai/AiEnrichmentOrchestrator.java b/src/main/java/group/goforward/battlbuilder/enrichment/ai/AiEnrichmentOrchestrator.java index 75b7f90..553ad50 100644 --- a/src/main/java/group/goforward/battlbuilder/enrichment/ai/AiEnrichmentOrchestrator.java +++ b/src/main/java/group/goforward/battlbuilder/enrichment/ai/AiEnrichmentOrchestrator.java @@ -10,6 +10,7 @@ import group.goforward.battlbuilder.enrichment.repo.ProductEnrichmentRepository; import group.goforward.battlbuilder.model.Product; import group.goforward.battlbuilder.repos.ProductRepository; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -17,6 +18,11 @@ import java.util.List; import java.util.Map; @Service +@ConditionalOnProperty( + name = "ai.enrichment.provider", + havingValue = "openai", + matchIfMissing = false +) public class AiEnrichmentOrchestrator { private final EnrichmentModelClient modelClient; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2c1e8cb..5b28caa 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -79,6 +79,6 @@ app.beta.invite.tokenMinutes=30 ai.minConfidence=0.75 ai.openai.apiKey=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 ai.openai.model=gpt-4.1-mini -ai.enrichment.provider=off +ai.enrichment.provider=openai spring.jackson.serialization.fail-on-empty-beans=false \ No newline at end of file