From d003e8bccba673c10d4350a416cbac52fbc8d0c7 Mon Sep 17 00:00:00 2001 From: jotty Date: Sun, 2 Oct 2022 17:37:43 +0200 Subject: [PATCH] https://gitlab.com/jottyfan/camporganizer2/-/issues/1 --- .classpath | 13 +---------- .project | 2 +- .settings/org.eclipse.buildship.core.prefs | 11 ++++++++++ .settings/org.eclipse.jdt.core.prefs | 4 ++++ .settings/org.eclipse.wst.common.component | 22 ++++++------------- .../module/common/IndexGateway.java | 7 +++--- .../module/common/IndexService.java | 9 +++++++- src/main/resources/application.properties | 2 +- 8 files changed, 37 insertions(+), 33 deletions(-) create mode 100644 .settings/org.eclipse.jdt.core.prefs diff --git a/.classpath b/.classpath index 0289544..f3bdce0 100644 --- a/.classpath +++ b/.classpath @@ -12,18 +12,7 @@ - - - - - - - - - - - - + diff --git a/.project b/.project index 1318bfa..ebcb21c 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - CampOrganizer2 + camporganizer2 diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs index e889521..e479558 100644 --- a/.settings/org.eclipse.buildship.core.prefs +++ b/.settings/org.eclipse.buildship.core.prefs @@ -1,2 +1,13 @@ +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.project.dir= eclipse.preferences.version=1 +gradle.user.home= +java.home= +jvm.arguments= +offline.mode=false +override.workspace.settings=false +show.console.view=false +show.executions.view=false diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..626e0e1 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.source=17 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index d333849..a2ed0c0 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,16 +1,8 @@ - - - - - - - - - - - - - - - + + + + + + + diff --git a/src/main/java/de/jottyfan/camporganizer/module/common/IndexGateway.java b/src/main/java/de/jottyfan/camporganizer/module/common/IndexGateway.java index 47121b3..5fba51b 100644 --- a/src/main/java/de/jottyfan/camporganizer/module/common/IndexGateway.java +++ b/src/main/java/de/jottyfan/camporganizer/module/common/IndexGateway.java @@ -6,8 +6,9 @@ import java.util.stream.Stream; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jooq.Condition; import org.jooq.DSLContext; -import org.jooq.SelectWhereStep; +import org.jooq.SelectConditionStep; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; @@ -27,8 +28,8 @@ public class IndexGateway { @Autowired private DSLContext jooq; - public Stream getAllCamps() { - SelectWhereStep sql = jooq.selectFrom(V_CAMP); + public Stream getAllCamps(Condition condition) { + SelectConditionStep sql = jooq.selectFrom(V_CAMP).where(condition); LOGGER.debug(sql.toString()); return sql.fetchStream(); } diff --git a/src/main/java/de/jottyfan/camporganizer/module/common/IndexService.java b/src/main/java/de/jottyfan/camporganizer/module/common/IndexService.java index 84ba436..4872b79 100644 --- a/src/main/java/de/jottyfan/camporganizer/module/common/IndexService.java +++ b/src/main/java/de/jottyfan/camporganizer/module/common/IndexService.java @@ -1,9 +1,15 @@ package de.jottyfan.camporganizer.module.common; +import static de.jottyfan.camporganizer.db.jooq.Tables.V_CAMP; + +import java.sql.Timestamp; +import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.stream.Stream; +import org.jooq.Condition; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,7 +31,8 @@ public class IndexService { * @return the list of found camps */ public List getAllCamps() { - Stream stream = gateway.getAllCamps(); + Condition condition = V_CAMP.DEPART.greaterOrEqual(LocalDateTime.now()); + Stream stream = gateway.getAllCamps(condition); List list = new ArrayList<>(); stream.forEach(o -> list.add(o)); return list; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 59d3a65..acf61c4 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -10,7 +10,7 @@ server.port = 8081 server.servlet.context-path=/CampOrganizer2 # keycloak -keycloak.auth-server-url = http://localhost:8080/ +keycloak.auth-server-url = https://www.onkelwernerfreizeiten.de:8443/ keycloak.realm = ow keycloak.resource = biblecamp keycloak.public-client = true