Merge pull request #32 from salimkanoun/dev

Dev

BackEnd/controllers/aets.js

@@ -18,4 +18,9 @@ var echoAets = async function (req, res) {
   res.json(answer) 
 }
 
-module.exports = { getAets, changeAets, echoAets }
+var deleteAet = async function (req, res) {
+  let answer = await orthancInstance.removeAet(req.params.name)
+  res.json(answer)
+}
+
+module.exports = { getAets, changeAets, echoAets, deleteAet }

BackEnd/database/migrations/20200201132800-addDefaultUser.js

@@ -7,7 +7,7 @@ module.exports = {
       queryInterface.bulkInsert('Users', [{
         username: 'salim',
         password: hash,
-        admin: false,
+        admin: true,
         createdAt: new Date().toDateString(),
         updatedAt: new Date().toDateString()
       }], {})

BackEnd/model/Orthanc.js

@@ -127,6 +127,16 @@ class Orthanc {
     return requestPromise
   }
 
+  removeAet(name){
+    let self = this
+    const requestPromise = request.delete(self._createOptions('DELETE', '/modalities/' + name)).then(function (body) {
+      return true
+    }).catch((error) => { console.log('Error put AET ' + error) })
+
+    return requestPromise
+
+  }
+
   echoAet(name){
     const self = this
     const requestPromise = request.post(self._createOptions('POST', '/modalities/' + name + '/echo', JSON.stringify({}))).then(function (body) {

BackEnd/model/RetrieveItem.js

@@ -1,4 +1,5 @@
 class RetrieveItem {
+
   constructor (level, patientName, patientId, studyDate, modality, studyDescription, accessionNb, aet) {
     this.level = level
     this.patientName = patientName
@@ -8,6 +9,7 @@ class RetrieveItem {
     this.studyDescription = studyDescription
     this.accessionNb = accessionNb
     this.aet = aet
+    this.status = RetrieveItem.STATUS_IDLE
   }
 
   setRetrievedOrthancId (orthancId) {
@@ -18,6 +20,15 @@ class RetrieveItem {
     return this.retrievedOrthancId
   }
 
+  setStatus(status){
+    this.status = status
+  }
+
+  getStatus(){
+    return this.status
+  }
+
+
   toJSON () {
     return {
       level: this.level,
@@ -27,9 +38,15 @@ class RetrieveItem {
       modality: this.modality,
       studyDescription: this.studyDescription,
       accessionNb: this.accessionNb,
-      aet: this.aet
+      aet: this.aet,
+      status : this.status
     }
   }
 }
 
+RetrieveItem.STATUS_IDLE = 'Idle';
+RetrieveItem.STATUS_RETRIVING = 'Retrieving';
+RetrieveItem.STATUS_RETRIEVED = 'Retrieved';
+RetrieveItem.STATUS_FAILURE = 'Failure';
+
 module.exports = RetrieveItem

BackEnd/model/RetrieveRobot.js

@@ -1,5 +1,6 @@
 const schedule = require('node-schedule')
 const Options = require('./Options')
+const RetrieveItem = require('./RetrieveItem')
 
 class RetrieveRobot {
   constructor (orthancObject) {
@@ -89,19 +90,27 @@ class RetrieveRobot {
       const job = this.robotJobs[usersRobots[i]]
 
       for (let i = 0; i < job.retrieveList.length; i++) {
-        const studyData = job.retrieveList[i]
-        console.log(studyData)
+        const retrieveItem = job.getRetriveItem(i)
+        console.log(retrieveItem)
 
-        robot.orthancObject.buildDicomQuery(studyData.level, studyData.patientName, studyData.patientId, studyData.studyDate + '-' + studyData.studyDate,
-          studyData.modality, studyData.studyDescription, studyData.accessionNb)
+        robot.orthancObject.buildDicomQuery(retrieveItem.level, retrieveItem.patientName, retrieveItem.patientId, retrieveItem.studyDate + '-' + retrieveItem.studyDate,
+        retrieveItem.modality, retrieveItem.studyDescription, retrieveItem.accessionNb)
 
-        const answerDetails = await robot.orthancObject.makeDicomQuery(studyData.aet)
+        job.getRetriveItem(i).setStatus(RetrieveItem.STATUS_RETRIVING)
+        const answerDetails = await robot.orthancObject.makeDicomQuery(retrieveItem.aet)
 
-        for (const answer of answerDetails) {
+        if (answerDetails.length === 1 ) {
+          let answer = answerDetails[0]
           const retrieveAnswer = await robot.orthancObject.makeRetrieve(answer.answerId, answer.answerNumber, robot.aetDestination, true)
-          console.log(retrieveAnswer)
           const orthancResults = await robot.orthancObject.findInOrthancByUid(retrieveAnswer.Query[0]['0020,000d'])
-          job.getRetriveItem(i).setRetrievedOrthancId(orthancResults[0])
+
+          if(orthancResults.length === 1){
+            job.getRetriveItem(i).setStatus(RetrieveItem.STATUS_RETRIEVED)
+            job.getRetriveItem(i).setRetrievedOrthancId(orthancResults[0])
+          }else{
+            job.getRetriveItem(i).setStatus(RetrieveItem.STATUS_FAILURE)
+          }
+
         }
       }
     }

BackEnd/routes/index.js

@@ -5,7 +5,7 @@ require('express-async-errors')
 
 const { getRobotDetails, createRobot, deleteRobotJob, removeQueryFromJob } = require('../controllers/Robot')
 const { changeSchedule , getSchedule } = require('../controllers/options')
-const { getAets, changeAets, echoAets} = require('../controllers/aets')
+const { getAets, changeAets, echoAets, deleteAet} = require('../controllers/aets')
 const { getJobData } = require('../controllers/jobDetails')
 const { authentication } = require('../controllers/authentication')
 const { postQuery } = require('../controllers/queryAction')
@@ -38,5 +38,6 @@ router.put('/options', [userAuthMidelware, userAdminMidelware], changeSchedule)
 router.put('/aets', [userAuthMidelware, userAdminMidelware] , changeAets)
 router.get('/aets', userAuthMidelware , getAets)
 router.get('/aets/:name/echo', [userAuthMidelware,  userAdminMidelware] , echoAets)
+router.delete('/aets/:name', [userAuthMidelware,userAdminMidelware], deleteAet) 
 
 module.exports = router

BackEnd/spec/OrthancSpec.js

@@ -0,0 +1,21 @@
+const Orthanc = require('../model/Orthanc')
+
+describe('Test Orthanc', () =>{
+
+    var orthanc=null
+
+    beforeEach(function() {
+
+        orthanc = new Orthanc()
+
+        spyOn(orthanc, "removeAet").and.returnValue(true);
+
+      });
+
+    it('should Remove Orthanc AET', async () => {
+
+        expect(orthanc.removeAet()).toBe(true)
+
+    })
+
+})

BackEnd/spec/RetrieveItemSpec.js

@@ -0,0 +1,34 @@
+const RetrieveItem = require('../model/RetrieveItem')
+
+describe('Testing Retrieve Item', () =>{
+
+    let retrieveItem = new RetrieveItem('study', 'Name', 'id', '20180101', 'CT', 'Description', 'Accession', 'self')
+
+    it('should create Retrieve Item', async () => {
+        expect(retrieveItem).toBeInstanceOf(RetrieveItem)
+    })
+
+    it('should change retrieve status', () => {
+        retrieveItem.setStatus(RetrieveItem.STATUS_RETRIVING)
+        expect(retrieveItem.getStatus()).toBe(RetrieveItem.STATUS_RETRIVING)
+    })
+
+    it('should set Orthanc ID', () => {
+        retrieveItem.setRetrievedOrthancId('123456789');
+        expect(retrieveItem.getRetrievedOrthancId()).toBe('123456789')
+    })
+
+    it('should return correct JSON', () => {
+        expect(retrieveItem.toJSON()).toEqual({
+            level: 'study',
+            patientName: 'Name',
+            patientId: 'id',
+            studyDate: '20180101',
+            modality: 'CT',
+            studyDescription: 'Description',
+            accessionNb: 'Accession',
+            aet: 'self',
+            status : RetrieveItem.STATUS_RETRIVING
+        })
+    })
+})