From 7eb295a18b9e44521b8d05810446a0b5679f6ddd Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 5 Oct 2026 19:16:35 +0000 Subject: [PATCH 1/2] Initial plan From e2820fd987c91d6495a2eb648880d4e66554f8b3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 5 Oct 2026 19:19:59 +0000 Subject: [PATCH 2/2] test: avoid duplicate DemoProperties bean in DemoSeederIT Co-authored-by: mudabs <92596644+mudabs@users.noreply.github.com> --- .../com/eventshare/api/demo/DemoSeederIT.java | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/backend/src/test/java/com/eventshare/api/demo/DemoSeederIT.java b/backend/src/test/java/com/eventshare/api/demo/DemoSeederIT.java index 5707e4c..f82fbe1 100644 --- a/backend/src/test/java/com/eventshare/api/demo/DemoSeederIT.java +++ b/backend/src/test/java/com/eventshare/api/demo/DemoSeederIT.java @@ -14,8 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; -import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.DynamicPropertyRegistry; @@ -54,9 +52,12 @@ @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) @TestPropertySource(properties = { "spring.jpa.hibernate.ddl-auto=validate", - "spring.flyway.enabled=true" + "spring.flyway.enabled=true", + "eventshare.demo.enabled=true", + "eventshare.demo.admin-enabled=true", + "eventshare.demo.photo-count=10" }) -@Import({DemoSeeder.class, DemoSeederIT.Config.class}) +@Import(DemoSeeder.class) @Testcontainers @Transactional(propagation = Propagation.NOT_SUPPORTED) class DemoSeederIT { @@ -71,18 +72,8 @@ static void datasourceProps(DynamicPropertyRegistry registry) { registry.add("spring.datasource.url", postgres::getJdbcUrl); registry.add("spring.datasource.username", postgres::getUsername); registry.add("spring.datasource.password", postgres::getPassword); - } - - @TestConfiguration - static class Config { - @Bean - DemoProperties demoProperties() { - return new DemoProperties(true, - "demo-host", null, "Host-Pass-123", "Demo Host", - true, "demo-admin", null, "Admin-Pass-123", "Demo Admin", - "EVENTSHARE", "TEAMDAY26X", "INTERVIEW30", PHOTOS, - "0 0 4 * * *", "America/Chicago", false); - } + registry.add("eventshare.demo.host-password", () -> "Host-Pass-123"); + registry.add("eventshare.demo.admin-password", () -> "Admin-Pass-123"); } @MockitoBean ClerkUserClient clerk;