converted audience evaluator and decision service

fayyazarshad · fayyazarshad · commit aab986a85cba · 2020-04-10T13:07:47.000+05:00
diff --git a/packages/optimizely-sdk/lib/core/audience_evaluator/index.js b/packages/optimizely-sdk/lib/core/audience_evaluator/index.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016, 2018-2019 Optimizely
+ * Copyright 2016, 2018-2020 Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var conditionTreeEvaluator = require('../condition_tree_evaluator');
-var customAttributeConditionEvaluator = require('../custom_attribute_condition_evaluator');
-var enums = require('../../utils/enums');
-var fns = require('../../utils/fns');
-var sprintf = require('@optimizely/js-sdk-utils').sprintf;
-var logging = require('@optimizely/js-sdk-logging');
-var logger = logging.getLogger();
+import conditionTreeEvaluator from '../condition_tree_evaluator';
+import customAttributeConditionEvaluator from '../custom_attribute_condition_evaluator';
+import enums from '../../utils/enums';
+import fns from '../../utils/fns';
+import { sprintf } from '@optimizely/js-sdk-utils';
+import { getLogger } from '@optimizely/js-sdk-logging';
+var logger = getLogger();
 
 var ERROR_MESSAGES = enums.ERROR_MESSAGES;
 var LOG_LEVEL = enums.LOG_LEVEL;
@@ -108,4 +108,4 @@ AudienceEvaluator.prototype.evaluateConditionWithUserAttributes = function(userA
   return null;
 };
 
-module.exports = AudienceEvaluator;
+export default AudienceEvaluator;
diff --git a/packages/optimizely-sdk/lib/core/audience_evaluator/index.tests.js b/packages/optimizely-sdk/lib/core/audience_evaluator/index.tests.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016, 2018-2019 Optimizely
+ * Copyright 2016, 2018-2020 Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var AudienceEvaluator = require('./');
-var chai = require('chai');
-var conditionTreeEvaluator = require('../condition_tree_evaluator');
-var customAttributeConditionEvaluator = require('../custom_attribute_condition_evaluator');
-var sinon = require('sinon');
+import AudienceEvaluator from './index';
+import chai from 'chai';
+import conditionTreeEvaluator from '../condition_tree_evaluator';
+import customAttributeConditionEvaluator from '../custom_attribute_condition_evaluator';
+import sinon from 'sinon';
+import { getLogger } from '@optimizely/js-sdk-logging';
+
 var assert = chai.assert;
