Skip to content

Commit

Permalink
Merge branch 'upgrade/1282-typeorm' of https://github.com/CarnegieLea…
Browse files Browse the repository at this point in the history 
…rningWeb/UpGrade into upgrade/1282-typeorm
  • Loading branch information
RidhamShah committed Jul 17, 2024
2 parents 8b32f28 + 8d1d8c5 commit ce16d2f
Show file tree
Hide file tree
Showing 86 changed files with 1,366 additions and 421 deletions.
4 changes: 2 additions & 2 deletions backend/packages/Upgrade/.env.docker.local.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ EMAIL_BUCKET="s3_bucket"
#
# Initialization
#
ADMIN_USERS=user@email:role/\user2@email:role
ADMIN_USERS=user@email:admin/\user2@email:admin
CLIENT_API_SECRET=secret
CLIENT_API_KEY=key

CONTEXT_METADATA={"context_identifier_1":{"CONDITIONS":["potential-condition-1","potential-condition-1"],"GROUP_TYPES":["client_group_identifier_1","client_group_identifier_2","client_group_identifier_3"],"EXP_IDS":["decision_point_target_identifier_1","decision_point_target_identifier_2"],"EXP_POINTS":["decision_point_site_identifier_1","decision_point_site_identifier_2"]}}
CONTEXT_METADATA={"context_identifier_1":{"CONDITIONS":["potential-condition-1","potential-condition-2"],"GROUP_TYPES":["client_group_identifier_1","client_group_identifier_2","client_group_identifier_3"],"EXP_IDS":["decision_point_target_identifier_1","decision_point_target_identifier_2"],"EXP_POINTS":["decision_point_site_identifier_1","decision_point_site_identifier_2"]}}
METRICS=[{"metric":"totalTimeSeconds","datatype":"continuous"},{"groupClass":"masteryWorkspace","allowedKeys":["calculating_area_various_figures","Compare_functions_diff_reps_quadratic"],"attributes":[{"metric":"timeSeconds","datatype":"continuous"}]}]
4 changes: 2 additions & 2 deletions backend/packages/Upgrade/.env.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ EMAIL_BUCKET="s3_bucket"
#
# Initialization
#
ADMIN_USERS=user@email:role/\user2@email:role
ADMIN_USERS=user@email:admin/\user2@email:admin
CLIENT_API_SECRET=secret
CLIENT_API_KEY=key

