Skip to content

Commit b7c00c5

Browse files
neildsouthneildsouth
committed
merge in
Signed-off-by: Neil South <[email protected]>
2 parents 1e4b5a9 + a7df6ff commit b7c00c5

File tree

5 files changed

+147
-4
lines changed

5 files changed

+147
-4
lines changed

‎src/Api/Hl7ApplicationConfigEntity.cs

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
using System;
1818
using System.Collections.Generic;
19+
using System.ComponentModel;
1920
using System.ComponentModel.DataAnnotations;
2021
using System.Linq;
2122
using FellowOakDicom;

‎src/Database/EntityFramework/InformaticsGatewayContext.cs

-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public InformaticsGatewayContext(DbContextOptions<InformaticsGatewayContext> opt
4646

4747
public virtual DbSet<Hl7ApplicationConfigEntity> Hl7ApplicationConfig { get; set; }
4848

49-
5049
protected override void OnModelCreating(ModelBuilder modelBuilder)
5150
{
5251
base.OnModelCreating(modelBuilder);
@@ -59,8 +58,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
5958
modelBuilder.ApplyConfiguration(new StorageMetadataWrapperEntityConfiguration());
6059
modelBuilder.ApplyConfiguration(new DicomAssociationInfoConfiguration());
6160
modelBuilder.ApplyConfiguration(new VirtualApplicationEntityConfiguration());
62-
modelBuilder.ApplyConfiguration(new ExternalAppDetailsConfiguration());
63-
modelBuilder.ApplyConfiguration(new Hl7ApplicationConfigConfiguration());
6461
}
6562

6663
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)

‎src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public async Task NotifyAsync(Payload payload, ActionBlock<Payload> notification
7373

7474
try
7575
{
76-
using var loggerScope = _logger.BeginScope(new LoggingDataDictionary<string, object> { { "Payload", payload.PayloadId }, { "CorrelationId", payload.CorrelationId } });
76+
using var loggerScope = _logger.BeginScope(new Api.LoggingDataDictionary<string, object> { { "Payload", payload.PayloadId }, { "CorrelationId", payload.CorrelationId } });
7777
await NotifyPayloadReady(payload).ConfigureAwait(false);
7878
await DeletePayload(payload, cancellationToken).ConfigureAwait(false);
7979
}

‎src/InformaticsGateway/Services/Scp/ApplicationEntityHandler.cs

+6
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,12 @@ public async Task<string> HandleInstanceAsync(DicomCStoreRequest request, string
142142
}
143143
}
144144

145+
if (ArtifactTypes.Validate(modality) && Enum.TryParse(modality, out ArtifactType parsedArtifactType))
146+
{
147+
dicomInfo.DataOrigin.ArtifactType = parsedArtifactType;
148+
}
149+
}
150+
145151
var result = await _pluginEngine.ExecutePlugInsAsync(request.File, dicomInfo).ConfigureAwait(false);
146152

147153
using var scope = _logger.BeginScope(new Api.LoggingDataDictionary<string, object>() { { "CorrelationId", dicomInfo.CorrelationId } });

‎src/InformaticsGateway/packages.lock.json

