Added lastModified to entities with images, for better http caching

FroMage · Jun 12, 2024 · aced825 · aced825
1 parent 8728f13
commit aced825
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 20 deletions.
diff --git a/src/main/java/model/Organiser.java b/src/main/java/model/Organiser.java
@@ -2,6 +2,8 @@
 
 import java.sql.Blob;
 import java.sql.Types;
+import java.time.Instant;
+import java.util.Date;
 import java.util.List;
 
 import org.hibernate.annotations.JdbcTypeCode;
@@ -10,6 +12,8 @@
 
 import io.quarkus.hibernate.orm.panache.PanacheEntity;
 import jakarta.persistence.Entity;
+import jakarta.persistence.PrePersist;
+import jakarta.persistence.PreUpdate;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 
@@ -34,7 +38,15 @@ public class Organiser extends PanacheEntity {
 
 	public boolean orga;
 	public boolean cfp;
-
+
+	public Date lastUpdated;
+
+	@PreUpdate
+	@PrePersist
+	public void prePersist() {
+		lastUpdated = Date.from(Instant.now());
+	}
+
 	@Override
 	public String toString() {
 		return firstName+" "+lastName;

diff --git a/src/main/java/model/PreviousSpeaker.java b/src/main/java/model/PreviousSpeaker.java
@@ -1,8 +1,12 @@
 package model;
 
 import java.sql.Blob;
+import java.time.Instant;
+import java.util.Date;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.PrePersist;
+import jakarta.persistence.PreUpdate;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import io.quarkus.hibernate.orm.panache.PanacheEntity;
@@ -20,11 +24,18 @@ public class PreviousSpeaker extends PanacheEntity implements Comparable<Previou
 	public String company;
 
 	public Blob photo;
-
+	public Date lastUpdated;
+
 	/* La dernière année à laquelle l'orateur a participé au RivieraDEV */
 	@NotNull
 	public Integer year;
 
+	@PreUpdate
+	@PrePersist
+	public void prePersist() {
+		lastUpdated = Date.from(Instant.now());
+	}
+
 	@Override
 	public String toString() {
 		return firstName+" "+lastName;

diff --git a/src/main/java/model/Speaker.java b/src/main/java/model/Speaker.java
@@ -2,7 +2,9 @@
 
 import java.sql.Blob;
 import java.sql.Types;
+import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.hibernate.annotations.JdbcTypeCode;
@@ -12,6 +14,8 @@
 import io.quarkus.hibernate.orm.panache.PanacheEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.ManyToMany;
+import jakarta.persistence.PrePersist;
+import jakarta.persistence.PreUpdate;
 import jakarta.validation.constraints.NotBlank;
 
 @Entity
@@ -45,7 +49,15 @@ public class Speaker extends PanacheEntity implements Comparable<Speaker> {
 	public List<Talk> talks = new ArrayList<Talk>();
 
 	public String phone;
-
+
+	public Date lastUpdated;
+
+	@PreUpdate
+	@PrePersist
+	public void prePersist() {
+		lastUpdated = Date.from(Instant.now());
+	}
+
 	@Override
 	public String toString() {
 		return firstName+" "+lastName;

diff --git a/src/main/java/model/Sponsor.java b/src/main/java/model/Sponsor.java
@@ -6,7 +6,10 @@
 import java.sql.Blob;
 import java.sql.SQLException;
 import java.sql.Types;
+import java.time.Instant;
+import java.time.LocalDate;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -52,11 +55,13 @@ public class Sponsor extends PanacheEntity implements Comparable<Sponsor> {
 
 	// set on save/create
 	public Integer width, height;
+	public Date lastUpdated;
 
 	@PreUpdate
 	@PrePersist
 	public void prePersist() {
 		updateImageSizes();
+		lastUpdated = Date.from(Instant.now());
 	}
 
 	private void updateImageSizes() {

diff --git a/src/main/java/rest/Application.java b/src/main/java/rest/Application.java
@@ -13,25 +13,21 @@
 
 import org.jboss.resteasy.reactive.RestPath;
 import org.jboss.resteasy.reactive.RestQuery;
-import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
-import org.jboss.resteasy.reactive.server.core.CurrentRequestManager;
-import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.common.jaxrs.AbstractResponseBuilder;
 
 import io.quarkiverse.renarde.security.ControllerWithUser;
 import io.quarkiverse.renarde.util.FileUtils;
-import io.quarkus.arc.Arc;
 import io.quarkus.qute.CheckedTemplate;
 import io.quarkus.qute.TemplateGlobal;
 import io.quarkus.qute.TemplateInstance;
 import io.smallrye.common.annotation.Blocking;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
-import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.Request;
 import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.UriBuilder;
-import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
 import model.Configuration;
 import model.Language;
 import model.Level;
@@ -377,47 +373,58 @@ public void becomeSponsor() {
     }
 
     @Transactional
-    public Response previousSpeakerPhoto(@RestPath Long id) {
+    public Response previousSpeakerPhoto(@RestPath Long id, Request request) {
         PreviousSpeaker speaker = PreviousSpeaker.findById(id);
         notFoundIfNull(speaker);
         if (speaker.photo == null)
             seeOther("/static/images/mascotte/Ray_Cool.jpg");
-        return binary(speaker.photo);
+        return binary(speaker.photo, speaker.lastUpdated, request);
     }
 
-    private Response binary(Blob photo) {
+    private Response binary(Blob photo, Date lastUpdated, Request request) {
+    	if(lastUpdated != null) {
+    		// Workaround for https://github.com/quarkusio/quarkus/issues/41110
+    		// truncate milliseconds for comparison
+    		Date forComparison = new Date((lastUpdated.getTime() / 1000) * 1000);
+    		ResponseBuilder cacheResponse = request.evaluatePreconditions(forComparison);
+    		if(cacheResponse != null) {
+    			return cacheResponse.build();
+    		}
+    	}
     	byte[] bytes;
 		try {
 			bytes = photo.getBytes(1, (int) photo.length());
 		} catch (SQLException e) {
 			throw new RuntimeException(e);
 		}
-    	return Response.ok(bytes, FileUtils.getMimeType(null, bytes)).build();
+    	return Response.ok(bytes, FileUtils.getMimeType(null, bytes))
+        		// Workaround for https://github.com/quarkusio/quarkus/issues/41110
+    			.header(HttpHeaders.LAST_MODIFIED, AbstractResponseBuilder.getDateFormatRFC822().format(lastUpdated)).build();
 	}
 
     @Transactional
-	public Response speakerPhoto(@RestPath Long id) {
+	public Response speakerPhoto(@RestPath Long id, Request request) {
         Speaker speaker = Speaker.findById(id);
         notFoundIfNull(speaker);
         if (speaker.photo == null)
             seeOther("/static/images/mascotte/Ray_Cool.jpg");
-        return binary(speaker.photo);
+        return binary(speaker.photo, speaker.lastUpdated, request);
     }
 
     @Transactional
-    public Response sponsorLogo(@RestPath Long id) {
+    public Response sponsorLogo(@RestPath Long id, Request request) {
         Sponsor sponsor = Sponsor.findById(id);
         notFoundIfNull(sponsor);
-        return binary(sponsor.logo);
+        return binary(sponsor.logo, sponsor.lastUpdated, request);
     }
 
     @Transactional
-    public Response orgaPhoto(@RestPath Long id) {
+    public Response orgaPhoto(@RestPath Long id, Request request) {
         Organiser organiser = Organiser.findById(id);
         notFoundIfNull(organiser);
         if (organiser.photo == null)
             seeOther("/static/images/mascotte/Ray_Badass.jpg");
-        return binary(organiser.photo);
+        return binary(organiser.photo, organiser.lastUpdated, request);
     }
 
     @Path("/team")

diff --git a/src/main/resources/db/migration/V2.0.0__add-last-modified-for-caching.sql b/src/main/resources/db/migration/V2.0.0__add-last-modified-for-caching.sql
@@ -0,0 +1,9 @@
+alter table Organiser add column lastUpdated timestamp(6);
+alter table PreviousSpeaker add column lastUpdated timestamp(6);
+alter table Speaker add column lastUpdated timestamp(6);
+alter table Sponsor add column lastUpdated timestamp(6);
+
+update Organiser set lastUpdated = current_timestamp;
+update PreviousSpeaker set lastUpdated = current_timestamp;
+update Speaker set lastUpdated = current_timestamp;
+update Sponsor set lastUpdated = current_timestamp;