Merge pull request #391 from Project-MONAI/patch/0.3.18

woodheadio · web-flow · commit 13a6e83cfd16 · 2023-05-12T10:24:02.000+01:00
Patch/0.3.18
diff --git a/.github/.gitversion.yml b/.github/.gitversion.yml
@@ -29,4 +29,4 @@ branches:
 ignore:
   sha: []
 merge-message-formats: {}
-next-version: 0.3.16
+next-version: 0.3.17
diff --git a/docs/api/rest/config.md b/docs/api/rest/config.md
@@ -345,6 +345,45 @@ curl --location --request GET 'http://localhost:5000/config/source/USEAST'
 
 ---
 
+## GET /config/source/aetitle/{aeTitle}
+
+Returns configurations for the specified calling (source) AET.
+
+### Parameters
+
+| Name | Type   | Description                                |
+| ---- | ------ | ------------------------------------------ |
+| name | string | The aeTitle of an AE Title to be retrieved. |
+
+### Responses
+
+Response Content Type: JSON - [SourceApplicationEntity[]](xref:Monai.Deploy.InformaticsGateway.Api.SourceApplicationEntity).
+
+| Code | Description                                                                                                                             |
+| ---- | --------------------------------------------------------------------------------------------------------------------------------------- |
+| 200  | AE Titles retrieved successfully.                                                                                                       |
+| 404  | Named source not found.                                                                                                                    |
+| 500  | Server error. The response will be a [Problem details](https://datatracker.ietf.org/doc/html/rfc7807) object with server error details. |
+
+### Example Request
+
+```bash
+curl --location --request GET 'http://localhost:5000/config/source/aetitle/USEAST'
+```
+
+### Example Response
+
+```json
+[{
+  "name": "USEAST",
+  "aeTitle": "PACSUSEAST",
+  "hostIp": "10.20.3.4"
+},
+{...}]
+```
+
+---
+
 ## POST /config/source
 
 Adds a new calling (source) AE Title to the Informatics Gateway to allow DICOM instances from the specified IP address and AE Title.
diff --git a/docs/index.md b/docs/index.md
@@ -14,7 +14,7 @@
   ~ limitations under the License.
 -->
 
-# MONAI Deploy Informatics Gateway <small>v0.0.0</small>
+# MONAI Deploy Informatics Gateway
 
 ![NVIDIA](./images/MONAI-logo_color.svg)
 
diff --git a/src/Common/packages.lock.json b/src/Common/packages.lock.json
@@ -34,12 +34,6 @@
         "resolved": "17.2.3",
         "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ=="
       },
-      "System.IO.Abstractions": {
-        "type": "Direct",
-        "requested": "[17.2.3, )",
-        "resolved": "17.2.3",
-        "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ=="
-      },
       "System.Threading.Tasks.Dataflow": {
         "type": "Direct",
         "requested": "[6.0.0, )",
diff --git a/src/Database/Api/Repositories/ISourceApplicationEntityRepository.cs b/src/Database/Api/Repositories/ISourceApplicationEntityRepository.cs
@@ -25,6 +25,8 @@ public interface ISourceApplicationEntityRepository
 
         Task<SourceApplicationEntity?> FindByNameAsync(string name, CancellationToken cancellationToken = default);
 
+        Task<SourceApplicationEntity[]?> FindByAETAsync(string name, CancellationToken cancellationToken = default);
+
         Task<SourceApplicationEntity> AddAsync(SourceApplicationEntity item, CancellationToken cancellationToken = default);
 
         Task<SourceApplicationEntity> UpdateAsync(SourceApplicationEntity entity, CancellationToken cancellationToken = default);
diff --git a/src/Database/EntityFramework/Repositories/SourceApplicationEntityRepository.cs b/src/Database/EntityFramework/Repositories/SourceApplicationEntityRepository.cs
@@ -87,6 +87,16 @@ public async Task<bool> ContainsAsync(Expression<Func<SourceApplicationEntity, b
             }).ConfigureAwait(false);
         }
 