+139
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,16 @@
7676
"Swashbuckle.AspNetCore.SwaggerUI": "6.5.0"
7777
}
7878
},
79+
"AideDicomTools": {
80+
"type": "Transitive",
81+
"resolved": "0.1.1-rc0062",
82+
"contentHash": "9m4nJ5FyKCdmj/hcnPxwKVgerZbxsBT4imyLUmfK+0S+CuRsGurXOVxH3ePKBq8tUbdzv/72pQV1ZaLa8+qj5g==",
83+
"dependencies": {
84+
"Microsoft.Extensions.Configuration": "6.0.0",
85+
"MongoDB.Driver": "2.21.0",
86+
"fo-dicom": "5.1.1"
87+
}
88+
},
7989
"Ardalis.GuardClauses": {
8090
"type": "Transitive",
8191
"resolved": "4.1.1",
@@ -289,6 +299,24 @@
289299
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0"
290300
}
291301
},
302+
"Microsoft.Extensions.Configuration.CommandLine": {
303+
"type": "Transitive",
304+
"resolved": "6.0.0",
305+
"contentHash": "3nL1qCkZ1Oxx14ZTzgo4MmlO7tso7F+TtMZAY2jUAtTLyAcDp+EDjk3RqafoKiNaePyPvvlleEcBxh3b2Hzl1g==",
306+
"dependencies": {
307+
"Microsoft.Extensions.Configuration": "6.0.0",
308+
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0"
309+
}
310+
},
311+
"Microsoft.Extensions.Configuration.EnvironmentVariables": {
312+
"type": "Transitive",
313+
"resolved": "6.0.1",
314+
"contentHash": "pnyXV1LFOsYjGveuC07xp0YHIyGq7jRq5Ncb5zrrIieMLWVwgMyYxcOH0jTnBedDT4Gh1QinSqsjqzcieHk1og==",
315+
"dependencies": {
316+
"Microsoft.Extensions.Configuration": "6.0.0",
317+
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0"
318+
}
319+
},
292320
"Microsoft.Extensions.Configuration.FileExtensions": {
293321
"type": "Transitive",
294322
"resolved": "6.0.0",
@@ -313,6 +341,17 @@
313341
"System.Text.Json": "6.0.0"
314342
}
315343
},
344+
"Microsoft.Extensions.Configuration.UserSecrets": {
345+
"type": "Transitive",
346+
"resolved": "6.0.1",
347+
"contentHash": "Fy8yr4V6obi7ZxvKYI1i85jqtwMq8tqyxQVZpRSkgeA8enqy/KvBIMdcuNdznlxQMZa72mvbHqb7vbg4Pyx95w==",
348+
"dependencies": {
349+
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
350+
"Microsoft.Extensions.Configuration.Json": "6.0.0",
351+
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
352+
"Microsoft.Extensions.FileProviders.Physical": "6.0.0"
353+
}
354+
},
316355
"Microsoft.Extensions.DependencyInjection": {
317356
"type": "Transitive",
318357
"resolved": "6.0.1",
@@ -388,6 +427,34 @@
388427
"resolved": "6.0.0",
389428
"contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw=="
390429
},
430+
"Microsoft.Extensions.Hosting": {
431+
"type": "Transitive",
432+
"resolved": "6.0.1",
433+
"contentHash": "hbmizc9KPWOacLU8Z8YMaBG6KWdZFppczYV/KwnPGU/8xebWxQxdDeJmLOgg968prb7g2oQgnp6JVLX6lgby8g==",
434+
"dependencies": {
435+
"Microsoft.Extensions.Configuration": "6.0.0",
436+
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
437+
"Microsoft.Extensions.Configuration.Binder": "6.0.0",
438+
"Microsoft.Extensions.Configuration.CommandLine": "6.0.0",
439+
"Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1",
440+
"Microsoft.Extensions.Configuration.FileExtensions": "6.0.0",
441+
"Microsoft.Extensions.Configuration.Json": "6.0.0",
442+
"Microsoft.Extensions.Configuration.UserSecrets": "6.0.1",
443+
"Microsoft.Extensions.DependencyInjection": "6.0.0",
444+
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
445+
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
446+
"Microsoft.Extensions.FileProviders.Physical": "6.0.0",
447+
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
448+
"Microsoft.Extensions.Logging": "6.0.0",
449+
"Microsoft.Extensions.Logging.Abstractions": "6.0.0",
450+
"Microsoft.Extensions.Logging.Configuration": "6.0.0",
451+
"Microsoft.Extensions.Logging.Console": "6.0.0",
452+
"Microsoft.Extensions.Logging.Debug": "6.0.0",
453+
"Microsoft.Extensions.Logging.EventLog": "6.0.0",
454+
"Microsoft.Extensions.Logging.EventSource": "6.0.0",
455+
"Microsoft.Extensions.Options": "6.0.0"
456+
}
457+
},
391458
"Microsoft.Extensions.Hosting.Abstractions": {
392459
"type": "Transitive",
393460
"resolved": "6.0.0",
@@ -430,6 +497,55 @@
430497
"Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0"
431498
}
432499
},
500+
"Microsoft.Extensions.Logging.Console": {
501+
"type": "Transitive",
502+
"resolved": "6.0.0",
503+
"contentHash": "gsqKzOEdsvq28QiXFxagmn1oRB9GeI5GgYCkoybZtQA0IUb7QPwf1WmN3AwJeNIsadTvIFQCiVK0OVIgKfOBGg==",
504+
"dependencies": {
505+
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
506+
"Microsoft.Extensions.Logging": "6.0.0",
507+
"Microsoft.Extensions.Logging.Abstractions": "6.0.0",
508+
"Microsoft.Extensions.Logging.Configuration": "6.0.0",
509+
"Microsoft.Extensions.Options": "6.0.0",
510+
"System.Text.Json": "6.0.0"
511+
}
512+
},
513+
"Microsoft.Extensions.Logging.Debug": {
514+
"type": "Transitive",
515+
"resolved": "6.0.0",
516+
"contentHash": "M9g/JixseSZATJE9tcMn9uzoD4+DbSglivFqVx8YkRJ7VVPmnvCEbOZ0AAaxsL1EKyI4cz07DXOOJExxNsUOHw==",
517+
"dependencies": {
518+
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
519+
"Microsoft.Extensions.Logging": "6.0.0",
520+
"Microsoft.Extensions.Logging.Abstractions": "6.0.0"
521+
}
522+
},
523+
"Microsoft.Extensions.Logging.EventLog": {
524+
"type": "Transitive",
525+
"resolved": "6.0.0",
526+
"contentHash": "rlo0RxlMd0WtLG3CHI0qOTp6fFn7MvQjlrCjucA31RqmiMFCZkF8CHNbe8O7tbBIyyoLGWB1he9CbaA5iyHthg==",
527+
"dependencies": {
528+
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
529+
"Microsoft.Extensions.Logging": "6.0.0",
530+
"Microsoft.Extensions.Logging.Abstractions": "6.0.0",
531+
"Microsoft.Extensions.Options": "6.0.0",
532+
"System.Diagnostics.EventLog": "6.0.0"
533+
}
534+
},
535+
"Microsoft.Extensions.Logging.EventSource": {
536+
"type": "Transitive",
537+
"resolved": "6.0.0",
538+
"contentHash": "BeDyyqt7nkm/nr+Gdk+L8n1tUT/u33VkbXAOesgYSNsxDM9hJ1NOBGoZfj9rCbeD2+9myElI6JOVVFmnzgeWQA==",
539+
"dependencies": {
540+
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
541+
"Microsoft.Extensions.Logging": "6.0.0",
542+
"Microsoft.Extensions.Logging.Abstractions": "6.0.0",
543+
"Microsoft.Extensions.Options": "6.0.0",
544+
"Microsoft.Extensions.Primitives": "6.0.0",
545+
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
546+
"System.Text.Json": "6.0.0"
547+
}
548+
},
433549
"Microsoft.Extensions.Options": {
434550
"type": "Transitive",
435551
"resolved": "6.0.0",
@@ -956,6 +1072,11 @@
9561072
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
9571073
}
9581074
},
1075+
"System.Diagnostics.EventLog": {
1076+
"type": "Transitive",
1077+
"resolved": "6.0.0",
1078+
"contentHash": "lcyUiXTsETK2ALsZrX+nWuHSIQeazhqPphLfaRxzdGaG93+0kELqpgEHtwWOlQe7+jSFnKwaCAgL4kjeZCQJnw=="
1079+
},
9591080
"System.Diagnostics.Tools": {
9601081
"type": "Transitive",
9611082
"resolved": "4.3.0",
@@ -1677,6 +1798,24 @@
16771798
"resolved": "0.6.2",
16781799
"contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw=="
16791800
},
1801+
"monai-deploy-informatics-gateway-pseudonymisation": {
1802+
"type": "Project",
1803+
"dependencies": {
1804+
"AideDicomTools": "[0.1.1-rc0062, )",
1805+
"Ardalis.GuardClauses": "[4.1.1, )",
1806+
"Microsoft.EntityFrameworkCore": "[6.0.22, )",
1807+
"Microsoft.EntityFrameworkCore.Relational": "[6.0.22, )",
1808+
"Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )",
1809+
"Microsoft.Extensions.Configuration": "[6.0.0, )",
1810+
"Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )",
1811+
"Microsoft.Extensions.Configuration.Json": "[6.0.0, )",
1812+
"Microsoft.Extensions.Hosting": "[6.0.1, )",
1813+
"MongoDB.Driver": "[2.21.0, )",
1814+
"NLog": "[5.2.3, )",
1815+
"Polly": "[7.2.4, )",
1816+
"fo-dicom": "[5.1.1, )"
1817+
}
1818+
},
16801819
"monai.deploy.informaticsgateway.api": {
16811820
"type": "Project",
16821821
"dependencies": {

0 commit comments

Comments
 (0)