From a0bb38750a5c50a1b216836d581518ec07c77595 Mon Sep 17 00:00:00 2001 From: Ersun Warncke Date: Thu, 23 Apr 2020 09:01:40 -0400 Subject: [PATCH] Revert "use user_id for tpds queue name" This reverts commit 76d7badd001e0902e55d54efdca53d01124bcc77. GitOrigin-RevId: 75e480660c6a1682cf20ba9575fd90f0ce726abc --- .../Features/ThirdPartyDataStore/TpdsUpdateSender.js | 6 +++--- .../src/ThirdPartyDataStore/TpdsUpdateSenderTests.js | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js index 9d7b2a8099..73d1383303 100644 --- a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js +++ b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js @@ -112,7 +112,7 @@ const TpdsUpdateSender = { streamOrigin: options.streamOrigin } return TpdsUpdateSender._enqueue( - user_id, + options.project_id, 'pipeStreamFrom', postOptions, function(err) { @@ -204,7 +204,7 @@ const TpdsUpdateSender = { } } return TpdsUpdateSender._enqueue( - user_id, + options.project_id, 'standardHttpRequest', moveOptions, callback @@ -237,7 +237,7 @@ const TpdsUpdateSender = { sl_all_user_ids: JSON.stringify(allUserIds) } return TpdsUpdateSender._enqueue( - user_id, + options.project_id, 'standardHttpRequest', deleteOptions, callback diff --git a/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateSenderTests.js b/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateSenderTests.js index dde0e37c0b..e59fa95721 100644 --- a/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateSenderTests.js +++ b/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateSenderTests.js @@ -109,7 +109,7 @@ describe('TpdsUpdateSender', function() { const file_id = '4545345' const path = '/some/path/here.jpg' this.updateSender._enqueue = function(uid, method, job, callback) { - uid.should.equal(user_id) + uid.should.equal(project_id) job.method.should.equal('post') job.streamOrigin.should.equal( `${filestoreUrl}/project/${project_id}/file/${file_id}` @@ -135,7 +135,7 @@ describe('TpdsUpdateSender', function() { const lines = ['line1', 'line2', 'line3'] this.updateSender._enqueue = (uid, method, job, callback) => { - uid.should.equal(user_id) + uid.should.equal(project_id) job.method.should.equal('post') const expectedUrl = `${thirdPartyDataStoreApiUrl}/user/${user_id}/entity/${encodeURIComponent( project_name @@ -161,7 +161,7 @@ describe('TpdsUpdateSender', function() { it('deleting entity', function(done) { const path = '/path/here/t.tex' this.updateSender._enqueue = function(uid, method, job, callback) { - uid.should.equal(user_id) + uid.should.equal(project_id) job.method.should.equal('DELETE') const expectedUrl = `${thirdPartyDataStoreApiUrl}/user/${user_id}/entity/${encodeURIComponent( project_name @@ -179,7 +179,7 @@ describe('TpdsUpdateSender', function() { const startPath = 'staring/here/file.tex' const endPath = 'ending/here/file.tex' this.updateSender._enqueue = function(uid, method, job, callback) { - uid.should.equal(user_id) + uid.should.equal(project_id) job.method.should.equal('put') job.uri.should.equal( `${thirdPartyDataStoreApiUrl}/user/${user_id}/entity` @@ -203,7 +203,7 @@ describe('TpdsUpdateSender', function() { const oldProjectName = '/oldProjectName/' const newProjectName = '/newProjectName/' this.updateSender._enqueue = function(uid, method, job, callback) { - uid.should.equal(user_id) + uid.should.equal(project_id) job.method.should.equal('put') job.uri.should.equal( `${thirdPartyDataStoreApiUrl}/user/${user_id}/entity`