diff --git a/.circleci/config.yml b/.circleci/config.yml index fdb8bb0..efa2358 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2 defaults: &defaults - docker: - - image: cimg/python:3.11.0-browsers + docker: + - image: cimg/python:3.11.7-browsers install_dependency: &install_dependency name: Installation of build and deployment dependencies. command: | @@ -13,15 +13,15 @@ install_dependency: &install_dependency sudo pip3 install docker-compose install_deploysuite: &install_deploysuite - name: Installation of install_deploysuite. - command: | - git clone --branch v1.4.15 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript - cp ./../buildscript/master_deploy.sh . - cp ./../buildscript/buildenv.sh . - cp ./../buildscript/awsconfiguration.sh . + name: Installation of install_deploysuite. + command: | + git clone --branch v1.4.15 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript + cp ./../buildscript/master_deploy.sh . + cp ./../buildscript/buildenv.sh . + cp ./../buildscript/awsconfiguration.sh . run_build: &run_build - name: Installation of build dependencies. - command: ./build.sh + name: Installation of build dependencies. + command: ./build.sh jobs: # Build & Deploy against development backend @@ -67,12 +67,12 @@ workflows: jobs: # Development builds are executed on "develop" branch only. - "build-dev": - context : org-global + context: org-global filters: branches: - only: ['develop', 'PLAT-3383'] + only: ["develop", "PLAT-3383"] - "build-prod": - context : org-global + context: org-global filters: branches: only: diff --git a/src/services/SubmissionService.js b/src/services/SubmissionService.js index 30a0516..0ad80b2 100755 --- a/src/services/SubmissionService.js +++ b/src/services/SubmissionService.js @@ -251,6 +251,18 @@ async function listSubmissions (authUser, query) { if (submission.review && !helper.canSeePrivateReviews(authUser)) { submission.review = helper.cleanseReviews(submission.review) } + + // Strip out any null reviews in the array (PROD-3146) + if (submission.review) { + const nonNullReviews = [] + + _.forEach(submission.review, (review) => { + if (review) { + nonNullReviews.push(review) + } + }) + submission.review = nonNullReviews + } helper.adjustSubmissionChallengeId(submission) return submission })