Move OpenTripPlanner source to separate package

13 files changed, 86 insertions, 74 deletions

diff --git a/src/Costasdev.Busurbano.Backend/Controllers/ArrivalsController.cs b/src/Costasdev.Busurbano.Backend/Controllers/ArrivalsController.cs
index b4d8c96..957668a 100644
--- a/src/Costasdev.Busurbano.Backend/Controllers/ArrivalsController.cs
+++ b/src/Costasdev.Busurbano.Backend/Controllers/ArrivalsController.cs
@@ -1,11 +1,11 @@
 using System.Net;
 using Costasdev.Busurbano.Backend.Configuration;
-using Costasdev.Busurbano.Backend.GraphClient;
-using Costasdev.Busurbano.Backend.GraphClient.App;
 using Costasdev.Busurbano.Backend.Helpers;
 using Costasdev.Busurbano.Backend.Services;
 using Costasdev.Busurbano.Backend.Types;
 using Costasdev.Busurbano.Backend.Types.Arrivals;
+using Costasdev.Busurbano.Sources.OpenTripPlannerGql;
+using Costasdev.Busurbano.Sources.OpenTripPlannerGql.Queries;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Options;
diff --git a/src/Costasdev.Busurbano.Backend/Controllers/TileController.cs b/src/Costasdev.Busurbano.Backend/Controllers/TileController.cs
index e7efc09..0e550a3 100644
--- a/src/Costasdev.Busurbano.Backend/Controllers/TileController.cs
+++ b/src/Costasdev.Busurbano.Backend/Controllers/TileController.cs
@@ -1,6 +1,3 @@
-using Costasdev.Busurbano.Backend.GraphClient;
-using Costasdev.Busurbano.Backend.GraphClient.App;
-
 using NetTopologySuite.Features;
 using NetTopologySuite.IO.VectorTiles;
 using NetTopologySuite.IO.VectorTiles.Mapbox;
@@ -12,6 +9,8 @@ using System.Text.Json;
 using Costasdev.Busurbano.Backend.Helpers;
 using Costasdev.Busurbano.Backend.Services;
 using Costasdev.Busurbano.Backend.Configuration;
+using Costasdev.Busurbano.Sources.OpenTripPlannerGql;
+using Costasdev.Busurbano.Sources.OpenTripPlannerGql.Queries;
 using Microsoft.Extensions.Options;
 
 namespace Costasdev.Busurbano.Backend.Controllers;
diff --git a/src/Costasdev.Busurbano.Backend/Costasdev.Busurbano.Backend.csproj b/src/Costasdev.Busurbano.Backend/Costasdev.Busurbano.Backend.csproj
index 5e2283c..1f81e88 100644
--- a/src/Costasdev.Busurbano.Backend/Costasdev.Busurbano.Backend.csproj
+++ b/src/Costasdev.Busurbano.Backend/Costasdev.Busurbano.Backend.csproj
@@ -12,16 +12,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Costasdev.VigoTransitApi" Version="0.1.0" />
-    <PackageReference Include="Google.Protobuf" Version="3.33.1" />
-    <PackageReference Include="ProjNet" Version="2.1.0" />
+    <PackageReference Include="Costasdev.VigoTransitApi" />
+    <PackageReference Include="Google.Protobuf" />
+    <PackageReference Include="ProjNet" />
 
-    <PackageReference Include="NetTopologySuite" Version="2.6.0" />
-    <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="4.0.0" />
-    <PackageReference Include="NetTopologySuite.IO.VectorTiles.Mapbox" Version="1.1.0" />
+    <PackageReference Include="NetTopologySuite" />
+    <PackageReference Include="NetTopologySuite.IO.GeoJSON" />
+    <PackageReference Include="NetTopologySuite.IO.VectorTiles.Mapbox" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Costasdev.Busurbano.Sources.OpenTripPlannerGql\Costasdev.Busurbano.Sources.OpenTripPlannerGql.csproj" />
     <ProjectReference Include="..\Costasdev.Busurbano.Sources.TranviasCoruna\Costasdev.Busurbano.Sources.TranviasCoruna.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="GraphClient\" />
+  </ItemGroup>
 </Project>
diff --git a/src/Costasdev.Busurbano.Backend/Services/Processors/CorunaRealTimeProcessor.cs b/src/Costasdev.Busurbano.Backend/Services/Processors/CorunaRealTimeProcessor.cs
index 2ac1554..ee98a1f 100644
--- a/src/Costasdev.Busurbano.Backend/Services/Processors/CorunaRealTimeProcessor.cs
+++ b/src/Costasdev.Busurbano.Backend/Services/Processors/CorunaRealTimeProcessor.cs
@@ -1,10 +1,7 @@
-using Costasdev.Busurbano.Backend.Configuration;
-using Costasdev.Busurbano.Backend.GraphClient.App;
 using Costasdev.Busurbano.Backend.Types;
 using Costasdev.Busurbano.Backend.Types.Arrivals;
