Fix DB attributes

README.md

@@ -1,6 +1,6 @@
 
 
-docker compose build telemetry
+docker compose build telemetry-prod
 
 docker save senslog/telemetry > senslog_telemetry.tar
 

sql/init.sql

@@ -68,7 +68,7 @@ CREATE TABLE maplog.obs_telemetry (
     time_stamp TIMESTAMP WITH TIME ZONE NOT NULL,
     unit_id BIGINT NOT NULL,
     observed_values jsonb NOT NULL,
-    the_geom geometry NOT NULL,
+    the_geom public.geometry NOT NULL,
     speed INTEGER NOT NULL,
     time_received TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL
 );
@@ -134,6 +134,7 @@ ALTER SEQUENCE maplog.phenomenon_id_seq OWNED BY maplog.phenomenon.id;
 
 ALTER TABLE ONLY maplog.phenomenon ALTER COLUMN id SET DEFAULT nextval('maplog.phenomenon_id_seq'::regclass);
 
+INSERT INTO maplog.phenomenon(id, name, uom, uom_link) VALUES (0, 'GENERAL', 'UOM', null);
 
 CREATE TABLE maplog.sensor (
     sensor_id BIGINT NOT NULL PRIMARY KEY,
@@ -160,6 +161,7 @@ CREATE TABLE maplog.system_user (
 );
 ALTER TABLE maplog.system_user OWNER TO senslog;
 
+INSERT INTO maplog.system_user(user_id, name) VALUES (0, 'admin');
 
 CREATE TABLE maplog.unit (
     unit_id BIGINT NOT NULL PRIMARY KEY,
@@ -264,7 +266,7 @@ ALTER TABLE ONLY maplog.unit_to_sensor ADD CONSTRAINT uts_unitid_fk FOREIGN KEY
 
 ALTER TABLE ONLY maplog.driver_to_action ADD CONSTRAINT dta_unitid_fk FOREIGN KEY (unit_id) REFERENCES maplog.unit(unit_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
-ALTER TABLE ONLY maplog.driver_to_action ADD CONSTRAINT dta_driverid_fk FOREIGN KEY (driver_id) REFERENCES maplog.driver() ON UPDATE CASCADE ON DELETE CASCADE;
+ALTER TABLE ONLY maplog.driver_to_action ADD CONSTRAINT dta_driverid_fk FOREIGN KEY (driver_id) REFERENCES maplog.driver(driver_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 ALTER TABLE ONLY maplog.driver_to_action ADD CONSTRAINT dta_actionid_fk FOREIGN KEY (action_id) REFERENCES maplog.action(action_id) ON UPDATE CASCADE ON DELETE CASCADE;
 

src/main/java/cz/senslog/telemetry/database/repository/MapLogRepository.java

@@ -142,7 +142,7 @@ public class MapLogRepository implements SensLogRepository {
     private static final Function<Row, Sensor> ROW_TO_SENSOR = (row) -> Sensor.of(
             row.getLong("sensor_id"),
             row.getString("name"),
-            row.getString("sensor_type"),
+            row.getString("type"),
             row.getInteger("io_id"),
             Phenomenon.of(
                     row.getInteger("phenomenon_id"),
@@ -153,7 +153,7 @@ public class MapLogRepository implements SensLogRepository {
 
     @Override
     public Future<Sensor> findSensorById(long sensorId) {
-        return client.preparedQuery("SELECT s.sensor_id, s.name, s.sensor_type, s.io_id, s.description, p.id AS phenomenon_id, p.name AS phenomenon_name, p.uom, p.uom_link " +
+        return client.preparedQuery("SELECT s.sensor_id, s.name, s.type, s.io_id, s.description, p.id AS phenomenon_id, p.name AS phenomenon_name, p.uom, p.uom_link " +
                         "FROM maplog.sensor AS s " +
                         "JOIN maplog.phenomenon p on p.id = s.phenomenon_id " +
                         "WHERE s.sensor_id = $1")
@@ -167,7 +167,7 @@ public class MapLogRepository implements SensLogRepository {
     private static final Function<Row, Sensor> ROW_TO_BASIC_SENSOR = (row) -> Sensor.of(
             row.getLong("sensor_id"),
             row.getString("name"),
-            row.getString("sensor_type"),
+            row.getString("type"),
             row.getInteger("io_id"),
             Phenomenon.of(row.getLong("phenomenon_id"), null),
             row.getString("description")
@@ -175,7 +175,7 @@ public class MapLogRepository implements SensLogRepository {
 
     @Override
     public Future<Sensor> findSensorByIOAndUnitId(int ioID, long unitId) {
-        return client.preparedQuery("SELECT s.sensor_id, s.name, s.sensor_type, s.io_id, s.phenomenon_id, s.description " +
+        return client.preparedQuery("SELECT s.sensor_id, s.name, s.type, s.io_id, s.phenomenon_id, s.description " +
                         "FROM maplog.sensor AS s " +
                         "JOIN maplog.unit_to_sensor uts ON s.sensor_id = uts.sensor_id " +
                         "WHERE s.io_id = $1 AND uts.unit_id = $2")
@@ -188,13 +188,13 @@ public class MapLogRepository implements SensLogRepository {
 
     @Override
     public Future<List<Sensor>> allSensors() {
-        return client.query("SELECT sensor_id, name, sensor_type, io_id, phenomenon_id, description FROM maplog.sensor ORDER BY sensor_id")
+        return client.query("SELECT sensor_id, name, type, io_id, phenomenon_id, description FROM maplog.sensor ORDER BY sensor_id")
                 .execute()
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map((row) -> Sensor.of(
                                 row.getLong("sensor_id"),
                                 row.getString("name"),
-                                row.getString("sensor_type"),
+                                row.getString("type"),
                                 row.getInteger("io_id"),
                                 Phenomenon.of(row.getLong("phenomenon_id"), null),
                                 row.getString("description")
@@ -204,7 +204,7 @@ public class MapLogRepository implements SensLogRepository {
 
     @Override
     public Future<List<Sensor>> findSensorsByUnitId(long unitId) {
-        return client.preparedQuery("SELECT s.sensor_id, s.name, s.sensor_type " +
+        return client.preparedQuery("SELECT s.sensor_id, s.name, s.type " +
                         "FROM maplog.unit_to_sensor AS uts " +
                         "JOIN maplog.sensor s on s.sensor_id = uts.sensor_id " +
                         "WHERE UTS.unit_id = $1 ORDER BY s.sensor_id")
@@ -213,27 +213,27 @@ public class MapLogRepository implements SensLogRepository {
                         .map((row) -> Sensor.of(
                                 row.getLong("sensor_id"),
                                 row.getString("name"),
-                                row.getString("sensor_type")
+                                row.getString("type")
                         )).collect(Collectors.toList())
                 );
     }
 
     @Override
     public Future<List<Sensor>> findSensorsByPhenomenonId(long phenomenonId) {
-        return client.preparedQuery("SELECT sensor_id, name, sensor_type FROM maplog.sensor WHERE phenomenon_id = $1 ORDER BY sensor_id")
+        return client.preparedQuery("SELECT sensor_id, name, type FROM maplog.sensor WHERE phenomenon_id = $1 ORDER BY sensor_id")
                 .execute(Tuple.of(phenomenonId))
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map((row) -> Sensor.of(
                                 row.getLong("sensor_id"),
                                 row.getString("name"),
-                                row.getString("sensor_type")
+                                row.getString("type")
                         )).collect(Collectors.toList())
                 );
     }
 
     @Override
     public Future<List<Sensor>> findSensorsByCampaignIdAndUnitId(long campaignId, long unitId) {
-        return client.preparedQuery("SELECT s.sensor_id, s.name, s.sensor_type " +
+        return client.preparedQuery("SELECT s.sensor_id, s.name, s.type " +
                         "FROM maplog.unit_to_sensor AS uts " +
                         "JOIN maplog.sensor s on s.sensor_id = uts.sensor_id " +
                         "JOIN maplog.unit_to_campaign utc ON utc.unit_id = uts.unit_id " +
@@ -243,14 +243,14 @@ public class MapLogRepository implements SensLogRepository {
                         .map((row) -> Sensor.of(
                                 row.getLong("sensor_id"),
                                 row.getString("name"),
-                                row.getString("sensor_type")
+                                row.getString("type")
                         )).collect(Collectors.toList())
                 );
     }
 
     @Override
     public Future<Sensor> findSensorByCampaignIdAndUnitId(long campaignId, long unitId, long sensorId) {
-        return client.preparedQuery("SELECT s.sensor_id, s.name, s.sensor_type, s.io_id, s.description, p.id AS phenomenon_id, p.name AS phenomenon_name, p.uom, p.uom_link " +
+        return client.preparedQuery("SELECT s.sensor_id, s.name, s.type, s.io_id, s.description, p.id AS phenomenon_id, p.name AS phenomenon_name, p.uom, p.uom_link " +
                         "FROM maplog.sensor AS s " +
                         "JOIN maplog.phenomenon AS p ON p.id = s.phenomenon_id " +
                         "JOIN maplog.unit_to_sensor AS uts ON s.sensor_id = uts.sensor_id " +