+        public async Task<SourceApplicationEntity[]?> FindByAETAsync(string aeTitle, CancellationToken cancellationToken = default)
+        {
+            Guard.Against.NullOrWhiteSpace(aeTitle);
+
+            return await _retryPolicy.ExecuteAsync(async () =>
+            {
+                return await _dataset.Where(p => p.AeTitle.Equals(aeTitle)).ToArrayAsync(cancellationToken).ConfigureAwait(false);
+            }).ConfigureAwait(false);
+        }
+
         public async Task<SourceApplicationEntity> RemoveAsync(SourceApplicationEntity entity, CancellationToken cancellationToken = default)
         {
             Guard.Against.Null(entity);
diff --git a/src/Database/EntityFramework/Test/SourceApplicationEntityRepositoryTest.cs b/src/Database/EntityFramework/Test/SourceApplicationEntityRepositoryTest.cs
@@ -108,6 +108,20 @@ public async Task GivenAAETitleName_WhenFindByNameAsyncIsCalled_ExpectItToReturn
             Assert.Null(actual);
         }
 
+        [Fact]
+        public async Task GivenAAETitleName_WhenFindByAETAsyncIsCalled_ExpectItToReturnMatchingEntity()
+        {
+            var store = new SourceApplicationEntityRepository(_serviceScopeFactory.Object, _logger.Object, _options);
+
+            var actual = await store.FindByAETAsync("AET1").ConfigureAwait(false);
+            Assert.NotNull(actual);
+            Assert.Equal("AET1", actual.FirstOrDefault()!.AeTitle);
+            Assert.Equal("AET1", actual.FirstOrDefault()!.Name);
+
+            actual = await store.FindByAETAsync("AET6").ConfigureAwait(false);
+            Assert.Empty(actual);
+        }
+
         [Fact]
         public async Task GivenASourceApplicationEntity_WhenRemoveIsCalled_ExpectItToDeleted()
         {
diff --git a/src/Database/MongoDB/Integration.Test/SourceApplicationEntityRepositoryTest.cs b/src/Database/MongoDB/Integration.Test/SourceApplicationEntityRepositoryTest.cs
@@ -113,6 +113,20 @@ public async Task GivenAAETitleName_WhenFindByNameAsyncIsCalled_ExpectItToReturn
             Assert.Null(actual);
         }
 
+        [Fact]
+        public async Task GivenAETitle_WhenFindByAETitleAsyncIsCalled_ExpectItToReturnMatchingEntity()
+        {
+            var store = new SourceApplicationEntityRepository(_serviceScopeFactory.Object, _logger.Object, _options, _databaseFixture.Options);
+
+            var actual = await store.FindByAETAsync("AET1").ConfigureAwait(false);
+            Assert.NotNull(actual);
+            Assert.Equal("AET1", actual.FirstOrDefault()!.AeTitle);
+            Assert.Equal("AET1", actual.FirstOrDefault()!.Name);
+
+            actual = await store.FindByAETAsync("AET6").ConfigureAwait(false);
+            Assert.Empty(actual);
+        }
+
         [Fact]
         public async Task GivenASourceApplicationEntity_WhenRemoveIsCalled_ExpectItToDeleted()
         {
@@ -158,5 +172,7 @@ public async Task GivenASourceApplicationEntity_WhenUpdatedIsCalled_ExpectItToSa
             Assert.NotNull(dbResult);
             Assert.Equal(expected.AeTitle, dbResult!.AeTitle);
         }
+
+
     }
 }
diff --git a/src/Database/MongoDB/Repositories/SourceApplicationEntityRepository.cs b/src/Database/MongoDB/Repositories/SourceApplicationEntityRepository.cs
@@ -97,6 +97,16 @@ public async Task<List<SourceApplicationEntity>> ToListAsync(CancellationToken c
             }).ConfigureAwait(false);
         }
 