-using Costasdev.VigoTransitApi;
+using Costasdev.Busurbano.Sources.OpenTripPlannerGql.Queries;
 using Costasdev.Busurbano.Sources.TranviasCoruna;
-using Microsoft.Extensions.Options;
 using Arrival = Costasdev.Busurbano.Backend.Types.Arrivals.Arrival;
 
 namespace Costasdev.Busurbano.Backend.Services.Processors;
diff --git a/src/Costasdev.Busurbano.Backend/Services/Processors/NextStopsProcessor.cs b/src/Costasdev.Busurbano.Backend/Services/Processors/NextStopsProcessor.cs
index 6273e0d..a00a68a 100644
--- a/src/Costasdev.Busurbano.Backend/Services/Processors/NextStopsProcessor.cs
+++ b/src/Costasdev.Busurbano.Backend/Services/Processors/NextStopsProcessor.cs
@@ -1,4 +1,4 @@
-using Costasdev.Busurbano.Backend.GraphClient.App;
+using Costasdev.Busurbano.Sources.OpenTripPlannerGql.Queries;
 
 namespace Costasdev.Busurbano.Backend.Services.Processors;
 
diff --git a/src/Costasdev.Busurbano.Backend/Services/Processors/ShapeProcessor.cs b/src/Costasdev.Busurbano.Backend/Services/Processors/ShapeProcessor.cs
index 93e4a4f..40bc508 100644
--- a/src/Costasdev.Busurbano.Backend/Services/Processors/ShapeProcessor.cs
+++ b/src/Costasdev.Busurbano.Backend/Services/Processors/ShapeProcessor.cs
@@ -1,4 +1,4 @@
-using Costasdev.Busurbano.Backend.GraphClient.App;
+using Costasdev.Busurbano.Sources.OpenTripPlannerGql.Queries;
 
 namespace Costasdev.Busurbano.Backend.Services.Processors;
 
diff --git a/src/Costasdev.Busurbano.Backend/Services/Processors/VitrasaRealTimeProcessor.cs b/src/Costasdev.Busurbano.Backend/Services/Processors/VitrasaRealTimeProcessor.cs
index 7a1d6ea..5e0783d 100644
--- a/src/Costasdev.Busurbano.Backend/Services/Processors/VitrasaRealTimeProcessor.cs
+++ b/src/Costasdev.Busurbano.Backend/Services/Processors/VitrasaRealTimeProcessor.cs
@@ -1,7 +1,7 @@
 using Costasdev.Busurbano.Backend.Configuration;
-using Costasdev.Busurbano.Backend.GraphClient.App;
 using Costasdev.Busurbano.Backend.Types;
 using Costasdev.Busurbano.Backend.Types.Arrivals;
+using Costasdev.Busurbano.Sources.OpenTripPlannerGql.Queries;
 using Costasdev.VigoTransitApi;
 using Microsoft.Extensions.Options;
 
diff --git a/src/Costasdev.Busurbano.ServiceViewer/Costasdev.Busurbano.ServiceViewer.csproj b/src/Costasdev.Busurbano.ServiceViewer/Costasdev.Busurbano.ServiceViewer.csproj
index afa2489..426621c 100644
--- a/src/Costasdev.Busurbano.ServiceViewer/Costasdev.Busurbano.ServiceViewer.csproj
+++ b/src/Costasdev.Busurbano.ServiceViewer/Costasdev.Busurbano.ServiceViewer.csproj
@@ -9,59 +9,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" />
 
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="10.0.0" />
-
-    </ItemGroup>
-
-    <ItemGroup>
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\Microsoft.Build.Locator.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.deps.json" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.dll.config" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.runtimeconfig.json" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\Newtonsoft.Json.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\System.Collections.Immutable.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\System.CommandLine.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\cs\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\de\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\es\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\fr\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\it\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\ja\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\ko\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\pl\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\pt-BR\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\ru\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\tr\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\zh-Hans\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-netcore\zh-Hant\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\Microsoft.Build.Locator.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.exe" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.exe.config" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\Microsoft.IO.Redist.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\Newtonsoft.Json.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\System.Buffers.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\System.Collections.Immutable.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\System.CommandLine.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\System.Memory.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\System.Numerics.Vectors.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\System.Runtime.CompilerServices.Unsafe.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\System.Threading.Tasks.Extensions.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\cs\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\de\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\es\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\fr\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\it\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\ja\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\ko\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\pl\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\pt-BR\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\ru\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\tr\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\zh-Hans\System.CommandLine.resources.dll" />
-      <_ContentIncludedByDefault Remove="C:\Users\ariel\.nuget\packages\microsoft.codeanalysis.workspaces.msbuild\4.14.0\contentFiles\any\any\BuildHost-net472\zh-Hant\System.CommandLine.resources.dll" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" />
     </ItemGroup>
 </Project>