CONTEXT_METADATA={"context_identifier_1":{"CONDITIONS":["potential-condition-1","potential-condition-1"],"GROUP_TYPES":["client_group_identifier_1","client_group_identifier_2","client_group_identifier_3"],"EXP_IDS":["decision_point_target_identifier_1","decision_point_target_identifier_2"],"EXP_POINTS":["decision_point_site_identifier_1","decision_point_site_identifier_2"]}}
CONTEXT_METADATA={"context_identifier_1":{"CONDITIONS":["potential-condition-1","potential-condition-2"],"GROUP_TYPES":["client_group_identifier_1","client_group_identifier_2","client_group_identifier_3"],"EXP_IDS":["decision_point_target_identifier_1","decision_point_target_identifier_2"],"EXP_POINTS":["decision_point_site_identifier_1","decision_point_site_identifier_2"]}}
METRICS=[{"metrics":[{"metric":"totalTimeSeconds","datatype":"continuous"},{"groupClass":"masteryWorkspace","allowedKeys":["calculating_area_various_figures","Compare_functions_diff_reps_quadratic"],"attributes":[{"metric":"timeSeconds","datatype":"continuous"}]}],"contexts":["context_identifier_1"]}]
105 changes: 92 additions & 13 deletions backend/packages/Upgrade/src/api/controllers/ExperimentClientController.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ interface IExperimentAssignment {
/**
* @swagger
* tags:
* - name: Client Side SDK
* - name: Client API calls
* description: CRUD operations related to experiments points
*/

Expand Down Expand Up @@ -155,14 +155,23 @@ export class ExperimentClientController {
* example: instructor1
* description: ExperimentUser
* tags:
* - Client Side SDK
* - Client API calls
* produces:
* - application/json
* responses:
* '200':
* description: Set Group Membership
* schema:
* $ref: '#/definitions/initResponse'
* '400':
* description: BadRequestError - InvalidParameterValue
* '401':
* description: AuthorizationRequiredError
* '404':
* description: Experiment User not defined
* '500':
* description: Internal Server Error
*
*/
@Post('init')
public async init(
Expand Down Expand Up @@ -247,8 +256,14 @@ export class ExperimentClientController {
* description: Set Group Membership
* schema:
* $ref: '#/definitions/initResponse'
* '400':
* description: BadRequestError - InvalidParameterValue
* '401':
* description: AuthorizationRequiredError
* '404':
* description: Experiment User not defined
* '500':
* description: null value in column "id" of relation "experiment_user" violates not-null constraint
* description: Internal Server Error
*/
@Post('groupmembership')
public async setGroupMemberShip(
Expand Down Expand Up @@ -310,8 +325,14 @@ export class ExperimentClientController {
* description: Set Group Membership
* schema:
* $ref: '#/definitions/initResponse'
* '400':
* description: BadRequestError - InvalidParameterValue
* '401':
* description: AuthorizationRequiredError
* '404':
* description: Experiment User not defined
* '500':
* description: null value in column "id" of relation "experiment_user" violates not-null constraint
* description: Internal Server Error
*/
@Post('workinggroup')
public async setWorkingGroup(
Expand Down Expand Up @@ -413,8 +434,14 @@ export class ExperimentClientController {
* - enrollmentCode
* - userId
* - condition
* '400':
* description: BadRequestError - InvalidParameterValue
* '401':
* description: AuthorizationRequiredError
* '404':
* description: Experiment User not defined
* '500':
* description: User not defined
* description: Internal Server Error
*/
@Post('mark')
public async markExperimentPoint(
Expand Down Expand Up @@ -529,10 +556,14 @@ export class ExperimentClientController {
* - conditionCode
* - assignmentWeight
* - order
* '500':
* description: null value in column "id" of relation "experiment_user" violates not-null constraint
* '400':
* description: BadRequestError - InvalidParameterValue
* '401':
* description: AuthorizationRequiredError
* '404':
* description: Experiment user not defined
* description: Experiment User not defined
* '500':
* description: Internal Server Error
*/
@Post('assign')
public async getAllExperimentConditions(
Expand Down Expand Up @@ -631,8 +662,14 @@ export class ExperimentClientController {
* responses:
* '200':
* description: Log data
* '400':
* description: BadRequestError - InvalidParameterValue
* '401':
* description: AuthorizationRequiredError
* '404':
* description: Experiment User not defined
* '500':
* description: null value in column "id\" of relation \"experiment_user\" violates not-null constraint
* description: Internal Server Error
*/
@Post('log')
public async log(
Expand Down Expand Up @@ -670,9 +707,15 @@ export class ExperimentClientController {
* - application/json
* responses:
* '200':
* description: Log data
* description: Log Caliper data
* '400':
* description: BadRequestError - InvalidParameterValue
* '401':
* description: AuthorizationRequiredError
* '404':
* description: Experiment User not defined
* '500':
* description: null value in column "id\" of relation \"experiment_user\" violates not-null constraint
* description: Internal Server Error
*/
@Post('log/caliper')
public async caliperLog(
Expand Down Expand Up @@ -727,6 +770,14 @@ export class ExperimentClientController {
* responses:
* '200':
* description: Log blob data
* '400':
* description: BadRequestError - InvalidParameterValue
* '401':
* description: AuthorizationRequiredError
* '404':
* description: Experiment User not defined
* '500':
* description: Internal Server Error
*/
@Post('bloblog')
public async blobLog(@Req() request: express.Request): Promise<any> {
Expand Down Expand Up @@ -796,8 +847,14 @@ export class ExperimentClientController {
* responses:
* '200':
* description: Client side reported error
* '400':
* description: BadRequestError - InvalidParameterValue
* '401':
* description: AuthorizationRequiredError
* '404':
* description: Experiment User not defined
* '500':
* description: null value in column "id\" of relation \"experiment_user\" violates not-null constraint
* description: Internal Server Error
*/
@Post('failed')
public async failedExperimentPoint(
Expand Down Expand Up @@ -852,6 +909,14 @@ export class ExperimentClientController {
* responses:
* '200':
* description: Feature flags list
* '400':
* description: BadRequestError - InvalidParameterValue
* '401':
* description: AuthorizationRequiredError
* '404':
* description: Experiment User not defined
* '500':
* description: Internal Server Error
*/
@Post('featureflag')
public async getAllFlags(
Expand Down Expand Up @@ -886,6 +951,10 @@ export class ExperimentClientController {
* responses:
* '200':
* description: Filtered Metrics
* '400':
* description: BadRequestError - InvalidParameterValue
* '401':
* description: AuthorizationRequiredError
* '500':
* description: Insert error in database
*/
Expand Down Expand Up @@ -962,8 +1031,14 @@ export class ExperimentClientController {
* originalUser:
* type: string
* minLength: 1
* '400':
* description: BadRequestError - InvalidParameterValue
* '401':
* description: AuthorizationRequiredError
* '404':
* description: Experiment User not defined
* '500':
* description: null value in column "id\" of relation \"experiment_user\" violates not-null constraint
* description: Internal Server Error
*/
@Post('useraliases')
public async setUserAliases(
Expand Down Expand Up @@ -1008,6 +1083,10 @@ export class ExperimentClientController {
* responses:
* '200':
* description: Database cleared
* '400':
* description: BadRequestError - InvalidParameterValue
* '401':
* description: AuthorizationRequiredError
* '500':
* description: DEMO mode is disabled
*/
Expand Down
Loading

0 comments on commit ce16d2f

Please sign in to comment.