From 035385233017366fb1d6113a796c9248bfd1c895 Mon Sep 17 00:00:00 2001
From: Stevan Freeborn <65925598+StevanFreeborn@users.noreply.github.com>
Date: Mon, 12 Aug 2024 12:42:16 -0500
Subject: [PATCH] chore: refactor to separate files

---
 .../Unit/OfacFileServiceOptionsTests.cs       |  5 ++++
 src/SanctionsSearch.Worker.Tests/Usings.cs    |  1 +
 .../Interfaces/IOfacFileService.cs            |  5 ++++
 .../Options/OfacFileServiceOptions.cs         | 23 +++++++++++++++++++
 .../Services/OfacFileService.cs               | 17 --------------
 src/SanctionsSearch.Worker/Usings.cs          |  2 ++
 6 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 src/SanctionsSearch.Worker.Tests/Unit/OfacFileServiceOptionsTests.cs
 create mode 100644 src/SanctionsSearch.Worker/Interfaces/IOfacFileService.cs
 create mode 100644 src/SanctionsSearch.Worker/Options/OfacFileServiceOptions.cs

diff --git a/src/SanctionsSearch.Worker.Tests/Unit/OfacFileServiceOptionsTests.cs b/src/SanctionsSearch.Worker.Tests/Unit/OfacFileServiceOptionsTests.cs
new file mode 100644
index 0000000..d4243a0
--- /dev/null
+++ b/src/SanctionsSearch.Worker.Tests/Unit/OfacFileServiceOptionsTests.cs
@@ -0,0 +1,5 @@
+namespace SanctionsSearch.Worker.Tests.Unit;
+
+public class OfacFileServiceOptionsTests
+{
+}
\ No newline at end of file
diff --git a/src/SanctionsSearch.Worker.Tests/Usings.cs b/src/SanctionsSearch.Worker.Tests/Usings.cs
index fd6a875..05ea043 100644
--- a/src/SanctionsSearch.Worker.Tests/Usings.cs
+++ b/src/SanctionsSearch.Worker.Tests/Usings.cs
@@ -8,3 +8,4 @@ global using Moq;
 global using RichardSzalay.MockHttp;
 
 global using SanctionsSearch.Worker.Services;
+global using SanctionsSearch.Worker.Options;
\ No newline at end of file
diff --git a/src/SanctionsSearch.Worker/Interfaces/IOfacFileService.cs b/src/SanctionsSearch.Worker/Interfaces/IOfacFileService.cs
new file mode 100644
index 0000000..9446419
--- /dev/null
+++ b/src/SanctionsSearch.Worker/Interfaces/IOfacFileService.cs
@@ -0,0 +1,5 @@
+namespace SanctionsSearch.Worker.Interfaces;
+
+interface IOfacFileService
+{
+}
diff --git a/src/SanctionsSearch.Worker/Options/OfacFileServiceOptions.cs b/src/SanctionsSearch.Worker/Options/OfacFileServiceOptions.cs
new file mode 100644
index 0000000..2ea1db8
--- /dev/null
+++ b/src/SanctionsSearch.Worker/Options/OfacFileServiceOptions.cs
@@ -0,0 +1,23 @@
+namespace SanctionsSearch.Worker.Options;
+
+class OfacFileServiceOptions
+{
+  public string Url { get; init; } = string.Empty;
+  public string SdnFileName { get; init; } = string.Empty;
+  public string AddressFileName { get; init; } = string.Empty;
+  public string AltNamesFileName { get; init; } = string.Empty;
+  public string CommentsFileName { get; init; } = string.Empty;
+  public string ConPrimaryNameFileName { get; init; } = string.Empty;
+  public string ConAddressesFileName { get; init; } = string.Empty;
+  public string ConAltNamesFileName { get; init; } = string.Empty;
+  public string ConCommentsFileName { get; init; } = string.Empty;
+
+  public Uri GetSdnFileUri() => new($"{Url}/{SdnFileName}");
+  public Uri GetAddressFileUri() => new($"{Url}/{AddressFileName}");
+  public Uri GetAltNamesFileUri() => new($"{Url}/{AltNamesFileName}");
+  public Uri GetCommentsFileUri() => new($"{Url}/{CommentsFileName}");
+  public Uri GetConPrimaryNameFileUri() => new($"{Url}/{ConPrimaryNameFileName}");
+  public Uri GetConAddressesFileUri() => new($"{Url}/{ConAddressesFileName}");
+  public Uri GetConAltNamesFileUri() => new($"{Url}/{ConAltNamesFileName}");
+  public Uri GetConCommentsFileUri() => new($"{Url}/{ConCommentsFileName}");
+}
\ No newline at end of file
diff --git a/src/SanctionsSearch.Worker/Services/OfacFileService.cs b/src/SanctionsSearch.Worker/Services/OfacFileService.cs
index 95256a0..3e79557 100644
--- a/src/SanctionsSearch.Worker/Services/OfacFileService.cs
+++ b/src/SanctionsSearch.Worker/Services/OfacFileService.cs
@@ -1,9 +1,5 @@
 namespace SanctionsSearch.Worker.Services;
 
-interface IOfacFileService
-{
-}
-
 class OfacFileService(
   HttpClient client,
   ILogger<OfacFileService> logger,
@@ -14,16 +10,3 @@ class OfacFileService(
   private readonly ILogger<OfacFileService> _logger = logger ?? throw new ArgumentNullException(nameof(logger));
   private readonly OfacFileServiceOptions _options = options?.Value ?? throw new ArgumentNullException(nameof(options));
 }
-
-class OfacFileServiceOptions
-{
-  public string Url { get; set; } = string.Empty;
-  public string SdnFileName { get; set; } = string.Empty;
-  public string AddressFileName { get; set; } = string.Empty;
-  public string AltNamesFileName { get; set; } = string.Empty;
-  public string CommentsFileName { get; set; } = string.Empty;
-  public string ConPrimaryNameFileName { get; set; } = string.Empty;
-  public string ConAddressesFileName { get; set; } = string.Empty;
-  public string ConAltNamesFileName { get; set; } = string.Empty;
-  public string ConCommentsFileName { get; set; } = string.Empty;
-}
\ No newline at end of file
diff --git a/src/SanctionsSearch.Worker/Usings.cs b/src/SanctionsSearch.Worker/Usings.cs
index 842417b..4adbc67 100644
--- a/src/SanctionsSearch.Worker/Usings.cs
+++ b/src/SanctionsSearch.Worker/Usings.cs
@@ -1,5 +1,7 @@
 global using Microsoft.Extensions.Options;
 
+global using SanctionsSearch.Worker.Interfaces;
+global using SanctionsSearch.Worker.Options;
 global using SanctionsSearch.Worker;
 
 global using Serilog;