Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CHC API: Use client library for storing DICOM instance #1518

Merged
merged 2 commits into from
Oct 17, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
CHC API: Use client library for storing DICOM instance
  • Loading branch information
noerog committed Oct 15, 2019
commit 2c65b4929bbb61a4c4c38d6ca9c53dffdb4aeaa8
70 changes: 70 additions & 0 deletions healthcare/dicom/dicomWebStoreInstance.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/**
* Copyright 2019, Google, LLC
* Licensed under the Apache License, Version 2.0 (the `License`);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an `AS IS` BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* eslint-disable no-warning-comments */

'use strict';

const main = (
projectId = process.env.GCLOUD_PROJECT,
cloudRegion = 'us-central1',
datasetId,
dicomStoreId,
dcmFile
) => {
// [START healthcare_dicomweb_store_instance]
const {google} = require('googleapis');
const healthcare = google.healthcare('v1beta1');
const fs = require('fs');
const binaryData = fs.createReadStream(dcmFile);

const dicomWebStoreInstance = async () => {
const auth = await google.auth.getClient({
scopes: ['https://www.googleapis.com/auth/cloud-platform'],
});
google.options({
auth,
headers: {
'Content-Type': 'application/dicom',
Accept: 'application/dicom+json',
},
});

// TODO(developer): uncomment these lines before running the sample
// const cloudRegion = 'us-central1';
// const projectId = 'adjective-noun-123';
// const datasetId = 'my-dataset';
// const dicomStoreId = 'my-dicom-store';
// const dcmFile = 'file.dcm';
const parent = `projects/${projectId}/locations/${cloudRegion}/datasets/${datasetId}/dicomStores/${dicomStoreId}`;
const dicomWebPath = `studies`;
const request = {
parent,
dicomWebPath,
requestBody: binaryData,
};

const instance = await healthcare.projects.locations.datasets.dicomStores.storeInstances(
request
);
console.log(`Stored DICOM instance:\n`, JSON.stringify(instance.data));
};

dicomWebStoreInstance();
// [END healthcare_dicomweb_store_instance]
};

// node dicomWebStoreInstance.js <projectId> <cloudRegion> <datasetId> <dicomStoreId> <dcmFile>
main(...process.argv.slice(2));
128 changes: 0 additions & 128 deletions healthcare/dicom/dicomweb.js

This file was deleted.

4 changes: 2 additions & 2 deletions healthcare/dicom/system-test/dicomweb.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ after(async () => {

it('should store a DICOM instance', async () => {
const output = await tools.runAsync(
`node dicomweb.js dicomWebStoreInstance ${datasetId} ${dicomStoreId} ${dcmFile}`,
`node dicomWebStoreInstance.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId} ${dcmFile}`,
cwd
);
assert.ok(output.includes('Stored instance'));
assert.ok(output.includes('Stored DICOM instance'));
});

it('should search DICOM instances', async () => {
Expand Down