From 7dafb7e747430977ea277d446698cccb93d54905 Mon Sep 17 00:00:00 2001
From: Robert Richter <robertrichter87@web.de>
Date: Tue, 16 Jun 2020 23:31:01 +0200
Subject: [PATCH] update Di 16. Jun 23:31:01 CEST 2020

---
 server/broker.js  | 31 +++++++++++++++++++++----------
 server/sql_cfg.js |  3 ++-
 server/sql_qry.js |  4 ++--
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/server/broker.js b/server/broker.js
index 9c56359..9b5de97 100755
--- a/server/broker.js
+++ b/server/broker.js
@@ -2,6 +2,10 @@ module.exports = function (app_cfg, sql, uuidv4) {
 
   // Module laden
   const twit = require('twit');
+  const {
+    v5: uuidv5
+  } = require('uuid');
+  const custom_namespace = 'fadad35a-b9dc-42b5-9484-7459ae2a6445';
 
   function alert_vmtl_list(list_data, callback) {
 
@@ -19,6 +23,13 @@ module.exports = function (app_cfg, sql, uuidv4) {
           console.log('Twitter-Account-Daten: ' + JSON.stringify(vmtl_data));
         };
 
+        // Daten in kurzen UUID-Strings umwandeln
+        //FIXME 
+        var uuid_vmlt_history = uuidv5(vmtl_data.uuid + vmtl_data.einsatzart + vmtl_data.stichwort + vmtl_data.name_wache + vmtl_data.list, custom_namespace);
+        // Prüfen ob zuletzt bereits eine Nachricht gesendet wurde (Doppelalarmierung vermeiden)
+
+
+
         if (vmtl_data) {
 
           var T = new twit({
@@ -52,8 +63,8 @@ module.exports = function (app_cfg, sql, uuidv4) {
                   var arrayLength = members.users.length;
                   for (var i = 0; i < arrayLength; i++) {
                     // Mitteilungstext festelgen
-                    var tw_text = String.fromCodePoint(0x1F4DF) + ' ' + String.fromCodePoint(0x1F6A8) + String.fromCodePoint(0x0A) + 
-                      'Einsatz für ' + vmtl_data.name_wache + ' ' + String.fromCodePoint(0x27A1) + ' ' + vmtl_data.einsatzart + ': ' + vmtl_data.stichwort + String.fromCodePoint(0x0A) + 
+                    var tw_text = String.fromCodePoint(0x1F4DF) + ' ' + String.fromCodePoint(0x1F6A8) + String.fromCodePoint(0x0A) +
+                      'Einsatz für ' + vmtl_data.name_wache + ' ' + String.fromCodePoint(0x27A1) + ' ' + vmtl_data.einsatzart + ', ' + vmtl_data.stichwort + String.fromCodePoint(0x0A) +
                       'jetzt Rückmeldung senden: ' + app_cfg.public.url + '/rmld/' + vmtl_data.uuid + '/' + uuidv4();
                     // Parameter der Mitteilung
                     var msg_params = {
@@ -95,14 +106,14 @@ module.exports = function (app_cfg, sql, uuidv4) {
         };
 
       });
-    } else {
-      // andere Listen/Gruppen/Schnittstellen koennten hier noch abgefragt werden
-      callback && callback(null);
-    };
-
+  } else {
+    // andere Listen/Gruppen/Schnittstellen koennten hier noch abgefragt werden
+    callback && callback(null);
   };
 
-  return {
-    alert_vmtl_list: alert_vmtl_list
-  };
+};
+
+return {
+  alert_vmtl_list: alert_vmtl_list
+};
 };
\ No newline at end of file
diff --git a/server/sql_cfg.js b/server/sql_cfg.js
index 4d4bc84..08495d6 100644
--- a/server/sql_cfg.js
+++ b/server/sql_cfg.js
@@ -132,7 +132,8 @@ module.exports = function (fs, bcrypt, app_cfg) {
         waip_wachenname TEXT,
         vmtl_typ TEXT,
         vmtl_account_name TEXT,
-        vmtl_account_group TEXT)`);
+        vmtl_account_group TEXT,
+        vmtl_history TEXT)`);
       // Twitter-Account-Tabelle erstellen
       db.run(`CREATE TABLE waip_tw_accounts (
         id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
diff --git a/server/sql_qry.js b/server/sql_qry.js
index 81b2d9d..402cefd 100755
--- a/server/sql_qry.js
+++ b/server/sql_qry.js
@@ -120,7 +120,7 @@ module.exports = function (db, app_cfg) {
 
   function db_einsatz_check_history(waip_id, einsatzdaten, socket_id, callback) {
     // Prüfen ob Wachalarm bereits in dieser Form an diesen Socket gesendet wurde (Doppelalarmierung vermeiden)
-    const custom_namespace = '59cc72ec-4ff5-499d-81e2-ec49c1d01252'
+    const custom_namespace = '59cc72ec-4ff5-499d-81e2-ec49c1d01252';
     // neues Object mit Einsatzdaten erstellen
     var missiondata = Object.assign({}, einsatzdaten);
     // Einsatzdaten in kuzre UUID-Strings umwandeln, diese UUIDs werden dann verglichen
@@ -336,7 +336,7 @@ module.exports = function (db, app_cfg) {
     // Einsatz loeschen
     db.run(`DELETE FROM waip_einsaetze WHERE id = ?`, [id]);
     // History loeschen
-    db.run(`DELETE FROM waip_history WHERE waip_id = ?`, [id]);
+    db.run(`DELETE FROM waip_history WHERE waip_uuid = (select uuid from waip_einsaetze where id = ?)`, [id]);
   };
 
   function db_wache_get_all(callback) {