From 87b6fff8218044b50dc216d2d5e3f9a55855e56e Mon Sep 17 00:00:00 2001
From: Caleb <inventor96@users.noreply.github.com>
Date: Tue, 20 Oct 2020 03:23:14 -0600
Subject: [PATCH] Corrected setup of `dbsize` for virtual assistants (#6270)

* Corrected db size config for virtual assistants

* Language fix, improvements, added dbsize to virtAsst config

* Using env

* Added logging

* Debug logging

* Different logging

* More troubleshooting

* Another try

* Reverted stuff, added dbsize to server defaults

* Fixed test

* Fixed another test
---
 docs/plugins/alexa-templates/en-us.json      |  10 ++++++++++
 docs/plugins/google-home-templates/en-us.zip | Bin 6367 -> 6549 bytes
 lib/language.js                              |   2 +-
 lib/plugins/dbsize.js                        |  11 +++--------
 lib/plugins/index.js                         |   1 +
 lib/plugins/virtAsstBase.js                  |   2 +-
 tests/dbsize.test.js                         |  11 +++--------
 7 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/docs/plugins/alexa-templates/en-us.json b/docs/plugins/alexa-templates/en-us.json
index 79cc1baa977d..e890172dcbab 100644
--- a/docs/plugins/alexa-templates/en-us.json
+++ b/docs/plugins/alexa-templates/en-us.json
@@ -233,6 +233,16 @@
                             "name": {
                                 "value": "cgm mode"
                             }
+                        },
+                        {
+                            "name": {
+                                "value": "db size",
+                                "synonyms": [
+                                    "database size",
+                                    "data size",
+                                    "file size"
+                                ]
+                            }
                         }
                     ]
                 }
diff --git a/docs/plugins/google-home-templates/en-us.zip b/docs/plugins/google-home-templates/en-us.zip
index d8ada2a834a29cb73802fb364902d86034ca3421..551e51307f05f5ce4ee9541928ff77bcf6516821 100644
GIT binary patch
literal 6549
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%0DtGdFx
zF1}^K6FvBuEFuyS!nH|!)9Sr4iT@loEn_vsKR<cXwz{%{uR{xdd2I~;{@hK6=*rZ(
zjxP8x{yU57cZ8e%!IhJA9Wn5O<8KJR`%1rq-8^$%Sq|4xgZBR!5WgedJnUSZRj*?h
zzB2x9Y5dK}^>@IV8|T#-={gGGFa8(cACv9phVnbc&4uS`t+@`zTh|!B^!&FFH;3(?
zAq4TRA%5xPZy|1Wn5(IL9T)i55PxLy7p?uC)lC^+iS;@Z;ne!|W`1S$KjCf)<<D?}
d@PvQC{mSrf;85X|K|sKPe;&iReCKDe{sS0E@GSrU

literal 6367
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

diff --git a/lib/language.js b/lib/language.js
index ac9b0a022184..64098826fdea 100644
--- a/lib/language.js
+++ b/lib/language.js
@@ -15133,7 +15133,7 @@ function init() {
       ,nl: 'Datagrootte'
     },
     'virtAsstDatabaseSize': {
-      en: '%1 MiB that is %2% of available database space'
+      en: '%1 MiB. That is %2% of available database space.'
       ,pl: '%1 MiB co stanowi %2% przestrzeni dostępnej dla bazy danych'
       ,nl: '%1 MiB dat is %2% van de beschikbaare database ruimte'
     },
diff --git a/lib/plugins/dbsize.js b/lib/plugins/dbsize.js
index c76e36cb9e85..1b6b43da8eda 100644
--- a/lib/plugins/dbsize.js
+++ b/lib/plugins/dbsize.js
@@ -119,9 +119,9 @@ function init (ctx) {
 
   function virtAsstDatabaseSizeHandler (next, slots, sbx) {
     var display = _.get(sbx, 'properties.dbsize.display');
-    var dataSize = _.get(sbx, 'properties.dbsize.details.dataSize');
-    var dataPercentage = _.get(sbx, 'properties.dbsize.dataPercentage');
     if (display) {
+      var dataSize = _.get(sbx, 'properties.dbsize.details.dataSize');
+      var dataPercentage = _.get(sbx, 'properties.dbsize.dataPercentage');
       var response = translate('virtAsstDatabaseSize', {
         params: [
           dataSize
@@ -137,13 +137,8 @@ function init (ctx) {
   dbsize.virtAsst = {
     intentHandlers: [
       {
-        // for backwards compatibility
-        intent: 'DatabaseSize'
-        , intentHandler: virtAsstDatabaseSizeHandler
-      }
-      , {
         intent: 'MetricNow'
-        , metrics: ['database size', 'file size', 'db size', 'data size']
+        , metrics: ['db size']
         , intentHandler: virtAsstDatabaseSizeHandler
       }
     ]
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index 5a6cb2822da3..77a87bcd94db 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -74,6 +74,7 @@ function init (ctx) {
     , require('./treatmentnotify')(ctx)
     , require('./timeago')(ctx)
     , require('./basalprofile')(ctx)
+    , require('./dbsize')(ctx)
   ];
 
   plugins.registerServerDefaults = function registerServerDefaults () {
diff --git a/lib/plugins/virtAsstBase.js b/lib/plugins/virtAsstBase.js
index e0d103672a2e..781f56969cf1 100644
--- a/lib/plugins/virtAsstBase.js
+++ b/lib/plugins/virtAsstBase.js
@@ -81,7 +81,7 @@ function init(env, ctx) {
   };
 
   virtAsstBase.setupVirtAsstHandlers = function (configuredPlugin) {
-    ctx.plugins.eachEnabledPlugin(function (plugin){
+    ctx.plugins.eachEnabledPlugin(function (plugin) {
       if (plugin.virtAsst) {
         if (plugin.virtAsst.intentHandlers) {
           console.log('Plugin "' + plugin.name + '" supports Virtual Assistants');
diff --git a/tests/dbsize.test.js b/tests/dbsize.test.js
index 0a66bb3ad6d7..ce95f8652c05 100644
--- a/tests/dbsize.test.js
+++ b/tests/dbsize.test.js
@@ -300,18 +300,13 @@ describe('Database Size', function() {
     var dbsize = require('../lib/plugins/dbsize')(ctx);
     dbsize.setProperties(sbx);
 
-    dbsize.virtAsst.intentHandlers.length.should.equal(2);
+    dbsize.virtAsst.intentHandlers.length.should.equal(1);
 
     dbsize.virtAsst.intentHandlers[0].intentHandler(function next (title, response) {
       title.should.equal('Database file size');
-      response.should.equal('450 MiB that is 90% of available database space');
+      response.should.equal('450 MiB. That is 90% of available database space.');
 
-      dbsize.virtAsst.intentHandlers[1].intentHandler(function next (title, response) {
-        title.should.equal('Database file size');
-        response.should.equal('450 MiB that is 90% of available database space');
-
-        done();
-      }, [], sbx);
+      done();
 
     }, [], sbx);