From 81dc9eeb2cae09bd70e09ec03e5e58cd61356e9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20S=C3=B8by?= <masj@kb.dk>
Date: Thu, 16 Jun 2022 14:27:49 +0200
Subject: [PATCH 1/2] First commit adding File ID as a column in the Alarm
 Service WebGUI. Not tested yet.

---
 .../alarm/alarmservice/WebAlarm.java          | 12 ++++++++++-
 .../src/main/webapp/alarm-service.html        | 21 +++++++++++--------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java
index ee8cc7a82..9eea6eb63 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java
@@ -39,16 +39,17 @@ public class WebAlarm {
     private String alarmRaiser;
     private String alarmText;
     private String collectionID;
+    private String fileID;
 
     public WebAlarm() {}
 
     public WebAlarm(Alarm alarm) {
         collectionID = alarm.getCollectionID() == null ? "" : alarm.getCollectionID();
+        fileID = alarm.getFileID() == null ? "" : alarm.getFileID();
         origDateTime = TimeUtils.shortDate(CalendarUtils.convertFromXMLGregorianCalendar(alarm.getOrigDateTime()));
         alarmRaiser = alarm.getAlarmRaiser();
         alarmCode = alarm.getAlarmCode();
         alarmText = alarm.getAlarmText();
-
     }
 
     @XmlElement(name = "origDateTime")
@@ -95,4 +96,13 @@ public String getCollectionID() {
     public void setCollectionID(String collectionID) {
         this.collectionID = collectionID;
     }
+
+    @XmlElement(name = "fileID")
+    public String getFileID() {
+        return fileID;
+    }
+
+    public void setFileID(String fileID) {
+        this.fileID = fileID;
+    }
 }
\ No newline at end of file
diff --git a/bitrepository-webclient/src/main/webapp/alarm-service.html b/bitrepository-webclient/src/main/webapp/alarm-service.html
index fb4728a5f..0a8b76c87 100644
--- a/bitrepository-webclient/src/main/webapp/alarm-service.html
+++ b/bitrepository-webclient/src/main/webapp/alarm-service.html
@@ -104,6 +104,7 @@
                 <th>Date</th>
                 <th>Component</th>
                 <th>Collection</th>
+                <th>FileID</th>
                 <th>Alarm code</th>
                 <th>Description</th>
               </tr>
@@ -122,9 +123,8 @@
   <script src="CollectionNameMapper.js"></script>
 
   <script>
-
     var nameMapper;
-    var auto_getalarms;
+    var auto_get_alarms;
     var alarmServiceUrl;
 
     function clearElement(element) {
@@ -153,12 +153,15 @@
          var htmlTableBody = "";
          if(j != null) {
            for (var i = 0; i < j.length; i++) {
-            htmlTableBody += "<tr><td>" + j[i].origDateTime +
-                             "</td><td>" + j[i].alarmRaiser +
-                             "</td><td>" + nameMapper.getName(j[i].collectionID) +
-                             "</td> <td>" + j[i].alarmCode +
-                             "</td> <td>" + nl2br(j[i].alarmText) +
-                             "</td></tr>";
+            htmlTableBody +=
+              `<tr>
+                <td>${j[i].origDateTime}</td>
+                <td>${j[i].alarmRaiser}</td>
+                <td>${nameMapper.getName(j[i].collectionID)}</td>
+                <td>${j[i].fileID}</td>
+                <td>${j[i].alarmCode}</td>
+                <td>${nl2br(j[i].alarmText)}</td>
+              </tr>`;
           }
         }
         $("#alarms-table-body").html(htmlTableBody);
@@ -176,7 +179,7 @@
             $("#collectionIDFilter").append('<option value="' + colls[i] + '">' + nameMapper.getName(colls[i]) + '</option>');
           }
           updateAlarms();
-          auto_getalarms = setInterval(function() {updateAlarms();}, 2500);
+          auto_get_alarms = setInterval(function() {updateAlarms();}, 2500);
         });  
       });
     }

From 2de739fd2e36581bb1e258b862732b69a744e78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20S=C3=B8by?= <masj@kb.dk>
Date: Mon, 20 Jun 2022 14:01:32 +0200
Subject: [PATCH 2/2] Should now show FileID in Alarms column.

