Merge branch 'dev' into bugfix/enrollmentDate-issue-2099

.jenkins/README.md

@@ -0,0 +1,3 @@
+# Jenkins Documentation
+
+- [Upgrade Frontend and Backend Documentation](https://carnegielearning.atlassian.net/wiki/spaces/RP/pages/3937402881/Jenkins)

README.md

@@ -88,3 +88,6 @@ For an overview of the UpGrade platform, please visit [UpGrade Platform](https:/
 
 ![Built with Science](http://ForTheBadge.com/images/badges/built-with-science.svg)
 
+## Jenkins Documentation
+
+- [Upgrade Frontend and Backend Documentation](https://carnegielearning.atlassian.net/wiki/spaces/RP/pages/3937402881/Jenkins)

backend/packages/Scheduler/package.json

@@ -22,7 +22,7 @@
     "@types/aws-lambda": "^8.10.17",
     "@types/jsonwebtoken": "^8.3.9",
     "@types/node": "^10.17.20",
-    "@types/node-fetch": "^2.5.7",
+    "@types/node-fetch": "^2.6.12",
     "eslint": "^8.27.0",
     "fork-ts-checker-webpack-plugin": "^8.0.0",
     "prettier": "^2.7.1",
@@ -34,4 +34,4 @@
   },
   "author": "The serverless webpack authors (https://github.com/elastic-coders/serverless-webpack)",
   "license": "MIT"
-}
+}

backend/packages/Scheduler/tsconfig.json

@@ -3,7 +3,7 @@
     "lib": ["es2017", "dom"],
     "removeComments": true,
     "moduleResolution": "node",
-    "noUnusedLocals": true,
+    // "noUnusedLocals": true,
     "noUnusedParameters": true,
     "sourceMap": true,
     "target": "es2017",

backend/packages/Upgrade/src/api/repositories/LogRepository.ts

@@ -139,7 +139,7 @@ export class LogRepository extends Repository<Log> {
       type: IMetricMetaData;
     }>
   > {
-    const experimentRepo = Container.getCustomRepository(ExperimentRepository);
+    const experimentRepo = Container.getCustomRepository(ExperimentRepository, 'export');
     return experimentRepo
       .createQueryBuilder('experiment')
       .select([

backend/packages/Upgrade/src/api/services/AnalyticsService.ts

@@ -30,7 +30,7 @@ import utc from 'dayjs/plugin/utc';
 import timezone from 'dayjs/plugin/timezone';
 import { ExperimentService } from './ExperimentService';
 import { QueryService } from './QueryService';
-import { HttpError } from '../errors';
+import { HttpError } from 'routing-controllers';
 
 dayjs.extend(utc);
 dayjs.extend(timezone);

clientlibs/js/README.md

@@ -4,10 +4,13 @@ Please see https://upgrade-platform.gitbook.io/docs/developer-guide/reference/cl
 
 ## Installation
 
-`npm i upgrade_client_lib@4.1.7`
+`npm i upgrade_client_lib@6.0.7`
 
 ## Usage
 
+See [`quicktest.ts`](https://github.com/CarnegieLearningWeb/UpGrade/blob/release/6.0/clientlibs/js/quickTest.ts) to see basic in executable form to play around with: `npm run quicktest`
+
+---
 **`Example`**
 
 ```typescript
@@ -20,7 +23,7 @@ import UpgradeClient from 'upgrade_client_lib/dist/node';
 
 General UpGrade types can also be accessed as named exports:
 ```typescript
-import UpgradeClient, { IExperimentAssignment } from 'upgrade_client_lib/dist/browser';
+import UpgradeClient, { Assignment } from 'upgrade_client_lib/dist/browser';
 ```
 
 SDK-Specific types can be accessed also:
@@ -97,20 +100,20 @@ const upgradeClient: UpgradeClient[] = new UpgradeClient(hostURL, userId, contex
 
 ### getAllExperimentConditions
 
-▸ **getAllExperimentConditions**(): `Promise`<`IExperimentAssignmentv4`[]\>
+▸ **getAllExperimentConditions**(): `Promise`<`IExperimentAssignment5`[]\>
 
 Will return all the experiment conditions for the user.
 Internally this uses the `context` and `userId` to query conditions for all eligible decision points at enrolling experiments for this user.
 
 **`Example`**
 
 ```typescript
-const allExperimentConditionsResponse: IExperimentAssignmentv4[] = await upgradeClient.getAllExperimentConditions(workingGroup);
+const allExperimentConditionsResponse: IExperimentAssignmentv5[] = await upgradeClient.getAllExperimentConditions(workingGroup);
 ```
 
 #### Returns
 
-`Promise`<`IExperimentAssignmentv4`[]\>
+`Promise`<`IExperimentAssignmentv5`[]\>
 
 #### Defined in
 
@@ -129,7 +132,7 @@ NOTE ALSO: If getAllExperimentConditions() has been called, this will return the
 **`Example`**
 
 ```typescript
-const allExperimentConditionsResponse: IExperimentAssignmentv4[] = await upgradeClient.getAllExperimentConditions(workingGroup);
+const allExperimentConditionsResponse: IExperimentAssignmentv5[] = await upgradeClient.getAllExperimentConditions(workingGroup);
 ```
 
 #### Parameters
@@ -349,7 +352,7 @@ const status: MARKED_DECISION_POINT_STATUS = MARKED_DECISION_POINT_STATUS.CONDIT
 const target = 'experimental button'; // optional
 const clientError = 'variant not recognized'; //optional
 
-const allExperimentConditionsResponse: IExperimentAssignmentv4[] = await upgradeClient.markExperimentPoint(site, condition, MARKED_DECISION_POINT_STATUS.CONDITION_APPLIED, target, clientError);
+const allExperimentConditionsResponse: IExperimentAssignment5[] = await upgradeClient.markExperimentPoint(site, condition, MARKED_DECISION_POINT_STATUS.CONDITION_APPLIED, target, clientError);
 ```
 
 #### Parameters