-var logging = require('@optimizely/js-sdk-logging');
-var mockLogger = logging.getLogger();
-var enums = require('../../utils/enums');
-var LOG_LEVEL = enums.LOG_LEVEL;
+var mockLogger = getLogger();
 
 var chromeUserAudience = {
   conditions: [
diff --git a/packages/optimizely-sdk/lib/core/decision_service/index.js b/packages/optimizely-sdk/lib/core/decision_service/index.js
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2017-2019, Optimizely, Inc. and contributors                   *
+ * Copyright 2017-2019, 2020 Optimizely, Inc. and contributors              *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -13,15 +13,13 @@
  * See the License for the specific language governing permissions and      *
  * limitations under the License.                                           *
  ***************************************************************************/
-
-var AudienceEvaluator = require('../audience_evaluator');
-var bucketer = require('../bucketer');
-var enums = require('../../utils/enums');
-var fns = require('../../utils/fns');
-var projectConfig = require('../project_config');
-var stringValidator = require('../../utils/string_value_validator');
-
-var sprintf = require('@optimizely/js-sdk-utils').sprintf;
+import AudienceEvaluator from '../audience_evaluator';
+import bucketer from '../bucketer';
+import enums from '../../utils/enums';
+import fns from '../../utils/fns';
+import projectConfig from '../project_config';
+import stringValidator from '../../utils/string_value_validator';
+import { sprintf } from'@optimizely/js-sdk-utils';
 
 var MODULE_NAME = 'DECISION_SERVICE';
 var ERROR_MESSAGES = enums.ERROR_MESSAGES;
@@ -718,15 +716,17 @@ DecisionService.prototype.setForcedVariation = function(configObj, experimentKey
   }
 };
 
-module.exports = {
-  /**
-   * Creates an instance of the DecisionService.
-   * @param  {Object} options               Configuration options
-   * @param  {Object} options.userProfileService
-   * @param  {Object} options.logger
-   * @return {Object} An instance of the DecisionService
-   */
-  createDecisionService: function(options) {
-    return new DecisionService(options);
-  },
-};
+/**
+ * Creates an instance of the DecisionService.
+ * @param  {Object} options               Configuration options
+ * @param  {Object} options.userProfileService
+ * @param  {Object} options.logger
+ * @return {Object} An instance of the DecisionService
+ */
+export var createDecisionService = function(options) {
+  return new DecisionService(options);
+}
+
+export default {
+  createDecisionService,
+}
diff --git a/packages/optimizely-sdk/lib/core/decision_service/index.tests.js b/packages/optimizely-sdk/lib/core/decision_service/index.tests.js
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2017-2020, Optimizely, Inc. and contributors                        *
+ * Copyright 2017-2019, 2020 Optimizely, Inc. and contributors              *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -13,25 +13,23 @@
  * See the License for the specific language governing permissions and      *
  * limitations under the License.                                           *
  ***************************************************************************/
-
-var Optimizely = require('../../optimizely').default;
-var eventBuilder = require('../../core/event_builder/index.js');
-var eventDispatcher = require('../../plugins/event_dispatcher/index.node');
-var errorHandler = require('../../plugins/error_handler');
-var bucketer = require('../bucketer');
-var DecisionService = require('./');
-var enums = require('../../utils/enums');
-var cloneDeep = require('lodash/cloneDeep');
-var logger = require('../../plugins/logger');
-var projectConfig = require('../project_config');
-var sprintf = require('@optimizely/js-sdk-utils').sprintf;
-var testData = require('../../tests/test_data').getTestProjectConfig();
-var testDataWithFeatures = require('../../tests/test_data').getTestProjectConfigWithFeatures();
-var jsonSchemaValidator = require('../../utils/json_schema_validator');
-var AudienceEvaluator = require('../audience_evaluator');
-
-var chai = require('chai');
-var sinon = require('sinon');
+import Optimizely from '../../optimizely';
+import eventBuilder from '../../core/event_builder/index.js';
+import eventDispatcher from '../../plugins/event_dispatcher/index.node';
+import errorHandler from '../../plugins/error_handler';
+import bucketer from '../bucketer';
+import DecisionService from './';
+import enums from '../../utils/enums';
+import cloneDeep from 'lodash/cloneDeep';
+import logger from '../../plugins/logger';
+import projectConfig from '../project_config';
+import { sprintf } from '@optimizely/js-sdk-utils';
+import { getTestProjectConfig, getTestProjectConfigWithFeatures } from '../../tests/test_data';
+import jsonSchemaValidator from '../../utils/json_schema_validator';
+import AudienceEvaluator from '../audience_evaluator';
+
+import chai from 'chai';
+import sinon from 'sinon';
 var assert = chai.assert;
 
 var LOG_LEVEL = enums.LOG_LEVEL;
@@ -40,7 +38,7 @@ var DECISION_SOURCES = enums.DECISION_SOURCES;
 
 describe('lib/core/decision_service', function() {
   describe('APIs', function() {
-    var configObj = projectConfig.createProjectConfig(cloneDeep(testData));
+    var configObj = projectConfig.createProjectConfig(cloneDeep(getTestProjectConfig()));
     var decisionServiceInstance;
     var mockLogger = logger.createLogger({ logLevel: LOG_LEVEL.INFO });
     var bucketerStub;
@@ -860,7 +858,7 @@ describe('lib/core/decision_service', function() {
           'control'
         );
         assert.strictEqual(didSetVariation, true);
-        var newDatafile = cloneDeep(testData);
+        var newDatafile = cloneDeep(getTestProjectConfig());
         // Remove 'control' variation from variations, traffic allocation, and datafile forcedVariations.
         newDatafile.experiments[0].variations = [
           {
@@ -892,7 +890,7 @@ describe('lib/core/decision_service', function() {
           'control'
         );
         assert.strictEqual(didSetVariation, true);
-        var newConfigObj = projectConfig.createProjectConfig(cloneDeep(testDataWithFeatures));
+        var newConfigObj = projectConfig.createProjectConfig(cloneDeep(getTestProjectConfigWithFeatures()));
         var forcedVar = decisionServiceInstance.getForcedVariation(newConfigObj, 'testExperiment', 'user1');
         assert.strictEqual(forcedVar, null);
       });
@@ -917,7 +915,7 @@ describe('lib/core/decision_service', function() {
 
   // TODO: Move tests that test methods of Optimizely to lib/optimizely/index.tests.js
   describe('when a bucketingID is provided', function() {
-    var configObj = projectConfig.createProjectConfig(cloneDeep(testData));
+    var configObj = projectConfig.createProjectConfig(cloneDeep(getTestProjectConfig()));
     var createdLogger = logger.createLogger({
       logLevel: LOG_LEVEL.DEBUG,
       logToConsole: false,
@@ -926,7 +924,7 @@ describe('lib/core/decision_service', function() {
     beforeEach(function() {
       optlyInstance = new Optimizely({
         clientEngine: 'node-sdk',
-        datafile: cloneDeep(testData),
+        datafile: cloneDeep(getTestProjectConfig()),
         jsonSchemaValidator: jsonSchemaValidator,
         isValidInstance: true,
         logger: createdLogger,
@@ -1050,7 +1048,7 @@ describe('lib/core/decision_service', function() {
 
     beforeEach(function() {
       sinon.stub(mockLogger, 'log');
-      configObj = projectConfig.createProjectConfig(cloneDeep(testData));
+      configObj = projectConfig.createProjectConfig(cloneDeep(getTestProjectConfig()));
       decisionService = DecisionService.createDecisionService({
         logger: mockLogger,
       });
@@ -1088,7 +1086,7 @@ describe('lib/core/decision_service', function() {
       var sandbox;
       var mockLogger = logger.createLogger({ logLevel: LOG_LEVEL.INFO });
       beforeEach(function() {
-        configObj = projectConfig.createProjectConfig(cloneDeep(testDataWithFeatures));
+        configObj = projectConfig.createProjectConfig(cloneDeep(getTestProjectConfigWithFeatures()));
         sandbox = sinon.sandbox.create();
         sandbox.stub(mockLogger, 'log');
         decisionServiceInstance = DecisionService.createDecisionService({
@@ -1978,7 +1976,7 @@ describe('lib/core/decision_service', function() {
       var __buildBucketerParamsSpy;
 
       beforeEach(function() {
-        configObj = projectConfig.createProjectConfig(cloneDeep(testDataWithFeatures));
+        configObj = projectConfig.createProjectConfig(cloneDeep(getTestProjectConfigWithFeatures()));
         feature = configObj.featureKeyMap.test_feature;
         decisionService = DecisionService.createDecisionService({
           logger: logger.createLogger({ logLevel: LOG_LEVEL.INFO }),
