refs #10: refactor duplicate test/submit logic

Signed-off-by: Eric Wang <skygragon@gmail.com>

Author: skygragon

lib/leetcode_client.js

@@ -242,21 +242,20 @@ function verifyResult(opts, jobs, results, cb) {
   });
 }
 
-leetcodeClient.testProblem = function(problem, cb) {
-  var opts = makeOpts();
+function runCode(opts, problem, cb) {
   opts.method = 'POST';
-  opts.url = config.URL_TEST.replace('$key', problem.key);
   opts.headers.Origin = config.URL_BASE;
   opts.headers.Referer = problem.link;
   opts.headers['X-Requested-With'] = 'XMLHttpRequest';
   opts.json = true;
-  opts.body = {
-    'data_input':  problem.testcase,
+
+  opts.body = opts.body || {};
+  _.extendOwn(opts.body, {
     'lang':        h.extToLang(problem.file),
     'question_id': parseInt(problem.id, 10),
     'test_mode':   false,
     'typed_code':  h.getFileData(problem.file)
-  };
+  });
 
   requestWithReLogin(opts, function(e, resp, body) {
     e = checkError(e, resp, 200);
@@ -265,38 +264,35 @@ leetcodeClient.testProblem = function(problem, cb) {
     opts.json = false;
     opts.body = null;
 
+    return cb(null, body);
+  });
+}
+
+leetcodeClient.testProblem = function(problem, cb) {
+  var opts = makeOpts();
+  opts.url = config.URL_TEST.replace('$key', problem.key);
+  opts.body = {'data_input': problem.testcase};
+
+  runCode(opts, problem, function(e, task) {
+    if (e) return cb(e);
+
     var jobs = [
-      {name: 'Your', id: body.interpret_id},
-      {name: 'Expected', id: body.interpret_expected_id}
+      {name: 'Your', id: task.interpret_id},
+      {name: 'Expected', id: task.interpret_expected_id}
     ];
     verifyResult(opts, jobs, [], cb);
   });
 };
 
 leetcodeClient.submitProblem = function(problem, cb) {
   var opts = makeOpts();
-  opts.method = 'POST';
   opts.url = config.URL_SUBMIT.replace('$key', problem.key);
-  opts.headers.Origin = config.URL_BASE;
-  opts.headers.Referer = problem.link;
-  opts.headers['X-Requested-With'] = 'XMLHttpRequest';
-  opts.json = true;
-  opts.body = {
-    'judge_type':  'large',
-    'lang':        h.extToLang(problem.file),
-    'question_id': parseInt(problem.id, 10),
-    'test_mode':   false,
-    'typed_code':  h.getFileData(problem.file)
-  };
+  opts.body = {'judge_type': 'large'};
 
-  requestWithReLogin(opts, function(e, resp, body) {
-    e = checkError(e, resp, 200);
+  runCode(opts, problem, function(e, task) {
     if (e) return cb(e);
 
-    opts.json = false;
-    opts.body = null;
-
-    var jobs = [{name: 'Your', id: body.submission_id}];
+    var jobs = [{name: 'Your', id: task.submission_id}];
     verifyResult(opts, jobs, [], cb);
   });
 };