+        public async Task<SourceApplicationEntity[]?> FindByAETAsync(string aeTitle, CancellationToken cancellationToken = default)
+        {
+            return await _retryPolicy.ExecuteAsync(async () =>
+            {
+                return (await _collection
+                    .Find(x => x.AeTitle == aeTitle)
+                    .ToListAsync(cancellationToken).ConfigureAwait(false)).ToArray();
+            }).ConfigureAwait(false);
+        }
+
         public async Task<SourceApplicationEntity> AddAsync(SourceApplicationEntity item, CancellationToken cancellationToken = default)
         {
             Guard.Against.Null(item);
diff --git a/src/DicomWebClient/packages.lock.json b/src/DicomWebClient/packages.lock.json
@@ -1248,8 +1248,8 @@
       "monai.deploy.informaticsgateway.client.common": {
         "type": "Project",
         "dependencies": {
-          "Ardalis.GuardClauses": "4.0.1",
-          "System.Text.Json": "6.0.7"
+          "Ardalis.GuardClauses": "[4.0.1, )",
+          "System.Text.Json": "[6.0.7, )"
         }
       }
     }
diff --git a/src/InformaticsGateway/Services/Http/SourceAeTitleController.cs b/src/InformaticsGateway/Services/Http/SourceAeTitleController.cs
@@ -88,6 +88,32 @@ public async Task<ActionResult<SourceApplicationEntity>> GetAeTitle(string name)
             }
         }
 
+        [HttpGet("/aetitle/{aeTitle}")]
+        [Produces("application/json")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        [ActionName(nameof(GetAeTitleByAET))]
+        public async Task<ActionResult<SourceApplicationEntity>> GetAeTitleByAET(string aeTitle)
+        {
+            try
+            {
+                var sourceApplicationEntity = await _repository.FindByAETAsync(aeTitle, HttpContext.RequestAborted).ConfigureAwait(false);
+
+                if (sourceApplicationEntity is null)
+                {
+                    return NotFound();
+                }
+
+                return Ok(sourceApplicationEntity);
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorListingSourceApplicationEntities(ex);
+                return Problem(title: "Error querying DICOM sources.", statusCode: (int)System.Net.HttpStatusCode.InternalServerError, detail: ex.Message);
+            }
+        }
+
         [HttpPost]
         [Consumes(MediaTypeNames.Application.Json)]
         [ProducesResponseType(StatusCodes.Status201Created)]
diff --git a/src/InformaticsGateway/Test/Services/Http/SourceAeTitleControllerTest.cs b/src/InformaticsGateway/Test/Services/Http/SourceAeTitleControllerTest.cs
@@ -145,6 +145,27 @@ public async Task GetAeTitle_ReturnsAMatch()
             _repository.Verify(p => p.FindByNameAsync(value, It.IsAny<CancellationToken>()), Times.Once());
         }
 
