feat: use count api

Author: eisbilir

app-routes.js

@@ -108,11 +108,11 @@ module.exports = (app) => {
           }
         });
       }
+      actions.push(method);
       actions.push((req, res, next) => {
         logger.info(`Done request handling, ${req.signature}`);
         next();
       });
-      actions.push(method);
       app[verb](`/${config.API_VERSION}${path}`, helper.autoWrapExpress(actions));
     });
   });

src/common/helper.js

@@ -253,6 +253,22 @@ async function getChallengeResources(challengeId, roleId = null) {
   return result;
 }
 
+/**
+ * Get challenge resources count
+ * @param {String} challengeId the challenge id
+ * @returns {Promise<Object>} the challenge resources count
+ */
+async function getChallengeResourcesCount(challengeId, roleId = null) {
+  const token = await m2mHelper.getM2MToken();
+  const url = `${config.RESOURCES_API_URL}/count?challengeId=${challengeId}${
+    roleId ? `&roleId=${roleId}` : ""
+  }`;
+  const res = await axios.get(url, {
+    headers: { Authorization: `Bearer ${token}` },
+  });
+  return res.data;
+}
+
 /**
  * Create challenge resources
  * @param {String} challengeId the challenge id
@@ -1053,6 +1069,19 @@ async function getChallengeSubmissions(challengeId) {
   return allSubmissions;
 }
 
+/**
+ * Get challenge submissions count
+ * @param {String} challengeId the challenge id
+ * @returns {Promise<Object>} the submission counts
+ */
+async function getChallengeSubmissionsCount(challengeId) {
+  const token = await m2mHelper.getM2MToken();
+  const res = await axios.get(`${config.SUBMISSIONS_API_URL}/${challengeId}/count`, {
+    headers: { Authorization: `Bearer ${token}` },
+  });
+  return res.data;
+}
+
 /**
  * Get member by ID
  * @param {String} userId the user ID
@@ -1183,6 +1212,7 @@ module.exports = {
   downloadFromS3,
   deleteFromS3,
   getChallengeResources,
+  getChallengeResourcesCount,
   createResource,
   getUserGroups,
   ensureNoDuplicateOrNullElements,
@@ -1206,6 +1236,7 @@ module.exports = {
   getProjectIdByRoundId,
   getGroupById,
   getChallengeSubmissions,
+  getChallengeSubmissionsCount,
   getMemberById,
   createSelfServiceProject,
   activateProject,

src/phase-management/PhaseAdvancer.js

@@ -274,15 +274,18 @@ class PhaseAdvancer {
   async #getRegistrantCount(challengeId) {
     console.log(`Getting registrant count for challenge ${challengeId}`);
     // TODO: getChallengeResources loops through all pages, which is not necessary here, we can just get the first page and total count from header[X-Total]
-    const submitters = await helper.getChallengeResources(challengeId, config.SUBMITTER_ROLE_ID);
-    return submitters.length;
+    const submitters = await helper.getChallengeResourcesCount(
+      challengeId,
+      config.SUBMITTER_ROLE_ID
+    );
+    return submitters[config.SUBMITTER_ROLE_ID] || 0;
   }
 
   async #getSubmissionCount(challengeId) {
     console.log(`Getting submission count for challenge ${challengeId}`);
     // TODO: getChallengeSubmissions loops through all pages, which is not necessary here, we can just get the first page and total count from header[X-Total]
-    const submissions = await helper.getChallengeSubmissions(challengeId);
-    return submissions.length;
+    const submissions = await helper.getChallengeSubmissionsCount(challengeId);
+    return submissions["Contest Submission"] || 0;
   }
 
   async #areAllSubmissionsReviewed(challengeId) {