From ca32621cf13f6ee219bad7a86d4723e7381d98ed Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Tue, 2 Nov 2021 14:07:05 -0500
Subject: [PATCH] =?UTF-8?q?fix(dc):=20=F0=9F=90=9B=20debug=20docker=20comp?=
 =?UTF-8?q?ose/swagger=20experience?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose/.gitignore                                   | 3 ++-
 docker-compose/docker-compose.dcproj                        | 4 ++--
 .../Archival/FilterLists.Archival.Api/SwaggerExtensions.cs  | 6 +-----
 .../FilterLists.Directory.Api/SwaggerExtensions.cs          | 6 +-----
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/docker-compose/.gitignore b/docker-compose/.gitignore
index cbbd0b5c0..08f70ee4f 100644
--- a/docker-compose/.gitignore
+++ b/docker-compose/.gitignore
@@ -1,2 +1,3 @@
 bin/
-obj/
\ No newline at end of file
+obj/
+*.dcproj.user
\ No newline at end of file
diff --git a/docker-compose/docker-compose.dcproj b/docker-compose/docker-compose.dcproj
index d37cd6b95..ad3c98f5a 100644
--- a/docker-compose/docker-compose.dcproj
+++ b/docker-compose/docker-compose.dcproj
@@ -5,8 +5,8 @@
     <DockerTargetOS>Linux</DockerTargetOS>
     <ProjectGuid>8f04c802-830b-4b6d-8d53-5d2a87b4223d</ProjectGuid>
     <DockerLaunchAction>LaunchBrowser</DockerLaunchAction>
-    <DockerServiceUrl>{Scheme}://localhost:{ServicePort}/v1/lists</DockerServiceUrl>
-    <DockerServiceName>filterlists</DockerServiceName>
+    <DockerServiceUrl>http://localhost:8080/api/</DockerServiceUrl>
+    <DockerServiceName>directory-api</DockerServiceName>
   </PropertyGroup>
   <ItemGroup>
     <None Include=".env" />
diff --git a/services/Archival/FilterLists.Archival.Api/SwaggerExtensions.cs b/services/Archival/FilterLists.Archival.Api/SwaggerExtensions.cs
index 6ec1ca314..d8a7dbca4 100644
--- a/services/Archival/FilterLists.Archival.Api/SwaggerExtensions.cs
+++ b/services/Archival/FilterLists.Archival.Api/SwaggerExtensions.cs
@@ -42,11 +42,7 @@ public static void UseSwagger(this IApplicationBuilder app)
                 o.RouteTemplate = "{documentName}/swagger.json";
                 o.PreSerializeFilters.Add((swaggerDoc, httpReq) => swaggerDoc.Servers = new List<OpenApiServer>
                 {
-#if DEBUG
-                    new() { Url = $"{httpReq.Scheme}://{httpReq.Host.Value}:8080/api/archival" }
-#else
-                    new() { Url = $"https://{httpReq.Host.Value}/api/archival" }
-#endif
+                    new() { Url = $"{httpReq.Scheme}://{httpReq.Host.Value}/api/archival" }
                 });
             });
         }
diff --git a/services/Directory/FilterLists.Directory.Api/SwaggerExtensions.cs b/services/Directory/FilterLists.Directory.Api/SwaggerExtensions.cs
index 7133ec8e9..63028e8ee 100644
--- a/services/Directory/FilterLists.Directory.Api/SwaggerExtensions.cs
+++ b/services/Directory/FilterLists.Directory.Api/SwaggerExtensions.cs
@@ -41,11 +41,7 @@ public static void UseSwagger(this IApplicationBuilder app)
                 o.RouteTemplate = "{documentName}/swagger.json";
                 o.PreSerializeFilters.Add((swaggerDoc, httpReq) => swaggerDoc.Servers = new List<OpenApiServer>
                 {
-#if DEBUG
-                    new() { Url = $"{httpReq.Scheme}://{httpReq.Host.Value}:8080/api/directory" }
-#else
-                    new() { Url = $"https://{httpReq.Host.Value}/api/directory" }
-#endif
+                    new() { Url = $"{httpReq.Scheme}://{httpReq.Host.Value}/api/directory" }
                 });
             });
         }