From 4c99912e03743259d79fe1476b3a418d121af655 Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Wed, 17 Apr 2024 08:10:29 +1000
Subject: [PATCH 1/2] Strip out null reviews from submissions response
 (PROD-3146)

---
 src/services/SubmissionService.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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
   })

From ad457d6c46d9883bf47652916ac56a51ac48a3dc Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Wed, 17 Apr 2024 08:13:52 +1000
Subject: [PATCH 2/2] Build fix

---
 .circleci/config.yml | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d229451..8d5a33a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,26 +1,27 @@
 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: |
-        sudo apt install jq
-        sudo apt update
-        sudo apt install python3-pip
-        sudo pip3 install awscli --upgrade
-        sudo pip3 install docker-compose   
+  name: Installation of build and deployment dependencies.
+  command: |
+    sudo apt install jq
+    sudo apt update
+    sudo apt install python3-pip
+    sudo pip3 install awscli --upgrade
+    sudo pip3 install docker==6.1.3
+    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
@@ -66,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: