Bugfix for query converting timestamp to instant

cjmalloy · Dec 24, 2023 · f2072ba · f2072ba
1 parent f391154
commit f2072ba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/jasper/component/Validate.java b/src/main/java/jasper/component/Validate.java
@@ -291,10 +291,10 @@ private void plugin(Schema schema, String tag, JsonNode plugin) {
 	private void sources(Ref ref) {
 		if (ref.getSources() == null) return;
 		for (var sourceUrl : ref.getSources()) {
-			var sourcePublished = refRepository.findAllPublishedByUrlAndPublishedGreaterThanEqual(sourceUrl, ref.getOrigin(), ref.getPublished());
-			for (var published : sourcePublished) {
-				if (published.isAfter(ref.getPublished())) {
-					ref.setPublished(published.plusMillis(1));
+			var sources = refRepository.findAllPublishedByUrlAndPublishedGreaterThanEqual(sourceUrl, ref.getOrigin(), ref.getPublished());
+			for (var source : sources) {
+				if (source.getPublished().isAfter(ref.getPublished())) {
+					ref.setPublished(source.getPublished().plusMillis(1));
 				}
 			}
 		}

diff --git a/src/main/java/jasper/repository/RefRepository.java b/src/main/java/jasper/repository/RefRepository.java
@@ -61,13 +61,13 @@ SELECT max(r.modified)
 		WHERE r.origin = :origin""")
 	Instant getCursor(String origin);
 
-	@Query(nativeQuery = true, value = """
-		SELECT modified FROM Ref ref
-		WHERE url = :url
-			AND published >= :published
+	@Query(value = """
+		SELECT ref FROM Ref ref
+		WHERE ref.url = :url
+			AND ref.published >= :published
 		    AND (:origin = '' OR ref.origin = :origin OR ref.origin LIKE concat(:origin, '.%'))
 			""")
-	List<Instant> findAllPublishedByUrlAndPublishedGreaterThanEqual(String url, String origin, Instant published);
+	List<Ref> findAllPublishedByUrlAndPublishedGreaterThanEqual(String url, String origin, Instant published);
 
 	@Query(nativeQuery = true, value = """
 		SELECT url FROM ref