diff --git a/src/main/java/com/dedicatedcode/reitti/config/RabbitMQConfig.java b/src/main/java/com/dedicatedcode/reitti/config/RabbitMQConfig.java
index eca281dd..cfbf8f85 100644
--- a/src/main/java/com/dedicatedcode/reitti/config/RabbitMQConfig.java
+++ b/src/main/java/com/dedicatedcode/reitti/config/RabbitMQConfig.java
@@ -28,6 +28,9 @@ public class RabbitMQConfig {
public static final String TRIGGER_PROCESSING_PIPELINE_QUEUE = "trigger-processing-queue";
public static final String TRIGGER_PROCESSING_PIPELINE_ROUTING_KEY = "trigger.processing.start";
+ public static final String USER_EVENT_QUEUE = "user-event-queue";
+ public static final String USER_EVENT_ROUTING_KEY = "user.event.update";
+
@Bean
public TopicExchange exchange() {
return new TopicExchange(EXCHANGE_NAME);
@@ -63,6 +66,11 @@ public class RabbitMQConfig {
return new Queue(TRIGGER_PROCESSING_PIPELINE_QUEUE, false);
}
+ @Bean
+ public Queue userEventQueue() {
+ return new Queue(USER_EVENT_QUEUE, false);
+ }
+
@Bean
public Binding locationDataBinding(Queue locationDataQueue, TopicExchange exchange) {
return BindingBuilder.bind(locationDataQueue).to(exchange).with(LOCATION_DATA_ROUTING_KEY);
@@ -93,6 +101,11 @@ public class RabbitMQConfig {
return BindingBuilder.bind(triggerProcessingQueue).to(exchange).with(TRIGGER_PROCESSING_PIPELINE_ROUTING_KEY);
}
+ @Bean
+ public Binding userEventBinding(Queue userEventQueue, TopicExchange exchange) {
+ return BindingBuilder.bind(userEventQueue).to(exchange).with(USER_EVENT_ROUTING_KEY);
+ }
+
@Bean
public Jackson2JsonMessageConverter messageConverter() {
return new Jackson2JsonMessageConverter();
diff --git a/src/main/java/com/dedicatedcode/reitti/controller/SseController.java b/src/main/java/com/dedicatedcode/reitti/controller/SseController.java
new file mode 100644
index 00000000..3ddd02d8
--- /dev/null
+++ b/src/main/java/com/dedicatedcode/reitti/controller/SseController.java
@@ -0,0 +1,34 @@
+package com.dedicatedcode.reitti.controller;
+
+import com.dedicatedcode.reitti.model.User;
+import com.dedicatedcode.reitti.service.UserSseEmitterService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+@RestController
+public class SseController {
+ private static final Logger log = LoggerFactory.getLogger(SseController.class);
+ private final UserSseEmitterService emitterService;
+
+ public SseController(UserSseEmitterService userSseEmitterService) {
+ this.emitterService = userSseEmitterService;
+ }
+
+ @GetMapping(path = "/events", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+ public SseEmitter handleSseForUser(@AuthenticationPrincipal UserDetails userDetails) {
+ if (userDetails == null) {
+ throw new IllegalStateException("User not authenticated for SSE endpoint.");
+ }
+
+ User user = (User) userDetails;
+ SseEmitter emitter = emitterService.addEmitter(user.getId());
+ log.info("New SSE connection from user: [{}]", user.getId());
+ return emitter;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/dedicatedcode/reitti/controller/api/IngestApiController.java b/src/main/java/com/dedicatedcode/reitti/controller/api/IngestApiController.java
index 6d34d813..96c015cc 100644
--- a/src/main/java/com/dedicatedcode/reitti/controller/api/IngestApiController.java
+++ b/src/main/java/com/dedicatedcode/reitti/controller/api/IngestApiController.java
@@ -4,7 +4,7 @@ import com.dedicatedcode.reitti.dto.LocationDataRequest;
import com.dedicatedcode.reitti.dto.OwntracksLocationRequest;
import com.dedicatedcode.reitti.model.User;
import com.dedicatedcode.reitti.repository.UserJdbcService;
-import com.dedicatedcode.reitti.service.importer.ImportBatchProcessor;
+import com.dedicatedcode.reitti.service.ImportBatchProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +14,10 @@ import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import java.io.Serializable;
import java.util.Collections;
diff --git a/src/main/java/com/dedicatedcode/reitti/event/SSEEvent.java b/src/main/java/com/dedicatedcode/reitti/event/SSEEvent.java
new file mode 100644
index 00000000..f61002f9
--- /dev/null
+++ b/src/main/java/com/dedicatedcode/reitti/event/SSEEvent.java
@@ -0,0 +1,37 @@
+package com.dedicatedcode.reitti.event;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+public class SSEEvent implements Serializable {
+ private final SSEType type;
+ private final Long userId;
+ private final Long changedUserId;
+ private final LocalDate date;
+
+ @JsonCreator
+ public SSEEvent(SSEType type, Long userId, Long changedUserId, LocalDate date) {
+ this.type = type;
+ this.userId = userId;
+ this.changedUserId = changedUserId;
+ this.date = date;
+ }
+
+ public SSEType getType() {
+ return type;
+ }
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public Long getChangedUserId() {
+ return changedUserId;
+ }
+
+ public LocalDate getDate() {
+ return date;
+ }
+}
diff --git a/src/main/java/com/dedicatedcode/reitti/event/SSEType.java b/src/main/java/com/dedicatedcode/reitti/event/SSEType.java
new file mode 100644
index 00000000..6343d53d
--- /dev/null
+++ b/src/main/java/com/dedicatedcode/reitti/event/SSEType.java
@@ -0,0 +1,7 @@
+package com.dedicatedcode.reitti.event;
+
+public enum SSEType {
+ TRIPS,
+ VISITS,
+ RAW_DATA
+}
diff --git a/src/main/java/com/dedicatedcode/reitti/repository/UserSettingsJdbcService.java b/src/main/java/com/dedicatedcode/reitti/repository/UserSettingsJdbcService.java
index f0413a8c..989352b7 100644
--- a/src/main/java/com/dedicatedcode/reitti/repository/UserSettingsJdbcService.java
+++ b/src/main/java/com/dedicatedcode/reitti/repository/UserSettingsJdbcService.java
@@ -138,4 +138,8 @@ public class UserSettingsJdbcService {
this.jdbcTemplate.update("UPDATE user_settings SET latest_data = GREATEST(latest_data, ?) WHERE user_id = ?", Timestamp.from(instant), user.getId());
});
}
+
+ public List${window.locale.sse.error}
`; + messagesDiv.classList.add('active') + }; + + eventSource.onmessage = function(event) { + console.log('Received generic event:', event.data); + }; +