shadab/DicomMigratorApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: shadab:feature/sopmigration
Branches Tags
shadab:master
shadab:release/1.0.0
shadab:feature/migrate_only_sops
shadab:feature/sopmigration
..
compare: shadab:master
Branches Tags
shadab:release/1.0.0
shadab:feature/migrate_only_sops
shadab:feature/sopmigration
shadab:master

No commits in common. "feature/sopmigration" and "master" have entirely different histories.
feature/so ... master

3 changed files with 47 additions and 179 deletions
Show Stats Expand all files Collapse all files

22
Dockerfile
View File

@ -1,22 +0,0 @@
# Use the official .NET SDK image to build the app
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
WORKDIR /app
# Copy the csproj and restore any dependencies
COPY *.csproj ./
RUN dotnet restore
# Copy the entire project and build the app
COPY . ./
RUN dotnet publish -c Release -o out
# Use the official .NET runtime image to run the app
FROM mcr.microsoft.com/dotnet/aspnet:6.0
WORKDIR /app
COPY --from=build-env /app/out .
# Expose port
EXPOSE 80
# Entry point to run the application
ENTRYPOINT ["dotnet", "DicomMigratorApp.dll"]

183
Program.cs
View File

@ -8,7 +8,6 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.DependencyInjection;
using System.Threading;
namespace DicomMigratorApp
{
@ -21,6 +20,7 @@ namespace DicomMigratorApp
private static string targetIP;
private static string senderAET;
private static string targetAET;
private static string folderLocation;
private static int targetPort;
static async Task Main(string[] args)
@ -38,11 +38,12 @@ namespace DicomMigratorApp
_logger.LogInformation("Application started");
connectionString = Environment.GetEnvironmentVariable("ConnectionStrings__DefaultConnection") ?? "";
targetIP = Environment.GetEnvironmentVariable("Dest__IP") ?? "";
senderAET = Environment.GetEnvironmentVariable("Sender__AET") ?? "";
targetAET = Environment.GetEnvironmentVariable("Dest__AET") ?? "";
var targetPortStr = Environment.GetEnvironmentVariable("Dest__Port") ?? "";
connectionString = "Server=127.0.0.1;Port=3306;Database=dms_db;User Id=root;Password=Rootmatrix23@;";
targetIP = "127.0.0.1";
senderAET = "MYAE";
targetAET = "ORTHANC";
folderLocation = "D:\\dicom_imags\\";
var targetPortStr = "4242";
if (!int.TryParse(targetPortStr, out targetPort))
{
@ -50,55 +51,37 @@ namespace DicomMigratorApp
return;
}
while (true)
try
{
var migrationStudy = await GetMigrationStudy(connectionString);
if (migrationStudy == null)
{
_logger.LogInformation("No studies found for migration.");
return;
}
_logger.LogInformation($"Retrieved studyDetails for Migration");
try
{
var migrationStudy = await GetMigrationStudy(connectionString);
if (migrationStudy == null)
{
await Task.Delay(5000);
continue;
}
_logger.LogInformation($"Retrieved study details for migration: {migrationStudy.StudyInstanceUID}");
try
{
var imagePaths = await GetImagePaths(connectionString, migrationStudy.StudyInstanceUID);
foreach (var image in imagePaths)
{
await MigrateImage(image.Path);
await UpdateImagePathStatus(connectionString, image.Id, "MIGRATION_COMPLETE");
}
await UpdateSourceCFind(connectionString, migrationStudy.Id, "MIGRATION_COMPLETE");
}
catch (DicomAssociationRejectedException ex)
{
_logger.LogError(ex, $"Association rejected for studyInstanceUID {migrationStudy.StudyInstanceUID}");
await UpdateSourceCFind(connectionString, migrationStudy.Id, "MIGRATION_ERRORED");
break;
}
catch (Exception ex)
{
_logger.LogError(ex, $"An error occurred while retrieving or saving studyInstanceUID {migrationStudy.StudyInstanceUID}");
await UpdateSourceCFind(connectionString, migrationStudy.Id, "MIGRATION_ERRORED");
break;
}
await MigrateStudy(migrationStudy.StudyInstanceUID, folderLocation + migrationStudy.StudyInstanceUID);
await UpdateSourceCFind(connectionString, migrationStudy.StudyInstanceUID, "MIGRATION_COMPLETE");
}
catch (MySqlException ex)
catch (DicomAssociationRejectedException ex)
{
_logger.LogError(ex, "An error occurred while connecting to the database");
break;
_logger.LogError(ex, $"Association rejected for studyInstanceUID {migrationStudy.StudyInstanceUID}");
await UpdateSourceCFind(connectionString, migrationStudy.StudyInstanceUID, "MIGRATION_ERRORED");
}
catch (Exception ex)
{
_logger.LogError(ex, "An error occurred in the main processing loop");
break;
_logger.LogError(ex, $"An error occurred while retrieving or saving studyInstanceUID {migrationStudy.StudyInstanceUID}");
await UpdateSourceCFind(connectionString, migrationStudy.StudyInstanceUID, "MIGRATION_ERRORED");
}
}
catch (Exception ex)
{
_logger.LogError(ex, "An error occurred in the main processing loop");
}
}
private static async Task<SourceStudy> GetMigrationStudy(string connectionString)
@ -112,17 +95,16 @@ namespace DicomMigratorApp
_logger.LogInformation("Opening a connection to the database");
await connection.OpenAsync();
_logger.LogInformation("Database connection established");
var command = new MySqlCommand("SELECT id, study_instance_uid, patient_id, status FROM priority_migration_study WHERE status='QR_COMPLETE' ORDER BY schedule_date LIMIT 1", connection);
var command = new MySqlCommand("SELECT study_instance_uid,patient_id,status FROM source_cfind WHERE status='QR_COMPLETE' LIMIT 1", connection);
var reader = await command.ExecuteReaderAsync();
while (await reader.ReadAsync())
{
qrStudy = new SourceStudy
{
Id = reader.IsDBNull(0) ? 0 : reader.GetInt32(0),
StudyInstanceUID = reader.IsDBNull(1) ? null : reader.GetString(1),
PatientID = reader.IsDBNull(2) ? null : reader.GetString(2),
Status = reader.IsDBNull(3) ? null : reader.GetString(3)
StudyInstanceUID = reader.IsDBNull(0) ? null : reader.GetString(0),
PatientID = reader.IsDBNull(1) ? null : reader.GetString(1),
Status = reader.IsDBNull(2) ? null : reader.GetString(2)
};
}
@ -130,8 +112,8 @@ namespace DicomMigratorApp
}
if (qrStudy.StudyInstanceUID != null)
{
_logger.LogInformation($"Picked study to be migrated from the database: {qrStudy.StudyInstanceUID}");
await UpdateSourceCFind(connectionString, qrStudy.Id, "MIGRATION_INPROGRESS");
_logger.LogInformation("Picked study to be migrated from the database");
await UpdateSourceCFind(connectionString, qrStudy.StudyInstanceUID, "MIGRATION_INPROGRESS");
}
else
{
@ -141,125 +123,54 @@ namespace DicomMigratorApp
catch (Exception ex)
{
_logger.LogError(ex, "Error retrieving study to be migrated from the database");
throw; // Re-throw the exception to ensure it is caught by the outer try-catch block
}
return qrStudy;
}
private static async Task<List<ImageRecord>> GetImagePaths(string connectionString, string studyInstanceUID)
{
var imagePaths = new List<ImageRecord>();
try
{
using (var connection = new MySqlConnection(connectionString))
{
await connection.OpenAsync();
var command = new MySqlCommand("SELECT id, image_path FROM priority_migration_image WHERE study_instance_uid = @StudyInstanceUID AND (status != 'MIGRATION_COMPLETE' or status is null)", connection);
command.Parameters.AddWithValue("@StudyInstanceUID", studyInstanceUID);
var reader = await command.ExecuteReaderAsync();
while (await reader.ReadAsync())
{
imagePaths.Add(new ImageRecord
{
Id = reader.IsDBNull(0) ? 0 : reader.GetInt32(0),
Path = reader.IsDBNull(1) ? null : reader.GetString(1)
});
}
reader.Close();
}
_logger.LogInformation($"Retrieved {imagePaths.Count} image paths for studyInstanceUID {studyInstanceUID}");
}
catch (Exception ex)
{
_logger.LogError(ex, "Error retrieving image paths from the database");
throw; // Re-throw the exception to ensure it is caught by the outer try-catch block
}
return imagePaths;
}
private static async Task UpdateImagePathStatus(string connectionString, int imageId, string updateStatus)
private static async Task UpdateSourceCFind(string connectionString, string study_instance_uid, string updateStatus)
{
try
{
using (var connection = new MySqlConnection(connectionString))
{
await connection.OpenAsync();
var command = new MySqlCommand("UPDATE priority_migration_image SET status = @Status WHERE id = @ImageId", connection);
var command = new MySqlCommand("UPDATE source_cfind SET status = @Status WHERE study_instance_uid = @StudyInstanceUID", connection);
command.Parameters.AddWithValue("@ImageId", imageId);
command.Parameters.AddWithValue("@StudyInstanceUID", study_instance_uid);
command.Parameters.AddWithValue("@Status", updateStatus);
await command.ExecuteNonQueryAsync();
_logger.LogInformation($"Updated image path record for image ID {imageId} with status {updateStatus}");
_logger.LogInformation($"Updated source C-FIND record for study instance uid {study_instance_uid}");
}
}
catch (Exception ex)
{
_logger.LogError(ex, $"Error updating image path record for image ID {imageId}");
throw; // Re-throw the exception to ensure it is caught by the outer try-catch block
_logger.LogError(ex, $"Error updating source study record for study {study_instance_uid}");
}
}
private static async Task MigrateImage(string imagePath)
private static async Task MigrateStudy(string studyInstanceUID, string folderPath)
{
try
{
var client = DicomClientFactory.Create(targetIP, targetPort, false, senderAET, targetAET);
var client = DicomClientFactory.Create(targetIP, targetPort, false, senderAET, targetAET);
var dicomFile = await DicomFile.OpenAsync(imagePath);
var files = System.IO.Directory.GetFiles(folderPath, "*");
foreach (var file in files)
{
var dicomFile = await DicomFile.OpenAsync(file);
await client.AddRequestAsync(new DicomCStoreRequest(dicomFile));
await client.SendAsync();
_logger.LogInformation($"Migrated image {imagePath} to target AET {targetAET}");
}
catch (Exception ex)
{
_logger.LogError(ex, $"Error migrating image {imagePath}");
throw; // Re-throw the exception to ensure it is caught by the outer try-catch block
}
}
private static async Task UpdateSourceCFind(string connectionString, int studyId, string updateStatus)
{
try
{
using (var connection = new MySqlConnection(connectionString))
{
await connection.OpenAsync();
var command = new MySqlCommand("UPDATE priority_migration_study SET status = @Status WHERE id = @StudyId", connection);
await client.SendAsync();
command.Parameters.AddWithValue("@StudyId", studyId);
command.Parameters.AddWithValue("@Status", updateStatus);
await command.ExecuteNonQueryAsync();
_logger.LogInformation($"Updated source C-FIND record for study ID {studyId} with status {updateStatus}");
}
}
catch (Exception ex)
{
_logger.LogError(ex, $"Error updating source study record for study ID {studyId}");
throw; // Re-throw the exception to ensure it is caught by the outer try-catch block
}
_logger.LogInformation($"Migrated studyInstanceUID {studyInstanceUID} to target AET {targetAET}");
}
}
class SourceStudy
{
public int Id { get; set; }
public string PatientID { get; set; }
public string StudyInstanceUID { get; set; }
public string Status { get; set; }
}
class ImageRecord
{
public int Id { get; set; }
public string Path { get; set; }
}
}

21
docker-compose.yml
View File

@ -1,21 +0,0 @@
version: '3.8'
services:
dicom-migrator-app:
image: seyfertsoft/dicommigratorapp:1.0.0
container_name: dicommigrator
environment:
- "ConnectionStrings__DefaultConnection=Server=mysqldb;Port=3306;Database=dms_db;User Id=root;Password=Rootmatrix23@;"
- Dest__IP=127.0.0.1
- Sender__AET=MYAE
- Dest__AET=ORTHANC
- Dest__Port=4242
volumes:
- /path/to/images1:/app/images1
- /path/to/images2:/app/images2
networks:
- dmsnetwork
networks:
dmsnetwork:
external: true