diff --git a/src/Costasdev.Busurbano.Sources.OpenTripPlannerGql/Costasdev.Busurbano.Sources.OpenTripPlannerGql.csproj b/src/Costasdev.Busurbano.Sources.OpenTripPlannerGql/Costasdev.Busurbano.Sources.OpenTripPlannerGql.csproj
new file mode 100644
index 0000000..6d78b55
--- /dev/null
+++ b/src/Costasdev.Busurbano.Sources.OpenTripPlannerGql/Costasdev.Busurbano.Sources.OpenTripPlannerGql.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net10.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Logging" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/Costasdev.Busurbano.Sources.OpenTripPlannerGql/OpenTripPlannerClient.cs b/src/Costasdev.Busurbano.Sources.OpenTripPlannerGql/OpenTripPlannerClient.cs
new file mode 100644
index 0000000..eed78d6
--- /dev/null
+++ b/src/Costasdev.Busurbano.Sources.OpenTripPlannerGql/OpenTripPlannerClient.cs
@@ -0,0 +1,47 @@
+using System.Net.Http.Json;
+using Costasdev.Busurbano.Sources.OpenTripPlannerGql.Queries;
+using Microsoft.Extensions.Logging;
+
+namespace Costasdev.Busurbano.Sources.OpenTripPlannerGql;
+
+public class OpenTripPlannerClient
+{
+    private readonly HttpClient _httpClient;
+    private readonly string _baseUrl;
+    private readonly ILogger<OpenTripPlannerClient> _logger;
+
+    public OpenTripPlannerClient(
+        HttpClient httpClient,
+        string baseUrl,
+        ILogger<OpenTripPlannerClient> logger
+    )
+    {
+        _httpClient = httpClient;
+        _baseUrl = baseUrl;
+        _logger = logger;
+    }
+
+    public async Task GetStopsInBbox(double minLat, double minLon, double maxLat, double maxLon)
+    {
+        var requestContent =
+            StopTileRequestContent.Query(new StopTileRequestContent.Bbox(minLon, minLat, maxLon, maxLat));
+
+        var request = new HttpRequestMessage(HttpMethod.Post, $"{_baseUrl}/gtfs/v1");
+        request.Content = JsonContent.Create(new GraphClientRequest
+        {
+            Query = requestContent
+        });
+
+        var response = await _httpClient.SendAsync(request);
+        var responseBody = await response.Content.ReadFromJsonAsync<GraphClientResponse<StopTileResponse>>();
+
+        if (responseBody is not { IsSuccess: true })
+        {
+            _logger.LogError(
+                "Error fetching stop data, received {StatusCode} {ResponseBody}",
+                response.StatusCode,
+                await response.Content.ReadAsStringAsync()
+            );
+        }
+    }
+}
diff --git a/src/Costasdev.Busurbano.Backend/GraphClient/App/ArrivalsAtStop.cs b/src/Costasdev.Busurbano.Sources.OpenTripPlannerGql/Queries/ArrivalsAtStop.cs
index 10235de..bbf2c08 100644
--- a/src/Costasdev.Busurbano.Backend/GraphClient/App/ArrivalsAtStop.cs
+++ b/src/Costasdev.Busurbano.Sources.OpenTripPlannerGql/Queries/ArrivalsAtStop.cs
@@ -1,7 +1,8 @@
 using System.Globalization;
 using System.Text.Json.Serialization;
+using Costasdev.Busurbano.Sources.OpenTripPlannerGql;
 
-namespace Costasdev.Busurbano.Backend.GraphClient.App;
+namespace Costasdev.Busurbano.Sources.OpenTripPlannerGql.Queries;
 
 public class ArrivalsAtStopContent : IGraphRequest<ArrivalsAtStopContent.Args>
 {
diff --git a/src/Costasdev.Busurbano.Backend/GraphClient/App/StopTile.cs b/src/Costasdev.Busurbano.Sources.OpenTripPlannerGql/Queries/StopTile.cs
index 802de9a..792d19e 100644
--- a/src/Costasdev.Busurbano.Backend/GraphClient/App/StopTile.cs
+++ b/src/Costasdev.Busurbano.Sources.OpenTripPlannerGql/Queries/StopTile.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Text.Json.Serialization;
 
-namespace Costasdev.Busurbano.Backend.GraphClient.App;
+namespace Costasdev.Busurbano.Sources.OpenTripPlannerGql.Queries;
 
 public class StopTileRequestContent : IGraphRequest<StopTileRequestContent.Bbox>
 {
diff --git a/src/Costasdev.Busurbano.Backend/GraphClient/ResponseTypes.cs b/src/Costasdev.Busurbano.Sources.OpenTripPlannerGql/ResponseTypes.cs
index 2d4d5df..237537f 100644
--- a/src/Costasdev.Busurbano.Backend/GraphClient/ResponseTypes.cs
+++ b/src/Costasdev.Busurbano.Sources.OpenTripPlannerGql/ResponseTypes.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Costasdev.Busurbano.Backend.GraphClient;
+namespace Costasdev.Busurbano.Sources.OpenTripPlannerGql;
 
 public class GraphClientRequest
 {