784 when clicking on timeline shows a previous day 2 (#785)

Author: dgraf-gh

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
   push:
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
-
+      - 'v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+'
 permissions:
   packages: write
   contents: write
@@ -65,10 +65,10 @@ jobs:
             dedicatedcode/reitti
             ghcr.io/${{ github.repository }}
           tags: |
-            type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=latest,enable=${{ !contains(github.ref, '-beta') && github.ref_type == 'tag' }}
             type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}},enable=${{ !contains(github.ref, '-beta') }}
+            type=semver,pattern={{major}},enable=${{ !contains(github.ref, '-beta') }}
       - name: Build and push reitti image
         uses: docker/build-push-action@v6
         with:
@@ -85,10 +85,10 @@ jobs:
             dedicatedcode/reitti-tile-cache
             ghcr.io/${{ github.repository }}-tile-cache
           tags: |
-            type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=latest,enable=${{ !contains(github.ref, '-beta') && github.ref_type == 'tag' }}
             type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}},enable=${{ !contains(github.ref, '-beta') }}
+            type=semver,pattern={{major}},enable=${{ !contains(github.ref, '-beta') }}
       - name: Build and push tile-cache image
         uses: docker/build-push-action@v6
         with:
@@ -101,7 +101,8 @@ jobs:
         uses: softprops/action-gh-release@v2
         if: github.ref_type == 'tag'
         with:
-          make_latest: true
+          prerelease: ${{ contains(github.ref, '-beta') }}
+          make_latest: ${{ !contains(github.ref, '-beta') }}
           fail_on_unmatched_files: true
           files: |
             staging/*.jar

pom.xml

@@ -91,10 +91,14 @@
             <artifactId>rqueue-spring-boot-starter</artifactId>
             <version>3.4.0-RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
         <dependency>
             <groupId>net.iakovlev</groupId>
             <artifactId>timeshape</artifactId>
-            <version>2025b.26</version>
+            <version>2025b.28</version>
         </dependency>
         <dependency>
             <groupId>net.coobird</groupId>

src/main/java/com/dedicatedcode/reitti/config/RQueueCustomMessageConverter.java

@@ -0,0 +1,16 @@
+package com.dedicatedcode.reitti.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.github.sonus21.rqueue.converter.GenericMessageConverter;
+import com.github.sonus21.rqueue.converter.MessageConverterProvider;
+import org.springframework.messaging.converter.MessageConverter;
+
+public class RQueueCustomMessageConverter implements MessageConverterProvider {
+    @Override
+    public MessageConverter getConverter() {
+        return new GenericMessageConverter(new ObjectMapper()
+                                                   .findAndRegisterModules()
+                                                   .registerModule(new JavaTimeModule()));
+    }
+}

src/main/java/com/dedicatedcode/reitti/controller/api/LocationDataApiController.java

@@ -173,7 +173,7 @@ public ResponseEntity<?> getLatestLocationForCurrentUser(@AuthenticationPrincipa
             point.setLatitude(latestPoint.getLatitude());
             point.setLongitude(latestPoint.getLongitude());
             point.setAccuracyMeters(latestPoint.getAccuracyMeters());
-            point.setTimestamp(latestPoint.getTimestamp().toString());
+            point.setTimestamp(latestPoint.getTimestamp());
 
             return ResponseEntity.ok(Map.of(
                 "hasLocation", true,
@@ -254,7 +254,7 @@ private LocationPoint toLocationPoint(RawLocationPoint point) {
         p.setLongitude(point.getLongitude());
         p.setAccuracyMeters(point.getAccuracyMeters());
         p.setElevationMeters(point.getElevationMeters());
-        p.setTimestamp(point.getTimestamp().toString());
+        p.setTimestamp(point.getTimestamp());
         return p;
     }
 

src/main/java/com/dedicatedcode/reitti/controller/api/ingestion/gpslogger/GPSLoggerIngestionApiController.java

@@ -2,7 +2,6 @@
 
 import com.dedicatedcode.reitti.controller.api.ingestion.owntracks.OwntracksFriendResponse;
 import com.dedicatedcode.reitti.dto.LocationPoint;
-import com.dedicatedcode.reitti.dto.LocationPoint2;
 import com.dedicatedcode.reitti.dto.OwntracksLocationRequest;
 import com.dedicatedcode.reitti.model.security.User;
 import com.dedicatedcode.reitti.repository.UserJdbcService;
@@ -51,7 +50,7 @@ public ResponseEntity<?> receiveData(@RequestBody OwntracksLocationRequest reque
             }
 
             // Convert an Owntracks format to our LocationPoint format
-            LocationPoint2 locationPoint = request.toLocationPoint();
+            LocationPoint locationPoint = request.toLocationPoint();
 
             if (locationPoint.getTimestamp() == null) {
                 logger.warn("Ignoring location point [{}] because timestamp is null", locationPoint);

src/main/java/com/dedicatedcode/reitti/controller/api/ingestion/overland/OverlandIngestionApiController.java

@@ -1,7 +1,6 @@
 package com.dedicatedcode.reitti.controller.api.ingestion.overland;
 
 import com.dedicatedcode.reitti.dto.LocationPoint;
-import com.dedicatedcode.reitti.dto.LocationPoint2;
 import com.dedicatedcode.reitti.dto.OverlandLocationRequest;
 import com.dedicatedcode.reitti.model.security.User;
 import com.dedicatedcode.reitti.repository.UserJdbcService;
@@ -54,7 +53,7 @@ public ResponseEntity<?> receiveOverlandData(@RequestBody OverlandLocationReques
             }
 
             // Convert Overland locations to our LocationPoint format
-            List<LocationPoint2> locationPoints = request.getLocations().stream()
+            List<LocationPoint> locationPoints = request.getLocations().stream()
                     .map(OverlandLocationRequest.OverlandLocation::toLocationPoint)
                     .filter(point -> point != null && point.getTimestamp() != null && point.getAccuracyMeters() != null)
                     .toList();
@@ -67,7 +66,7 @@ public ResponseEntity<?> receiveOverlandData(@RequestBody OverlandLocationReques
             }
 
             // Add each location point to the batching service
-            for (LocationPoint2 point : locationPoints) {
+            for (LocationPoint point : locationPoints) {
                 this.locationBatchingService.addLocationPoint(user, point);
             }
             logger.debug("Successfully received and queued {} Overland location points for user {}",

src/main/java/com/dedicatedcode/reitti/controller/api/ingestion/owntracks/OwntracksIngestionApiController.java

@@ -1,7 +1,6 @@
 package com.dedicatedcode.reitti.controller.api.ingestion.owntracks;
 
 import com.dedicatedcode.reitti.dto.LocationPoint;
-import com.dedicatedcode.reitti.dto.LocationPoint2;
 import com.dedicatedcode.reitti.dto.OwntracksLocationRequest;
 import com.dedicatedcode.reitti.dto.ReittiRemoteInfo;
 import com.dedicatedcode.reitti.model.geo.RawLocationPoint;
@@ -29,8 +28,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.time.Instant;
-import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -74,7 +71,7 @@ public ResponseEntity<?> receiveOwntracksData(@RequestBody OwntracksLocationRequ
             }
 
             // Convert an Owntracks format to our LocationPoint format
-            LocationPoint2 locationPoint = request.toLocationPoint();
+            LocationPoint locationPoint = request.toLocationPoint();
 
             if (locationPoint.getTimestamp() == null) {
                 logger.warn("Ignoring location point [{}] because timestamp is null", locationPoint);
@@ -145,7 +142,7 @@ private List<OwntracksFriendResponse> buildFriendsData(User user) {
 
                 friendsData.add(owntracksFriendResponse);
                 Optional<LocationPoint> latestLocation = reittiIntegrationService.findLatest(user, integration.getId());
-                latestLocation.ifPresent(location -> friendsData.add(new OwntracksFriendResponse(tid, info.userInfo().displayName(), location.getLatitude(), location.getLongitude(), Instant.parse(location.getTimestamp()).getEpochSecond())));
+                latestLocation.ifPresent(location -> friendsData.add(new OwntracksFriendResponse(tid, info.userInfo().displayName(), location.getLatitude(), location.getLongitude(), location.getTimestamp().getEpochSecond())));
                 } catch (RequestFailedException | RequestTemporaryFailedException e) {
                 logger.warn("Couldn't fetch info for integration {}", integration.getId(), e);
             }

src/main/java/com/dedicatedcode/reitti/dto/ConfigurationForm.java

@@ -61,7 +61,7 @@ public static ConfigurationForm fromConfiguration(DetectionParameter config, Zon
         form.setMaxMergeTimeBetweenSameStayPoints(config.getVisitDetection().getMaxMergeTimeBetweenSameStayPoints());
         form.setSearchDurationInHours(config.getVisitMerging().getSearchDurationInHours());
         form.setMaxMergeTimeBetweenSameVisits(config.getVisitMerging().getMaxMergeTimeBetweenSameVisits());
-        form.setMinDistanceBetweenVisits(config.getVisitMerging().getMinDistanceBetweenVisits());
+        form.setMinDistanceBetweenVisits(config.getVisitMerging().getPlaceRadiusMeters());
 
         // Check if configuration matches any predefined sensitivity level
         Integer matchingSensitivityLevel = findMatchingSensitivityLevel(config);
@@ -104,7 +104,7 @@ private static boolean configurationMatches(DetectionParameter config,
                actualDetection.getMaxMergeTimeBetweenSameStayPoints() == expectedDetection.getMaxMergeTimeBetweenSameStayPoints() &&
                actualMerging.getSearchDurationInHours() == expectedMerging.getSearchDurationInHours() &&
                actualMerging.getMaxMergeTimeBetweenSameVisits() == expectedMerging.getMaxMergeTimeBetweenSameVisits() &&
-               actualMerging.getMinDistanceBetweenVisits() == expectedMerging.getMinDistanceBetweenVisits();
+               actualMerging.getPlaceRadiusMeters() == expectedMerging.getPlaceRadiusMeters();
     }
 
     private static DetectionParameter.VisitDetection mapSensitivityToVisitDetection(int level) {
@@ -142,7 +142,7 @@ public void applySensitivityLevel(Integer level) {
         this.maxMergeTimeBetweenSameStayPoints = visitDetection.getMaxMergeTimeBetweenSameStayPoints();
         this.searchDurationInHours = visitMerging.getSearchDurationInHours();
         this.maxMergeTimeBetweenSameVisits = visitMerging.getMaxMergeTimeBetweenSameVisits();
-        this.minDistanceBetweenVisits = visitMerging.getMinDistanceBetweenVisits();
+        this.minDistanceBetweenVisits = visitMerging.getPlaceRadiusMeters();
         this.sensitivityLevel = level;
     }
 
@@ -169,7 +169,7 @@ public boolean hasConfigurationChanged(DetectionParameter original) {
 
         if (originalMerging.getSearchDurationInHours() != currentMerging.getSearchDurationInHours() ||
             originalMerging.getMaxMergeTimeBetweenSameVisits() != currentMerging.getMaxMergeTimeBetweenSameVisits() ||
-            originalMerging.getMinDistanceBetweenVisits() != currentMerging.getMinDistanceBetweenVisits()) {
+            originalMerging.getPlaceRadiusMeters() != currentMerging.getPlaceRadiusMeters()) {
             return true;
         }
 

src/main/java/com/dedicatedcode/reitti/dto/LocationPoint.java

@@ -2,6 +2,8 @@
 
 import jakarta.validation.constraints.NotNull;
 
+import java.time.Instant;
+
 public class LocationPoint {
     @NotNull
     private Double latitude;
@@ -10,7 +12,7 @@ public class LocationPoint {
     private Double longitude;
 
     @NotNull
-    private String timestamp; // ISO8601 format
+    private Instant timestamp;
 
     @NotNull
     private Double accuracyMeters;
@@ -33,11 +35,11 @@ public void setLongitude(Double longitude) {
         this.longitude = longitude;
     }
 
-    public String getTimestamp() {
+    public Instant getTimestamp() {
         return timestamp;
     }
 
-    public void setTimestamp(String timestamp) {
+    public void setTimestamp(Instant timestamp) {
         this.timestamp = timestamp;
     }