+        [RetryFact(5, 250, DisplayName = "GetAeTitle - Shall return matching object")]
+        public async Task GetAeTitle_ViaAETitleReturnsAMatch()
+        {
+            var value = "AET";
+            _repository.Setup(p => p.FindByAETAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns(
+                Task.FromResult(
+                new SourceApplicationEntity[]{
+                new SourceApplicationEntity
+                {
+                    AeTitle = value,
+                    HostIp = "host",
+                    Name = $"{value}name",
+                }}));
+
+            var result = await _controller.GetAeTitleByAET(value);
+            var okObjectResult = result.Result as OkObjectResult;
+            var response = okObjectResult.Value as SourceApplicationEntity[];
+            Assert.Equal(value, response.FirstOrDefault().AeTitle);
+            _repository.Verify(p => p.FindByAETAsync(value, It.IsAny<CancellationToken>()), Times.Once());
+        }
+
         [RetryFact(5, 250, DisplayName = "GetAeTitle - Shall return 404 if not found")]
         public async Task GetAeTitle_Returns404IfNotFound()
         {
@@ -175,6 +196,24 @@ public async Task GetAeTitle_ShallReturnProblemOnFailure()
             _repository.Verify(p => p.FindByNameAsync(value, It.IsAny<CancellationToken>()), Times.Once());
         }
 
+        [RetryFact(5, 250, DisplayName = "GetAeTitle from AETitle - Shall return problem on failure")]
+        public async Task GetAeTitleViaAETitle_ShallReturnProblemOnFailure()
+        {
+            var value = "AET";
+            _repository.Setup(p => p.FindByAETAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).Throws(new Exception("error"));
+
+            var result = await _controller.GetAeTitleByAET(value);
+
+            var objectResult = result.Result as ObjectResult;
+            Assert.NotNull(objectResult);
+            var problem = objectResult.Value as ProblemDetails;
+            Assert.NotNull(problem);
+            Assert.Equal("Error querying DICOM sources.", problem.Title);
+            Assert.Equal("error", problem.Detail);
+            Assert.Equal((int)HttpStatusCode.InternalServerError, problem.Status);
+            _repository.Verify(p => p.FindByAETAsync(value, It.IsAny<CancellationToken>()), Times.Once());
+        }
+
         #endregion GetAeTitle
 
         #region Create
diff --git a/src/InformaticsGateway/appsettings.Development.json b/src/InformaticsGateway/appsettings.Development.json
@@ -17,15 +17,15 @@
     "messaging": {
       "publisherSettings": {
         "endpoint": "localhost",
-        "username": "rabbitmq",
-        "password": "rabbitmq",
+        "username": "admin",
+        "password": "admin",
         "virtualHost": "monaideploy",
         "exchange": "monaideploy"
       },
       "subscriberSettings": {
         "endpoint": "localhost",
-        "username": "rabbitmq",
-        "password": "rabbitmq",
+        "username": "admin",
+        "password": "admin",
         "virtualHost": "monaideploy",
         "exchange": "monaideploy",
         "exportRequestQueue": "export_tasks"

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,20 @@ public async Task GivenAAETitleName_WhenFindByNameAsyncIsCalled_ExpectItToReturn`
`113`	`113`	`Assert.Null(actual);`
`114`	`114`	`}`
`115`	`115`
	`116`	`+ [Fact]`
	`117`	`+ public async Task GivenAETitle_WhenFindByAETitleAsyncIsCalled_ExpectItToReturnMatchingEntity()`
	`118`	`+ {`
	`119`	`+ var store = new SourceApplicationEntityRepository(_serviceScopeFactory.Object, _logger.Object, _options, _databaseFixture.Options);`
	`120`	`+`
	`121`	`+ var actual = await store.FindByAETAsync("AET1").ConfigureAwait(false);`
	`122`	`+ Assert.NotNull(actual);`
	`123`	`+ Assert.Equal("AET1", actual.FirstOrDefault()!.AeTitle);`
	`124`	`+ Assert.Equal("AET1", actual.FirstOrDefault()!.Name);`
	`125`	`+`
	`126`	`+ actual = await store.FindByAETAsync("AET6").ConfigureAwait(false);`
	`127`	`+ Assert.Empty(actual);`
	`128`	`+ }`
	`129`	`+`
`116`	`130`	`[Fact]`
`117`	`131`	`public async Task GivenASourceApplicationEntity_WhenRemoveIsCalled_ExpectItToDeleted()`
`118`	`132`	`{`
`@@ -158,5 +172,7 @@ public async Task GivenASourceApplicationEntity_WhenUpdatedIsCalled_ExpectItToSa`
`158`	`172`	`Assert.NotNull(dbResult);`
`159`	`173`	`Assert.Equal(expected.AeTitle, dbResult!.AeTitle);`
`160`	`174`	`}`
	`175`	`+`
	`176`	`+`
`161`	`177`	`}`
`162`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1248,8 +1248,8 @@`
`1248`	`1248`	`"monai.deploy.informaticsgateway.client.common": {`
`1249`	`1249`	`"type": "Project",`
`1250`	`1250`	`"dependencies": {`
`1251`		`- "Ardalis.GuardClauses": "4.0.1",`
`1252`		`- "System.Text.Json": "6.0.7"`
	`1251`	`+ "Ardalis.GuardClauses": "[4.0.1, )",`
	`1252`	`+ "System.Text.Json": "[6.0.7, )"`
`1253`	`1253`	`}`
`1254`	`1254`	`}`
`1255`	`1255`	`}`