Merge pull request #147 from 12urenloop/feat/positioners

support multiple positioners

Author: Topvennie

src/main/java/telraam/App.java

@@ -105,6 +105,7 @@ public void run(AppConfiguration configuration, Environment environment) {
         jersey.register(new LapResource(database.onDemand(LapDAO.class)));
         jersey.register(new TeamResource(database.onDemand(TeamDAO.class), database.onDemand(BatonSwitchoverDAO.class)));
         jersey.register(new LapSourceResource(database.onDemand(LapSourceDAO.class)));
+        jersey.register(new PositionSourceResource(database.onDemand(PositionSourceDAO.class)));
         jersey.register(new BatonSwitchoverResource(database.onDemand(BatonSwitchoverDAO.class)));
         jersey.register(new LapSourceSwitchoverResource(database.onDemand(LapSourceSwitchoverDAO.class)));
         jersey.register(new AcceptedLapsResource());

src/main/java/telraam/api/PositionSourceResource.java

@@ -0,0 +1,20 @@
+package telraam.api;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import telraam.database.daos.DAO;
+import telraam.database.models.PositionSource;
+
+
+import java.awt.*;
+
+@Path("/position-source")
+@Tag(name = "Position Source")
+@Produces(MediaType.APPLICATION_JSON)
+public class PositionSourceResource extends AbstractListableResource<PositionSource> {
+    public PositionSourceResource(DAO<PositionSource> dao) {
+        super(dao);
+    }
+}

src/main/java/telraam/database/daos/PositionSourceDAO.java

@@ -0,0 +1,27 @@
+package telraam.database.daos;
+
+import org.jdbi.v3.sqlobject.config.RegisterBeanMapper;
+import org.jdbi.v3.sqlobject.customizer.Bind;
+import org.jdbi.v3.sqlobject.customizer.BindBean;
+import org.jdbi.v3.sqlobject.statement.GetGeneratedKeys;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
+import org.jdbi.v3.sqlobject.statement.SqlUpdate;
+import telraam.database.models.PositionSource;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface PositionSourceDAO extends DAO<PositionSource> {
+    @Override
+    @SqlQuery("SELECT * FROM position_source")
+    @RegisterBeanMapper(PositionSource.class)
+    List<PositionSource> getAll();
+
+    @SqlUpdate("INSERT INTO position_source (name) VALUES (:name)")
+    @GetGeneratedKeys({"id"})
+    int insert(@BindBean PositionSource positionSource);
+
+    @SqlQuery("SELECT * FROM position_source WHERE name = :name")
+    @RegisterBeanMapper(PositionSource.class)
+    Optional<PositionSource> getByName(@Bind("name") String name);
+}

src/main/java/telraam/database/models/PositionSource.java

@@ -0,0 +1,17 @@
+package telraam.database.models;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class PositionSource {
+  private Integer id;
+  private String name;
+
+  public PositionSource(String name) {
+    this.name = name;
+  }
+}

src/main/java/telraam/logic/positioner/PositionSender.java

@@ -4,16 +4,22 @@
 import telraam.websocket.WebSocketMessageSingleton;
 
 import java.util.List;
+import java.util.Map;
 
 public class PositionSender {
     private final WebSocketMessage<List<Position>> message = new WebSocketMessage<>();
+    private final String name;
 
-    public PositionSender() {
+    public PositionSender(String name) {
         this.message.setTopic("position");
+        this.name = name;
     }
 
     public void send(List<Position> positions) {
-        this.message.setData(positions);
+        Map<String, Object> data = Map.of(
+                "positioner", this.name,
+                "positions", positions
+        );
         WebSocketMessageSingleton.getInstance().sendToAll(this.message);
     }
 

src/main/java/telraam/logic/positioner/nostradamus/Nostradamus.java

@@ -2,12 +2,10 @@
 
 import org.jdbi.v3.core.Jdbi;
 import telraam.database.daos.BatonSwitchoverDAO;
+import telraam.database.daos.PositionSourceDAO;
 import telraam.database.daos.StationDAO;
 import telraam.database.daos.TeamDAO;
-import telraam.database.models.BatonSwitchover;
-import telraam.database.models.Detection;
-import telraam.database.models.Station;
-import telraam.database.models.Team;
+import telraam.database.models.*;
 import telraam.logic.positioner.Position;
 import telraam.logic.positioner.PositionSender;
 import telraam.logic.positioner.Positioner;
@@ -20,6 +18,7 @@
 
 public class Nostradamus implements Positioner {
     private static final Logger logger = Logger.getLogger(Nostradamus.class.getName());
+    private final String SOURCE_NAME = "nostradamus";
     private final int INTERVAL_CALCULATE_MS = 500; // How often to handle new detections (in milliseconds)
     private final int INTERVAL_FETCH_MS = 10000; // Interval between fetching baton switchovers (in milliseconds)
     private final int INTERVAL_DETECTIONS_MS = 3000; // Amount of milliseconds to group detections by
@@ -38,6 +37,12 @@ public class Nostradamus implements Positioner {
 
     public Nostradamus(Jdbi jdbi) {
         this.jdbi = jdbi;
+
+        PositionSourceDAO positionSourceDAO = jdbi.onDemand(PositionSourceDAO.class);
+        if (positionSourceDAO.getByName(SOURCE_NAME).isEmpty()) {
+            positionSourceDAO.insert(new PositionSource(SOURCE_NAME));
+        }
+
         this.newDetections = new ArrayList<>();
         this.detectionLock = new ReentrantLock();
         this.dataLock = new ReentrantLock();
@@ -46,7 +51,7 @@ public Nostradamus(Jdbi jdbi) {
         this.batonToTeam = new HashMap<>();
         this.teamData = getTeamData();
 
-        this.positionSender = new PositionSender();
+        this.positionSender = new PositionSender(SOURCE_NAME);
 
         new Thread(this::fetch).start();
         new Thread(this::calculatePosition).start();

src/main/resources/db/migration/V17__Add_position_source.sql

@@ -0,0 +1,6 @@
+create table position_source
+(
+    id serial not null
+        constraint position_source_pk primary key,
+    name varchar(255) not null unique
+);