Allow Ref and Ext upserts from update endpoint when force is true

cjmalloy · Nov 27, 2023 · 38883f3 · 38883f3
1 parent 191231e
commit 38883f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/jasper/service/ExtService.java b/src/main/java/jasper/service/ExtService.java
@@ -125,7 +125,9 @@ public Instant update(Ext ext, boolean force) {
 		var maybeExisting = extRepository.findOneByQualifiedTag(ext.getQualifiedTag());
 		if (maybeExisting.isEmpty()) throw new NotFoundException("Ext " + ext.getQualifiedTag());
 		var existing = maybeExisting.get();
-		if (ext.getModified() == null || !ext.getModified().truncatedTo(ChronoUnit.SECONDS).equals(existing.getModified().truncatedTo(ChronoUnit.SECONDS))) throw new ModifiedException("Ext " + ext.getQualifiedTag());
+		if (!force && (ext.getModified() == null || !ext.getModified().truncatedTo(ChronoUnit.SECONDS).equals(existing.getModified().truncatedTo(ChronoUnit.SECONDS)))) {
+			throw new ModifiedException("Ext " + ext.getQualifiedTag());
+		}
 		validate.ext(ext, force);
 		ext.setModified(Instant.now());
 		try {

diff --git a/src/main/java/jasper/service/RefService.java b/src/main/java/jasper/service/RefService.java
@@ -133,7 +133,9 @@ public Instant update(Ref ref, boolean force) {
 		var maybeExisting = refRepository.findOneByUrlAndOrigin(ref.getUrl(), ref.getOrigin());
 		if (maybeExisting.isEmpty()) throw new NotFoundException("Ref " + ref.getOrigin() + " " + ref.getUrl());
 		var existing = maybeExisting.get();
-		if (ref.getModified() == null || !ref.getModified().truncatedTo(ChronoUnit.SECONDS).equals(existing.getModified().truncatedTo(ChronoUnit.SECONDS))) throw new ModifiedException("Ref");
+		if (!force && (ref.getModified() == null || !ref.getModified().truncatedTo(ChronoUnit.SECONDS).equals(existing.getModified().truncatedTo(ChronoUnit.SECONDS)))) {
+			throw new ModifiedException("Ref");
+		}
 		var hiddenTags = auth.hiddenTags(existing.getTags());
 		ref.addTags(hiddenTags);
 		ref.addPlugins(hiddenTags, existing.getPlugins());