From f04fd9b4cc109a49f90f8f6f4866b26b721f1505 Mon Sep 17 00:00:00 2001 From: chinlinlee Date: Sat, 11 Nov 2023 00:35:00 +0800 Subject: [PATCH] test: update models require location --- test/QIDO-RS-Service/common.test.js | 2 +- test/QIDO-RS-Service/patient.test.js | 2 +- test/patient.mongo.test.js | 2 +- test/query.test.js | 8 ++++---- test/store-instances.test.js | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/QIDO-RS-Service/common.test.js b/test/QIDO-RS-Service/common.test.js index 5766a711..3f7e9888 100644 --- a/test/QIDO-RS-Service/common.test.js +++ b/test/QIDO-RS-Service/common.test.js @@ -1,5 +1,5 @@ const mongoose = require("mongoose"); -const patientModel = require("../../models/mongodb/models/patient"); +const patientModel = require("../../models/mongodb/models/patient.model"); const { DicomJsonModel } = require("../../models/DICOM/dicom-json-model"); const { expect } = require("chai"); const _ = require("lodash"); diff --git a/test/QIDO-RS-Service/patient.test.js b/test/QIDO-RS-Service/patient.test.js index 37180fb4..d2fc319e 100644 --- a/test/QIDO-RS-Service/patient.test.js +++ b/test/QIDO-RS-Service/patient.test.js @@ -1,5 +1,5 @@ const mongoose = require("mongoose"); -const patientModel = require("../../models/mongodb/models/patient"); +const patientModel = require("../../models/mongodb/models/patient.model"); const { DicomJsonModel } = require("../../models/DICOM/dicom-json-model"); const { expect } = require("chai"); const _ = require("lodash"); diff --git a/test/patient.mongo.test.js b/test/patient.mongo.test.js index fff93fdd..5e040e44 100644 --- a/test/patient.mongo.test.js +++ b/test/patient.mongo.test.js @@ -1,5 +1,5 @@ const mongoose = require("mongoose"); -const patientModel = require("../models/mongodb/models/patient"); +const patientModel = require("../models/mongodb/models/patient.model"); const { DicomJsonModel } = require("../models/DICOM/dicom-json-model"); const { expect } = require("chai"); const _ = require("lodash"); diff --git a/test/query.test.js b/test/query.test.js index f38a4a2e..062a89fd 100644 --- a/test/query.test.js +++ b/test/query.test.js @@ -4,10 +4,10 @@ const glob = require("glob"); const path = require("path"); const fsP = require("fs/promises"); const { StowRsService } = require("../api/dicom-web/controller/STOW-RS/service/stow-rs.service"); -const patientModel = require("../models/mongodb/models/patient"); -const dicomStudyModel = require("../models/mongodb/models/dicomStudy"); -const dicomSeriesModel = require("../models/mongodb/models/dicomSeries"); -const dicomModel = require("../models/mongodb/models/dicom"); +const patientModel = require("../models/mongodb/models/patient.model"); +const dicomStudyModel = require("../models/mongodb/models/study.model"); +const dicomSeriesModel = require("../models/mongodb/models/series.model"); +const dicomModel = require("../models/mongodb/models/instance.model"); const { expect } = require("chai"); const { convertAllQueryToDICOMTag } = require("../api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service"); const { QueryStudyDicomJsonFactory, QuerySeriesDicomJsonFactory, QueryInstanceDicomJsonFactory } = require("../api/dicom-web/controller/QIDO-RS/service/query-dicom-json-factory"); diff --git a/test/store-instances.test.js b/test/store-instances.test.js index 809799cd..e72c206e 100644 --- a/test/store-instances.test.js +++ b/test/store-instances.test.js @@ -4,10 +4,10 @@ const glob = require("glob"); const path = require("path"); const fsP = require("fs/promises"); const { StowRsService } = require("../api/dicom-web/controller/STOW-RS/service/stow-rs.service"); -const patientModel = require("../models/mongodb/models/patient"); -const dicomStudyModel = require("../models/mongodb/models/dicomStudy"); -const dicomSeriesModel = require("../models/mongodb/models/dicomSeries"); -const dicomModel = require("../models/mongodb/models/dicom"); +const patientModel = require("../models/mongodb/models/patient.model"); +const dicomStudyModel = require("../models/mongodb/models/study.model"); +const dicomSeriesModel = require("../models/mongodb/models/series.model"); +const dicomModel = require("../models/mongodb/models/instance.model"); const { expect } = require("chai"); async function storeDicomInstancesAndGet4Patients() {