---
 .../alarm/alarmservice/WebAlarm.java             |  2 --
 .../alarm/store/AlarmDatabaseTest.java           | 16 ++++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java
index 9eea6eb63..a05494f2c 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java
@@ -41,8 +41,6 @@ public class WebAlarm {
     private String collectionID;
     private String fileID;
 
-    public WebAlarm() {}
-
     public WebAlarm(Alarm alarm) {
         collectionID = alarm.getCollectionID() == null ? "" : alarm.getCollectionID();
         fileID = alarm.getFileID() == null ? "" : alarm.getFileID();
diff --git a/bitrepository-alarm-service/src/test/java/org/bitrepository/alarm/store/AlarmDatabaseTest.java b/bitrepository-alarm-service/src/test/java/org/bitrepository/alarm/store/AlarmDatabaseTest.java
index a6d620149..bdcbc0417 100644
--- a/bitrepository-alarm-service/src/test/java/org/bitrepository/alarm/store/AlarmDatabaseTest.java
+++ b/bitrepository-alarm-service/src/test/java/org/bitrepository/alarm/store/AlarmDatabaseTest.java
@@ -65,7 +65,7 @@ public class AlarmDatabaseTest extends ExtendedTestCase {
     File dbDir = null;
 
     @BeforeClass (alwaysRun = true)
-    public void setup() throws Exception {
+    public void setup() {
         settings = TestSettingsProvider.reloadSettings("AlarmDatabaseUnderTest");
 
         DerbyDatabaseDestroyer.deleteDatabase(
@@ -76,15 +76,15 @@ public void setup() throws Exception {
     }
     
     @AfterMethod (alwaysRun = true)
-    public void cleanupDatabase() throws Exception {
+    public void cleanupDatabase() {
         // TODO
         DBConnector connector = new DBConnector(settings.getReferenceSettings().getAlarmServiceSettings().getAlarmServiceDatabase());
-        DatabaseUtils.executeStatement(connector, "DELETE FROM " + ALARM_TABLE, new Object[0]);
-        DatabaseUtils.executeStatement(connector, "DELETE FROM " + COMPONENT_TABLE, new Object[0]);
+        DatabaseUtils.executeStatement(connector, "DELETE FROM " + ALARM_TABLE);
+        DatabaseUtils.executeStatement(connector, "DELETE FROM " + COMPONENT_TABLE);
     }
 
     @AfterClass (alwaysRun = true)
-    public void shutdown() throws Exception {
+    public void shutdown()  {
         addStep("Cleanup after test.", "Should remove directory with test material.");
         if(dbDir != null) {
             FileUtils.delete(dbDir);
@@ -92,13 +92,13 @@ public void shutdown() throws Exception {
     }
 
     @Test(groups = {"regressiontest", "databasetest"})
-    public void AlarmDatabaseExtractionTest() throws Exception {
+    public void AlarmDatabaseExtractionTest() {
         addDescription("Testing the connection to the alarm service database especially with regards to "
                 + "extracting the data from it.");
         addStep("Setup the variables and constants.", "Should be ok.");
         Date restrictionDate = new Date(123456789); // Sometime between epoch and now!
         
-        addStep("Adds the variables to the settings and instantaites the database cache", "Should be connected.");
+        addStep("Adds the variables to the settings and instantiates the database cache", "Should be connected.");
         AlarmDAOFactory alarmDAOFactory = new AlarmDAOFactory();
         AlarmServiceDAO database = alarmDAOFactory.getAlarmServiceDAOInstance(
                 settings.getReferenceSettings().getAlarmServiceSettings().getAlarmServiceDatabase());
@@ -184,7 +184,7 @@ public void AlarmDatabaseExtractionTest() throws Exception {
     }
 
     @Test(groups = {"regressiontest", "databasetest"})
-    public void AlarmDatabaseLargeIngestionTest() throws Exception {
+    public void AlarmDatabaseLargeIngestionTest() {
         addDescription("Testing the ingestion of a large texts into the database");
         addStep("Setup and create alarm", "");
         AlarmDAOFactory alarmDAOFactory = new AlarmDAOFactory();