Make consistent event_ and statistics_ table names

Author: pklimai

README.md

@@ -217,3 +217,11 @@ Note: when POSTing or PUTing events, `software_version` and `storage_name` must
 EMS database tables beforehand. However, the `file_path` entry will be automatically created in 
 the `file_` table, if not there yet.
 
+
+## Statistics collection and display
+
+To see stats on the Web UI homepage, you must run statistics collection script (ideally, run
+it periodically from cron).
+
+The statistics collection script is part of this repository, see [README](ems-stat-collector/README.md)
+for details.

ems-stat-collector/src/orm/ems.py

@@ -28,7 +28,7 @@ class File(Base):
 
 
 class Event(Base):
-    __tablename__ = "event"
+    __tablename__ = "event_"
     file_guid: Mapped[int] = mapped_column(ForeignKey("file_.file_guid"), primary_key=True)
     file: Mapped[File] = relationship()
     event_number: Mapped[int] = mapped_column(primary_key=True)
@@ -42,7 +42,7 @@ class Event(Base):
 
 
 class Statistics(Base):
-    __tablename__ = "statistics"
+    __tablename__ = "statistics_"
     id: Mapped[int] = mapped_column(primary_key=True)
     json_stats: Mapped[str]
     time_written: Mapped[datetime.datetime] = mapped_column(

ems.bmn-config.yaml

@@ -27,7 +27,7 @@ title: BM@N Event Metadata System
 pages:
   - name: BM@N Events
     api_url: /event_api/v1
-    db_table_name: event
+    db_table_name: event_
     default_limit_web: 100
     parameters:
       - name: track_number

src/jvmMain/kotlin/Application.kt

@@ -107,14 +107,14 @@ fun Application.main() {
             try {
                 connEMD = newEMDConnection(config, this@get.context, forStatsGetting = true)!!
                 connEMD.createStatement()
-                    .executeQuery("SELECT json_stats FROM statistics ORDER BY id DESC LIMIT 1")
+                    .executeQuery("SELECT json_stats FROM statistics_ ORDER BY id DESC LIMIT 1")
                     .let { resultSet ->
                         if (resultSet.next()) {
                             val r = resultSet.getString("json_stats")
                             call.response.header("Content-Type", "application/json")
                             call.respondText(r)
                         } else {
-                            call.respond(HttpStatusCode.NotFound, "No data in EMS statistics table")
+                            call.respond(HttpStatusCode.NotFound, "No data in EMS statistics_ table")
                         }
                     }
             } catch (err: Exception) {

testing/docker-ems-catalogue/schema.sql

@@ -71,7 +71,7 @@ create table test_event
     primary_vertex bool not null
 );
 
-CREATE TABLE statistics (
+CREATE TABLE statistics_ (
     id serial primary key,
     json_stats character varying NOT NULL,
     time_written time without time zone