Skip to content

Commit d27c8e3

Browse files
woodheadiowoodheadio
authored
Merge pull request #392 from Project-MONAI/samrooke/source-get-by-aetitle-fix
update get source by aetitle endpoint
2 parents 6a87247 + e67c4e4 commit d27c8e3

File tree

5 files changed

+253
-249
lines changed

5 files changed

+253
-249
lines changed

‎src/Client/Test/packages.lock.json‎

Lines changed: 85 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,140 +1669,141 @@
16691669
"monai.deploy.informaticsgateway": {
16701670
"type": "Project",
16711671
"dependencies": {
1672-
"Ardalis.GuardClauses": "[4.0.1, )",
1673-
"DotNext.Threading": "[4.7.4, )",
1674-
"HL7-dotnetcore": "[2.35.0, )",
1675-
"Karambolo.Extensions.Logging.File": "[3.4.0, )",
1676-
"Microsoft.EntityFrameworkCore": "[6.0.15, )",
1677-
"Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )",
1678-
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )",
1679-
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.15, )",
1680-
"Microsoft.Extensions.Hosting": "[6.0.1, )",
1681-
"Microsoft.Extensions.Logging": "[6.0.0, )",
1682-
"Microsoft.Extensions.Logging.Console": "[6.0.0, )",
1683-
"Microsoft.Extensions.Options": "[6.0.0, )",
1684-
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
1685-
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
1686-
"Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
1687-
"Monai.Deploy.InformaticsGateway.Database": "[1.0.0, )",
1688-
"Monai.Deploy.InformaticsGateway.Database.EntityFramework": "[1.0.0, )",
1689-
"Monai.Deploy.InformaticsGateway.DicomWeb.Client": "[1.0.0, )",
1690-
"Monai.Deploy.Messaging.RabbitMQ": "[0.1.22, )",
1691-
"Monai.Deploy.Security": "[0.1.3, )",
1692-
"Monai.Deploy.Storage": "[0.2.16, )",
1693-
"Monai.Deploy.Storage.MinIO": "[0.2.16, )",
1694-
"NLog": "[5.1.3, )",
1695-
"NLog.Web.AspNetCore": "[5.2.3, )",
1696-
"Polly": "[7.2.3, )",
1697-
"Swashbuckle.AspNetCore": "[6.5.0, )",
1698-
"fo-dicom": "[5.0.3, )",
1699-
"fo-dicom.NLog": "[5.0.3, )"
1672+
"Ardalis.GuardClauses": "4.0.1",
1673+
"DotNext.Threading": "4.7.4",
1674+
"HL7-dotnetcore": "2.35.0",
1675+
"Karambolo.Extensions.Logging.File": "3.4.0",
1676+
"Microsoft.EntityFrameworkCore": "6.0.15",
1677+
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
1678+
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
1679+
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "6.0.15",
1680+
"Microsoft.Extensions.Hosting": "6.0.1",
1681+
"Microsoft.Extensions.Logging": "6.0.0",
1682+
"Microsoft.Extensions.Logging.Console": "6.0.0",
1683+
"Microsoft.Extensions.Options": "6.0.0",
1684+
"Monai.Deploy.InformaticsGateway.Api": "1.0.0",
1685+
"Monai.Deploy.InformaticsGateway.Common": "1.0.0",
1686+
"Monai.Deploy.InformaticsGateway.Configuration": "1.0.0",
1687+
"Monai.Deploy.InformaticsGateway.Database": "1.0.0",
1688+
"Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0",
1689+
"Monai.Deploy.InformaticsGateway.Database.EntityFramework": "1.0.0",
1690+
"Monai.Deploy.InformaticsGateway.DicomWeb.Client": "1.0.0",
1691+
"Monai.Deploy.Messaging.RabbitMQ": "0.1.22",
1692+
"Monai.Deploy.Security": "0.1.3",
1693+
"Monai.Deploy.Storage": "0.2.16",
1694+
"Monai.Deploy.Storage.MinIO": "0.2.16",
1695+
"NLog": "5.1.3",
1696+
"NLog.Web.AspNetCore": "5.2.3",
1697+
"Polly": "7.2.3",
1698+
"Swashbuckle.AspNetCore": "6.5.0",
1699+
"fo-dicom": "5.0.3",
1700+
"fo-dicom.NLog": "5.0.3"
17001701
}
17011702
},
17021703
"monai.deploy.informaticsgateway.api": {
17031704
"type": "Project",
17041705
"dependencies": {
1705-
"Macross.Json.Extensions": "[3.0.0, )",
1706-
"Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )",
1707-
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
1708-
"Monai.Deploy.Messaging": "[0.1.22, )",
1709-
"Monai.Deploy.Storage": "[0.2.16, )"
1706+
"Macross.Json.Extensions": "3.0.0",
1707+
"Microsoft.EntityFrameworkCore.Abstractions": "6.0.15",
1708+
"Monai.Deploy.InformaticsGateway.Common": "1.0.0",
1709+
"Monai.Deploy.Messaging": "0.1.22",
1710+
"Monai.Deploy.Storage": "0.2.16"
17101711
}
17111712
},
17121713
"monai.deploy.informaticsgateway.client": {
17131714
"type": "Project",
17141715
"dependencies": {
1715-
"Microsoft.AspNet.WebApi.Client": "[5.2.9, )",
1716-
"Microsoft.Extensions.Http": "[6.0.0, )",
1717-
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
1718-
"Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )"
1716+
"Microsoft.AspNet.WebApi.Client": "5.2.9",
1717+
"Microsoft.Extensions.Http": "6.0.0",
1718+
"Monai.Deploy.InformaticsGateway.Api": "1.0.0",
1719+
"Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0"
17191720
}
17201721
},
17211722
"monai.deploy.informaticsgateway.client.common": {
17221723
"type": "Project",
17231724
"dependencies": {
1724-
"Ardalis.GuardClauses": "[4.0.1, )",
1725-
"System.Text.Json": "[6.0.7, )"
1725+
"Ardalis.GuardClauses": "4.0.1",
1726+
"System.Text.Json": "6.0.7"
17261727
}
17271728
},
17281729
"monai.deploy.informaticsgateway.common": {
17291730
"type": "Project",
17301731
"dependencies": {
1731-
"Ardalis.GuardClauses": "[4.0.1, )",
1732-
"System.IO.Abstractions": "[17.2.3, )",
1733-
"System.Threading.Tasks.Dataflow": "[6.0.0, )",
1734-
"fo-dicom": "[5.0.3, )"
1732+
"Ardalis.GuardClauses": "4.0.1",
1733+
"System.IO.Abstractions": "17.2.3",
1734+
"System.Threading.Tasks.Dataflow": "6.0.0",
1735+
"fo-dicom": "5.0.3"
17351736
}
17361737
},
17371738
"monai.deploy.informaticsgateway.configuration": {
17381739
"type": "Project",
17391740
"dependencies": {
1740-
"Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )",
1741-
"Microsoft.Extensions.Options": "[6.0.0, )",
1742-
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
1743-
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
1744-
"Monai.Deploy.Messaging": "[0.1.22, )",
1745-
"Monai.Deploy.Storage": "[0.2.16, )",
1746-
"System.IO.Abstractions": "[17.2.3, )"
1741+
"Microsoft.Extensions.Logging.Abstractions": "6.0.3",
1742+
"Microsoft.Extensions.Options": "6.0.0",
1743+
"Monai.Deploy.InformaticsGateway.Api": "1.0.0",
1744+
"Monai.Deploy.InformaticsGateway.Common": "1.0.0",
1745+
"Monai.Deploy.Messaging": "0.1.22",
1746+
"Monai.Deploy.Storage": "0.2.16",
1747+
"System.IO.Abstractions": "17.2.3"
17471748
}
17481749
},
17491750
"monai.deploy.informaticsgateway.database": {
17501751
"type": "Project",
17511752
"dependencies": {
1752-
"AspNetCore.HealthChecks.MongoDb": "[6.0.2, )",
1753-
"Microsoft.EntityFrameworkCore": "[6.0.15, )",
1754-
"Microsoft.Extensions.Configuration": "[6.0.1, )",
1755-
"Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )",
1756-
"Microsoft.Extensions.Configuration.Json": "[6.0.0, )",
1757-
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.15, )",
1758-
"Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )",
1759-
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
1760-
"Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
1761-
"Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
1762-
"Monai.Deploy.InformaticsGateway.Database.EntityFramework": "[1.0.0, )",
1763-
"Monai.Deploy.InformaticsGateway.Database.MongoDB": "[1.0.0, )"
1753+
"AspNetCore.HealthChecks.MongoDb": "6.0.2",
1754+
"Microsoft.EntityFrameworkCore": "6.0.15",
1755+
"Microsoft.Extensions.Configuration": "6.0.1",
1756+
"Microsoft.Extensions.Configuration.FileExtensions": "6.0.0",
1757+
"Microsoft.Extensions.Configuration.Json": "6.0.0",
1758+
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "6.0.15",
1759+
"Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0",
1760+
"Monai.Deploy.InformaticsGateway.Api": "1.0.0",
1761+
"Monai.Deploy.InformaticsGateway.Configuration": "1.0.0",
1762+
"Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0",
1763+
"Monai.Deploy.InformaticsGateway.Database.EntityFramework": "1.0.0",
1764+
"Monai.Deploy.InformaticsGateway.Database.MongoDB": "1.0.0"
17641765
}
17651766
},
17661767
"monai.deploy.informaticsgateway.database.api": {
17671768
"type": "Project",
17681769
"dependencies": {
1769-
"Microsoft.EntityFrameworkCore": "[6.0.15, )",
1770-
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
1771-
"Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
1772-
"Polly": "[7.2.3, )"
1770+
"Microsoft.EntityFrameworkCore": "6.0.15",
1771+
"Monai.Deploy.InformaticsGateway.Api": "1.0.0",
1772+
"Monai.Deploy.InformaticsGateway.Configuration": "1.0.0",
1773+
"Polly": "7.2.3"
17731774
}
17741775
},
17751776
"monai.deploy.informaticsgateway.database.entityframework": {
17761777
"type": "Project",
17771778
"dependencies": {
1778-
"Microsoft.EntityFrameworkCore": "[6.0.15, )",
1779-
"Microsoft.EntityFrameworkCore.Sqlite": "[6.0.15, )",
1780-
"Microsoft.Extensions.Configuration": "[6.0.1, )",
1781-
"Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )",
1782-
"Microsoft.Extensions.Configuration.Json": "[6.0.0, )",
1783-
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
1784-
"Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
1785-
"Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )"
1779+
"Microsoft.EntityFrameworkCore": "6.0.15",
1780+
"Microsoft.EntityFrameworkCore.Sqlite": "6.0.15",
1781+
"Microsoft.Extensions.Configuration": "6.0.1",
1782+
"Microsoft.Extensions.Configuration.FileExtensions": "6.0.0",
1783+
"Microsoft.Extensions.Configuration.Json": "6.0.0",
1784+
"Monai.Deploy.InformaticsGateway.Api": "1.0.0",
1785+
"Monai.Deploy.InformaticsGateway.Configuration": "1.0.0",
1786+
"Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0"
17861787
}
17871788
},
17881789
"monai.deploy.informaticsgateway.database.mongodb": {
17891790
"type": "Project",
17901791
"dependencies": {
1791-
"Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
1792-
"MongoDB.Driver": "[2.19.1, )",
1793-
"MongoDB.Driver.Core": "[2.19.1, )"
1792+
"Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0",
1793+
"MongoDB.Driver": "2.19.1",
1794+
"MongoDB.Driver.Core": "2.19.1"
17941795
}
17951796
},
17961797
"monai.deploy.informaticsgateway.dicomweb.client": {
17971798
"type": "Project",
17981799
"dependencies": {
1799-
"Ardalis.GuardClauses": "[4.0.1, )",
1800-
"Microsoft.AspNet.WebApi.Client": "[5.2.9, )",
1801-
"Microsoft.Extensions.Http": "[6.0.0, )",
1802-
"Microsoft.Net.Http.Headers": "[2.2.8, )",
1803-
"Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )",
1804-
"System.Linq.Async": "[6.0.1, )",
1805-
"fo-dicom": "[5.0.3, )"
1800+
"Ardalis.GuardClauses": "4.0.1",
1801+
"Microsoft.AspNet.WebApi.Client": "5.2.9",
1802+
"Microsoft.Extensions.Http": "6.0.0",
1803+
"Microsoft.Net.Http.Headers": "2.2.8",
1804+
"Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0",
1805+
"System.Linq.Async": "6.0.1",
1806+
"fo-dicom": "5.0.3"
18061807
}
18071808
}
18081809
}

‎src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<ProjectReference Include="..\Api\Monai.Deploy.InformaticsGateway.Api.csproj" />
8484
<ProjectReference Include="..\Common\Monai.Deploy.InformaticsGateway.Common.csproj" />
8585
<ProjectReference Include="..\Configuration\Monai.Deploy.InformaticsGateway.Configuration.csproj" />
86+
<ProjectReference Include="..\Database\Api\Monai.Deploy.InformaticsGateway.Database.Api.csproj" />
8687
<ProjectReference Include="..\Database\EntityFramework\Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj" />
8788
<ProjectReference Include="..\Database\Monai.Deploy.InformaticsGateway.Database.csproj" />
8889
<ProjectReference Include="..\DicomWebClient\Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj" />

‎src/InformaticsGateway/Services/Http/SourceAeTitleController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public async Task<ActionResult<SourceApplicationEntity>> GetAeTitle(string name)
8888
}
8989
}
9090

91-
[HttpGet("/aetitle/{aeTitle}")]
91+
[HttpGet("aetitle/{aeTitle}")]
9292
[Produces("application/json")]
9393
[ProducesResponseType(StatusCodes.Status200OK)]
9494
[ProducesResponseType(StatusCodes.Status404NotFound)]

0 commit comments

Comments
 (0)