Skip to content

MINOR: Change DISPLAY_UNITS to use readENV's default value and added… #5708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sulkaharo merged 1 commit into from
Jul 12, 2020
Merged

MINOR: Change DISPLAY_UNITS to use readENV's default value and added… #5708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,8 @@ var env = {
};

// Module to constrain all config and environment parsing to one spot.
// See the
// See README.md for info about all the supported ENV VARs
function config ( ) {
/*
* See README.md for info about all the supported ENV VARs
*/
env.DISPLAY_UNITS = readENV('DISPLAY_UNITS', 'mg/dl');

console.log('Units set to', env.DISPLAY_UNITS );

env.PORT = readENV('PORT', 1337);
env.HOSTNAME = readENV('HOSTNAME', null);
env.IMPORT_CONFIG = readENV('IMPORT_CONFIG', null);
Expand Down Expand Up @@ -82,12 +75,6 @@ function setAPISecret() {
var shasum = crypto.createHash('sha1');
shasum.update(readENV('API_SECRET'));
env.api_secret = shasum.digest('hex');

if (!readENV('TREATMENTS_AUTH', true)) {

}


}
}
}
Expand Down Expand Up @@ -125,9 +112,13 @@ function updateSettings() {
UNITS: 'DISPLAY_UNITS'
};

var envDefaultOverrides = {
DISPLAY_UNITS: 'mg/dl'
};

env.settings.eachSettingAsEnv(function settingFromEnv (name) {
var envName = envNameOverrides[name] || name;
return readENV(envName);
return readENV(envName, envDefaultOverrides[envName]);
});

//should always find extended settings last
Expand All @@ -146,11 +137,11 @@ function readENV(varName, defaultValue) {
|| process.env[varName]
|| process.env[varName.toLowerCase()];

if (varName == 'DISPLAY_UNITS' && value) {
if (value.toLowerCase().includes('mmol')) {
if (varName == 'DISPLAY_UNITS') {
if (value && value.toLowerCase().includes('mmol')) {
value = 'mmol';
} else {
value = 'mg/dl';
value = defaultValue;
}
}

Expand Down
86 changes: 85 additions & 1 deletion tests/env.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

require('should');

describe('env', function ( ) {
describe('env', function () {
it( 'show the right plugins', function () {
process.env.SHOW_PLUGINS = 'iob';
process.env.ENABLE = 'iob cob';
Expand Down Expand Up @@ -68,4 +68,88 @@ describe('env', function ( ) {
env.insecureUseHttp.should.be.false(); // not defined should be false
env.secureHstsHeader.should.be.true();
});

describe( 'DISPLAY_UNITS', function () {
const MMOL = 'mmol';
const MGDL = 'mg/dl';
describe ( 'mmol', function () {
it( 'mmol => mmol', function () {
process.env.DISPLAY_UNITS = MMOL;
var env = require( '../env' )();
env.settings.units.should.equal( MMOL );
delete process.env.DISPLAY_UNITS;
} );

it( 'mmol/l => mmol', function () {
process.env.DISPLAY_UNITS = 'mmol/l';
var env = require( '../env' )();
env.settings.units.should.equal( MMOL );
delete process.env.DISPLAY_UNITS;
} );

it( 'mmol/L => mmol', function () {
process.env.DISPLAY_UNITS = 'mmol/L';
var env = require( '../env' )();
env.settings.units.should.equal( MMOL );
delete process.env.DISPLAY_UNITS;
} );

it( 'MMOL => mmol', function () {
process.env.DISPLAY_UNITS = 'MMOL';
var env = require( '../env' )();
env.settings.units.should.equal( MMOL );
delete process.env.DISPLAY_UNITS;
} );
} );

describe ( 'mg/dl', function () {
it( 'mg/dl => mg/dl', function () {
process.env.DISPLAY_UNITS = MGDL;
var env = require( '../env' )();
env.settings.units.should.equal( MGDL );
delete process.env.DISPLAY_UNITS;
} );

it( 'mg/dL => mg/dl', function () {
process.env.DISPLAY_UNITS = 'mg/dL';
var env = require( '../env' )();
env.settings.units.should.equal( MGDL );
delete process.env.DISPLAY_UNITS;
} );

it( 'MG/DL => mg/dl', function () {
process.env.DISPLAY_UNITS = 'MG/DL';
var env = require( '../env' )();
env.settings.units.should.equal( MGDL );
delete process.env.DISPLAY_UNITS;
} );

it( 'mgdl => mg/dl', function () {
process.env.DISPLAY_UNITS = 'mgdl';
var env = require( '../env' )();
env.settings.units.should.equal( MGDL );
delete process.env.DISPLAY_UNITS;
} );
} );

describe ( 'default: mg/dl', function () {
it( '<random> => mg/dl', function () {
var random;
while (!random || random.toLowerCase() === MGDL)
random = [...Array(~~(Math.random()*20)+1)].map(i=>(~~(Math.random()*36)).toString(36)).join('');

process.env.DISPLAY_UNITS = random;
var env = require( '../env' )();
env.settings.units.should.equal( MGDL );
delete process.env.DISPLAY_UNITS;
} );

it( '<null> => mg/dl', function () {
delete process.env.DISPLAY_UNITS;
var env = require( '../env' )();
env.settings.units.should.equal( MGDL );
delete process.env.DISPLAY_UNITS;
} );
} );
} );
})