use jobReference.jobId instead, to not include the "project-id:" prefix for Job constructor

c0b · c0b · commit ef5412175876 · 2017-11-08T22:41:46.000-08:00
current code use the job.id from metadata in jobs.list api response to construct a Job; however it has the full format of "project-id:jobid-........." the constructed Job from this full id format can't be used for further acesss, like job.get job.getQueryResults server side will return an "Invalid job ID" error; see this fixes #2736 the metadata response has jobReference.jobId is exactly needed here; { kind: 'bigquery#job', etag: '"cX5UmbB_R-S07ii743IKGH9YCYM/4xT3EKx31LcQTmnaqUafpQ2RHqU"', id: 'project-id:job_D3tTAICe8jSlPuOw8CSvLEKs7-0C', selfLink: 'https://www.googleapis.com/bigquery/v2/projects/<project-id>/jobs/job_D3tTAICe8jSlPuOw8CSvLEKs7-0C', jobReference: { projectId: '<project-id>', jobId: 'job_D3tTAICe8jSlPuOw8CSvLEKs7-0C' },
diff --git a/packages/bigquery/src/index.js b/packages/bigquery/src/index.js
@@ -806,7 +806,7 @@ BigQuery.prototype.getJobs = function(options, callback) {
     }
 
     var jobs = (resp.jobs || []).map(function(jobObject) {
-      var job = that.job(jobObject.id);
+      var job = that.job(jobObject.jobReference.jobId);
       job.metadata = jobObject;
       return job;
     });
diff --git a/packages/bigquery/test/index.js b/packages/bigquery/test/index.js
@@ -1048,7 +1048,8 @@ describe('BigQuery', function() {
 
     it('should return Job objects', function(done) {
       bq.request = function(reqOpts, callback) {
-        callback(null, { jobs: [{ id: JOB_ID }] });
+        callback(null, { jobs: [{ id: JOB_ID,
+                                  jobReference: { jobId: JOB_ID } }] });
       };
 
       bq.getJobs(function(err, jobs) {
@@ -1059,7 +1060,8 @@ describe('BigQuery', function() {
     });
 
     it('should return apiResponse', function(done) {
-      var resp = { jobs: [{ id: JOB_ID }] };
+      var resp = { jobs: [{ id: JOB_ID,
+                            jobReference: { jobId: JOB_ID } }] };
 
       bq.request = function(reqOpts, callback) {
         callback(null, resp);
@@ -1073,7 +1075,8 @@ describe('BigQuery', function() {
     });
 
     it('should assign metadata to the Job objects', function(done) {
-      var jobObjects = [{ a: 'b', c: 'd', id: JOB_ID }];
+      var jobObjects = [{ a: 'b', c: 'd', id: JOB_ID,
+                          jobReference: { jobId: JOB_ID } }];
 
       bq.request = function(reqOpts, callback) {
         callback(null, { jobs: jobObjects });

Original file line number	Diff line number	Diff line change
`@@ -806,7 +806,7 @@ BigQuery.prototype.getJobs = function(options, callback) {`
`806`	`806`	`}`
`807`	`807`
`808`	`808`	`var jobs = (resp.jobs \|\| []).map(function(jobObject) {`
`809`		`- var job = that.job(jobObject.id);`
	`809`	`+ var job = that.job(jobObject.jobReference.jobId);`
`810`	`810`	`job.metadata = jobObject;`
`811`	`811`	`return job;`
`812`	`812`	`});`