Fixed problem acknowledging alerts when alerts had non-unique ID codes. (#92)

Author: kshetline

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.5.2
+
+* Fixed problem acknowledging alerts when alerts had non-unique ID codes.
+
 ## 3.5.1-do
 
 * Documentation-only update: no code changes or bug fixes, just more clarity on the installation process.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock",
-  "version": "3.5.1-do",
+  "version": "3.5.2",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "scripts": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock-sass",
-  "version": "3.5.1-do",
+  "version": "3.5.2",
   "description": "SASS builder for aw-clock",
   "keywords": [
     "sass"

sass/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock-server",
-  "version": "3.5.1-do",
+  "version": "3.5.2",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "private": true,

sass/package.json

@@ -1,7 +1,7 @@
 import { Request, Response } from 'express';
 import { acos, cos_deg, PI, sin_deg } from '@tubular/math';
 import { ErrorMode, monitorProcess, spawn } from './process-util';
-import { ForecastData } from './shared-types';
+import { Alert, ForecastData } from './shared-types';
 import { isNumber, isString } from '@tubular/util';
 import compareVersions, { CompareOperator } from 'compare-versions';
 
@@ -227,6 +227,12 @@ export function checksum53(s: string, seed = 0): string {
   return (4294967296 * (2097151 & h2) + (h1 >>> 0)).toString(16).toUpperCase().padStart(14, '0');
 }
 
+export function setAlertId(alert: Alert): Alert {
+  alert.id = checksum53(`${alert.title}\t${alert.description}\t${alert.severity}`);
+
+  return alert;
+}
+
 export function safeCompareVersions(firstVersion: string, secondVersion: string, defValue?: number): number;
 export function safeCompareVersions(firstVersion: string, secondVersion: string, operator?: CompareOperator, defValue?: boolean): boolean;
 export function safeCompareVersions(firstVersion: string, secondVersion: string,

server/package-lock.json

@@ -87,7 +87,7 @@ export const AlertKeys = ['description', 'expires', 'id', 'severity', 'title', '
 export interface Alert {
   description: string;
   expires: number;    // See CommonConditions
-  id: string;
+  id?: string;
   severity: 'info' | 'advisory' | 'watch' | 'warning';
   time: number;       // See CommonConditions
   title: string;

server/package.json

@@ -6,7 +6,7 @@ import {
   Alert, CommonConditions, CommonConditionsKeys, CurrentConditions, CurrentConditionsKeys, DailyConditions, DailyConditionsKeys,
   DailySummaryConditions, ForecastData, ForecastDataKeys, HourlyConditions, PressureTrend
 } from './shared-types';
-import { alertCleanUp, checkForecastIntegrity, checksum53, filterError, hpaToInHg } from './awcs-util';
+import { alertCleanUp, checkForecastIntegrity, filterError, hpaToInHg, setAlertId } from './awcs-util';
 import { clone, isNumber, push } from '@tubular/util';
 import { floor } from '@tubular/math';
 
@@ -304,10 +304,9 @@ function convertAlerts(vcAlerts: VCAlert[]): Alert[] {
 
     alert.title = vcAlert.headline;
     alert.description = alertCleanUp(vcAlert.description);
-    alert.id = checksum53(vcAlert.id);
     alert.time = nullIfError(floor(new Date(vcAlert.onset).getTime() / 1000));
     alert.expires = nullIfError(floor(new Date(vcAlert.ends).getTime() / 1000));
 
-    return alert;
+    return setAlertId(alert);
   });
 }