fix: not response 204 when empty matched document

- Refactor, correct name correspond to DICOM level
Chinlinlee · May 9, 2022 · 4d8b4a1 · 4d8b4a1
1 parent 61118d0
commit 4d8b4a1
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 29 deletions.
diff --git a/api/dicom-web/controller/QIDO-RS/queryAllInstances.js b/api/dicom-web/controller/QIDO-RS/queryAllInstances.js
@@ -48,16 +48,22 @@ module.exports = async function (req, res) {
         }
 
         let dicomTagQuery = convertAllQueryToDICOMTag(query);
-        let studiesJson = await getInstanceDicomJson(
+        let instancesJson = await getInstanceDicomJson(
             dicomTagQuery,
             limit,
             skip,
             req
         );
-        res.writeHead(200, {
-            "Content-Type": "application/dicom+json"
-        });
-        res.end(JSON.stringify(studiesJson.data));
+        let instancesJsonLength = _.get(instancesJson, "data.length", 0);
+        if (instancesJsonLength > 0) {
+            res.writeHead(200, {
+                "Content-Type": "application/dicom+json"
+            });
+            res.end(JSON.stringify(instancesJson.data));
+        } else {
+            res.writeHead(204);
+            res.end();
+        }
     } catch (e) {
         let errorStr = JSON.stringify(e, Object.getOwnPropertyNames(e));
         logger.error(`[QIDO-RS] [Error: ${errorStr}]`);

diff --git a/api/dicom-web/controller/QIDO-RS/queryAllSeries.js b/api/dicom-web/controller/QIDO-RS/queryAllSeries.js
@@ -50,16 +50,22 @@ module.exports = async function (req, res) {
         }
 
         let dicomTagQuery = convertAllQueryToDICOMTag(query);
-        let studiesJson = await getSeriesDicomJson(
+        let seriesJson = await getSeriesDicomJson(
             dicomTagQuery,
             limit,
             skip,
             req
         );
-        res.writeHead(200, {
-            "Content-Type": "application/dicom+json"
-        });
-        res.end(JSON.stringify(studiesJson.data));
+        let seriesJsonLength = _.get(seriesJson, "data.length", 0);
+        if (seriesJsonLength > 0) {
+            res.writeHead(200, {
+                "Content-Type": "application/dicom+json"
+            });
+            res.end(JSON.stringify(seriesJson.data));
+        } else {
+            res.writeHead(204);
+            res.end();
+        }
     } catch (e) {
         let errorStr = JSON.stringify(e, Object.getOwnPropertyNames(e));
         logger.error(`[QIDO-RS] [Error: ${errorStr}]`);

diff --git a/api/dicom-web/controller/QIDO-RS/queryAllStudies.js b/api/dicom-web/controller/QIDO-RS/queryAllStudies.js
@@ -56,10 +56,16 @@ module.exports = async function (req, res) {
             skip,
             req
         );
-        res.writeHead(200, {
-            "Content-Type": "application/dicom+json"
-        });
-        res.end(JSON.stringify(studiesJson.data));
+        let studiesJsonLength = _.get(studiesJson, "data.length", 0);
+        if (studiesJsonLength > 0) {
+            res.writeHead(200, {
+                "Content-Type": "application/dicom+json"
+            });
+            res.end(JSON.stringify(studiesJson.data));
+        } else {
+            res.writeHead(204);
+            res.end();
+        }
     } catch (e) {
         let errorStr = JSON.stringify(e, Object.getOwnPropertyNames(e));
         logger.error(`[QIDO-RS] [Error: ${errorStr}]`);

diff --git a/api/dicom-web/controller/QIDO-RS/queryStudies-Instances.js b/api/dicom-web/controller/QIDO-RS/queryStudies-Instances.js
@@ -51,16 +51,22 @@ module.exports = async function (req, res) {
         }
 
         let dicomTagQuery = convertAllQueryToDICOMTag(query);
-        let studiesJson = await getInstanceDicomJson(
+        let instancesJson = await getInstanceDicomJson(
             dicomTagQuery,
             limit,
             skip,
             req
         );
-        res.writeHead(200, {
-            "Content-Type": "application/dicom+json"
-        });
-        res.end(JSON.stringify(studiesJson.data));
+        let instancesJsonLength = _.get(instancesJson, "data.length", 0);
+        if (instancesJsonLength > 0) {
+            res.writeHead(200, {
+                "Content-Type": "application/dicom+json"
+            });
+            res.end(JSON.stringify(instancesJson.data));
+        } else {
+            res.writeHead(204);
+            res.end();
+        }
     } catch (e) {
         let errorStr = JSON.stringify(e, Object.getOwnPropertyNames(e));
         logger.error(`[QIDO-RS] [Error: ${errorStr}]`);

diff --git a/api/dicom-web/controller/QIDO-RS/queryStudies-Series-Instance.js b/api/dicom-web/controller/QIDO-RS/queryStudies-Series-Instance.js
@@ -51,16 +51,22 @@ module.exports = async function (req, res) {
         }
 
         let dicomTagQuery = convertAllQueryToDICOMTag(query);
-        let studiesJson = await getInstanceDicomJson(
+        let instancesJson = await getInstanceDicomJson(
             dicomTagQuery,
             limit,
             skip,
             req
         );
-        res.writeHead(200, {
-            "Content-Type": "application/dicom+json"
-        });
-        res.end(JSON.stringify(studiesJson.data));
+        let instancesJsonLength = _.get(instancesJson, "data.length", 0);
+        if (instancesJsonLength > 0) {
+            res.writeHead(200, {
+                "Content-Type": "application/dicom+json"
+            });
+            res.end(JSON.stringify(instancesJson.data));
+        } else {
+            res.writeHead(204);
+            res.end();
+        }
     } catch (e) {
         let errorStr = JSON.stringify(e, Object.getOwnPropertyNames(e));
         logger.error(`[QIDO-RS] [Error: ${errorStr}]`);

diff --git a/api/dicom-web/controller/QIDO-RS/queryStudies-Series.js b/api/dicom-web/controller/QIDO-RS/queryStudies-Series.js
@@ -51,16 +51,22 @@ module.exports = async function (req, res) {
         }
 
         let dicomTagQuery = convertAllQueryToDICOMTag(query);
-        let studiesJson = await getSeriesDicomJson(
+        let seriesJson = await getSeriesDicomJson(
             dicomTagQuery,
             limit,
             skip,
             req
         );
-        res.writeHead(200, {
-            "Content-Type": "application/dicom+json"
-        });
-        res.end(JSON.stringify(studiesJson.data));
+        let seriesJsonLength = _.get(seriesJson, "data.length", 0);
+        if (seriesJsonLength > 0) {
+            res.writeHead(200, {
+                "Content-Type": "application/dicom+json"
+            });
+            res.end(JSON.stringify(seriesJson.data));
+        } else {
+            res.writeHead(204);
+            res.end();
+        }
     } catch (e) {
         let errorStr = JSON.stringify(e, Object.getOwnPropertyNames(e));
         logger.error(`[QIDO-RS] [Error: ${errorStr}]`);