Use memberId instead of userId for fetch-submissions, and minor tweak documentation.

Author: dhruvit-r

bin/topcoder-cli.js

@@ -41,8 +41,8 @@ program
         `  "username": "<Topcoder username>",\n` +
         `  "password": "<Topcoder password>",\n` +
         `  "m2m": {\n` +
-        `    client_id: "<Client ID for M2M authentication>",\n` +
-        `    client_secret: "<Client Secret for M2M authentication>"\n` +
+        `    "client_id": "<Client ID for M2M authentication>",\n` +
+        `    "client_secret": "<Client Secret for M2M authentication>"\n` +
         `  }\n` +
         `}\n` +
         `and execute command \`topcoder submit\` to submit the contents of ` +
@@ -72,7 +72,7 @@ program
     'Challenge ID for submissions to be fetched'
   )
   .option(
-    '-u, --userId <id>',
+    '-u, --memberId <id>',
     'Fetch only the submission of for a particular user id'
   )
   .option(
@@ -83,25 +83,25 @@ program
   .option('--dev', 'Points to Topcoder development environment')
   .on('--help', () => {
     console.log(
-      `\nUse CLI parameters or create a file .topcoderrc in JSON format with below details` +
+      `\nUse CLI parameters or create a file .topcoderrc in JSON format with below details\n` +
         `{\n` +
-        `  "userId": "<Topcoder memberId",\n` +
+        `  "memberId": "<Topcoder memberId",\n` +
         `  "challengeId": "<Topcoder challengeId",\n` +
         `  "submissionId": "<Topcoder submissionId",\n` +
         `  "latest": true,\n` +
         `  "username": "<Topcoder username>",\n` +
         `  "password": "<Topcoder password>",\n` +
         `  "m2m": {\n` +
-        `    client_id: "<Client ID for M2M authentication>",\n` +
-        `    client_secret: "<Client Secret for M2M authentication>"\n` +
+        `    "client_id": "<Client ID for M2M authentication>",\n` +
+        `    "client_secret": "<Client Secret for M2M authentication>"\n` +
         `  }\n` +
         `}\n` +
         `and execute command \`topcoder fetch-submissions\` to fetch submissions ` +
         `for a challenge and save them.\n` +
         `You may specify the m2m config or the username and password config, ` +
         `but not both.\n` +
         `If the submissionId parameter is provided, you must not provide the ` +
-        `userId or the latest parameters.\n` +
+        `memberId or the latest parameters.\n` +
         `The challengeId parameter is always required.`
     )
   })
@@ -140,8 +140,8 @@ program
         `  "username": "<Topcoder username>",\n` +
         `  "password": "<Topcoder password>",\n` +
         `  "m2m": {\n` +
-        `    client_id: "<Client ID for M2M authentication>",\n` +
-        `    client_secret: "<Client Secret for M2M authentication>"\n` +
+        `    "client_id": "<Client ID for M2M authentication>",\n` +
+        `    "client_secret": "<Client Secret for M2M authentication>"\n` +
         `  }\n` +
         `}\n` +
         `and execute command \`topcoder fetch-artifacts\` to fetch submissions for` +

src/services/fetchSubmissionService.js

@@ -14,17 +14,17 @@ let submissionApiClient
 const schemaForRC = helper.defaultAuthSchema
   .keys({
     challengeId: Joi.string().required(),
-    userId: Joi.number().integer(),
+    memberId: Joi.number().integer(),
     submissionId: Joi.string(),
     latest: Joi.boolean()
   })
-  .without('submissionId', ['userId', 'latest'])
-  .without('userId', 'submissionId')
+  .without('submissionId', ['memberId', 'latest'])
+  .without('memberId', 'submissionId')
   .without('latest', 'submissionId')
   .unknown()
 
 // Acceptable CLI params
-const validCLIParams = ['challengeId', 'userId', 'submissionId', 'latest']
+const validCLIParams = ['challengeId', 'memberId', 'submissionId', 'latest']
 
 /**
  * Download the submissions to the savePath directory sequentially.s
@@ -92,7 +92,7 @@ async function fetchSubmissions (currDir, cliParams) {
     password,
     m2m,
     challengeId,
-    userId,
+    memberId,
     submissionId,
     latest
   } = await helper.readFromRCFile(rcPath, params, schemaForRC, validCLIParams)
@@ -129,9 +129,9 @@ async function fetchSubmissions (currDir, cliParams) {
       perPage: 100,
       page
     }
-    // If there's a userId specified, filter by userId.
-    if (userId) {
-      query.memberId = userId
+    // If there's a memberId specified, filter by memberId.
+    if (memberId) {
+      query.memberId = memberId
     }
     // Get a list of submissions
     const nextSubmissions = await submissionApiClient.searchSubmissions(query)