feat(API): publish federation compatiable API (#45)

* feat(API): publish federation compatiable API
fossapps · Aug 11, 2022 · 4e422d6 · 4e422d6
1 parent d758806
commit 4e422d6
Show file tree

Hide file tree

Showing 14 changed files with 117 additions and 42 deletions.
diff --git a/API.Tests/QueryTest.cs b/API.Tests/QueryTest.cs
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Business;
+using Moq;
+using NUnit.Framework;
+
+namespace API.Tests;
+
+public class QueryTest
+{
+    [Test]
+    public async Task TestKeysReturnsKeys()
+    {
+        var mockKeyService = new Mock<IKeyService>();
+        mockKeyService.Setup(x => x.FetchAllKeys()).ReturnsAsync(new List<Key>
+        {
+            new() {Body = "body1", Id = "id1"},
+            new() {Body = "body2", Id = "id2"}
+        });
+        var query = new Query();
+        var queryResponse = await query.Keys(mockKeyService.Object);
+        var enumerable = queryResponse.ToList();
+        Assert.AreEqual(enumerable.First().Body, "body1");
+        Assert.AreEqual(enumerable.First().Id, "id1");
+        Assert.AreEqual(enumerable.ElementAt(1).Body, "body2");
+        Assert.AreEqual(enumerable.ElementAt(1).Id, "id2");
+    }
+}
diff --git a/API/ExceptionHandler.cs b/API/ExceptionHandler.cs
@@ -0,0 +1,11 @@
+namespace API;
+
+public class ExceptionHandler : IErrorFilter
+{
+    public IError OnError(IError error)
+    {
+        return error.Exception == null
+            ? error
+            : error.WithMessage(error.Exception.Message);
+    }
+}
diff --git a/API/Mutation.cs b/API/Mutation.cs
@@ -1,11 +1,13 @@
+using API.Types;
 using Business;
+using Key = API.Types.Key;
 
 namespace API;
 
 public class Mutation
 {
-    public Task<Key> RegisterPublicKey([Service] IKeyService keyService, string publicKey)
+    public async Task<Key> RegisterPublicKey([Service] IKeyService keyService, string publicKey)
     {
-        return keyService.Create(publicKey);
+        return (await keyService.Create(publicKey)).ToGraphQl();
     }
 }
diff --git a/API/Query.cs b/API/Query.cs
@@ -1,17 +1,13 @@
-using API.types;
+using API.Types;
 using Business;
+using Key = API.Types.Key;
 
 namespace API;
 
 public class Query
 {
-    public Task<User> Me()
+    public async Task<IEnumerable<Key>> Keys([Service] IKeyService keyService)
     {
-        return Task.FromResult(new User("user_id"));
-    }
-
-    public Task<IEnumerable<Key>> Keys([Service] IKeyService keyService)
-    {
-        return keyService.FetchAllKeys();
+        return (await keyService.FetchAllKeys()).Select(x => x.ToGraphQl());
     }
 }
diff --git a/API/Setup.cs b/API/Setup.cs
@@ -1,5 +1,4 @@
-using API.types;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace API;
@@ -12,7 +11,7 @@ public static void SetupGraphqlServer(this IServiceCollection serviceCollection)
             .AddGraphQLServer()
             .AddApolloFederation()
             .AddApolloTracing()
-            .AddType<User>()
+            .AddErrorFilter<ExceptionHandler>()
             .AddQueryType<Query>()
             .AddMutationType<Mutation>();
     }

diff --git a/API/Types/Key.cs b/API/Types/Key.cs
@@ -0,0 +1,27 @@
+using Business;
+
+namespace API.Types;
+
+public sealed record Key
+{
+    [Key] public string Id { set; get; }
+
+    public string Body { set; get; }
+
+    public static async Task<Key> GetKeyById([Service] IKeyService keyService, string Id)
+    {
+        return (await keyService.FindById(Id)).ToGraphQl();
+    }
+}
+
+public static class BusinessKeyExtension
+{
+    public static Key ToGraphQl(this Business.Key key)
+    {
+        return new Key
+        {
+            Body = key.Body,
+            Id = key.Id
+        };
+    }
+}
diff --git a/API/types/User.cs b/API/types/User.cs
diff --git a/Business.Tests/KeyServiceTest.cs b/Business.Tests/KeyServiceTest.cs
@@ -37,8 +37,8 @@ public async Task FetchAllKeysTest()
         var mockKeyRepo = new Mock<IKeyRepository>();
         var mockKeys = new List<Storage.Key>
         {
-            new() { Body = "1", Id = "key_1"},
-            new() { Body = "2", Id = "key_2"},
+            new() {Body = "1", Id = "key_1"},
+            new() {Body = "2", Id = "key_2"}
         };
         mockKeyRepo.Setup(x => x.FindAllKeys()).ReturnsAsync(mockKeys.AsEnumerable());
         var service = new KeyService(mockKeyRepo.Object);

diff --git a/Business/Business.csproj b/Business/Business.csproj
@@ -7,7 +7,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Storage\Storage.csproj"/>
+        <ProjectReference Include="..\Storage\Storage.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Reference Include="HotChocolate.Abstractions">
+            <HintPath>..\..\..\..\.nuget\packages\hotchocolate.abstractions\12.12.1\lib\net6.0\HotChocolate.Abstractions.dll</HintPath>
+        </Reference>
     </ItemGroup>
 
 </Project>
diff --git a/Business/Exceptions/KeyNotFoundException.cs b/Business/Exceptions/KeyNotFoundException.cs
@@ -0,0 +1,8 @@
+namespace Business.Exceptions;
+
+public class KeyNotFoundException : Exception
+{
+    public KeyNotFoundException(string? message) : base(message)
+    {
+    }
+}
diff --git a/Business/KeyService.cs b/Business/KeyService.cs
@@ -4,6 +4,7 @@ namespace Business;
 
 public interface IKeyService
 {
+    Task<Key> FindById(string id);
     Task<IEnumerable<Key>> FetchAllKeys();
     Task<Key> Create(string publicKey);
     Task CleanupKeys(int hoursBefore);
@@ -18,6 +19,14 @@ public KeyService(IKeyRepository keyRepository)
         _keyRepository = keyRepository;
     }
 
+    public async Task<Key> FindById(string id)
+    {
+        var key = await _keyRepository.FindById(id);
+        if (key == null) throw new Exceptions.KeyNotFoundException("key not found");
+
+        return key.ToViewModel();
+    }
+
     public async Task<IEnumerable<Key>> FetchAllKeys()
     {
         return (await _keyRepository.FindAllKeys())

diff --git a/Startup/Program.cs b/Startup/Program.cs
@@ -5,10 +5,7 @@
 // but we're trying to use a command pattern
 // we just check if this is a entity framework's invocation,
 // and simply start the server that it so desires.
-if (args[0] == "--applicationName")
-{
-    Cli.StartServer(args);
-}
+if (args[0] == "--applicationName") Cli.StartServer(args);
 
 var rootCommand = new RootCommand("key management service");
 
@@ -27,10 +24,7 @@
 var dbArchiveCommand = new Command("archive_keys", "archive old keys");
 var keyTtlHours = new Option<int>("--key-ttl-hours", () => 72);
 dbArchiveCommand.AddOption(keyTtlHours);
-dbArchiveCommand.SetHandler((hoursBefore) =>
-{
-    Cli.CleanupKeys(args, hoursBefore);
-}, keyTtlHours);
+dbArchiveCommand.SetHandler(hoursBefore => { Cli.CleanupKeys(args, hoursBefore); }, keyTtlHours);
 dbCommand.AddCommand(dbArchiveCommand);
 
 dbCommand.AddCommand(dbMigrateCommand);

diff --git a/Storage/KeyRepository.cs b/Storage/KeyRepository.cs
@@ -7,6 +7,7 @@ public interface IKeyRepository
     Task<IEnumerable<Key>> FindAllKeys();
     Task<Key> Create(Key key);
     Task CleanupKeys(DateTime createdBefore);
+    Task<Key?> FindById(string id);
 }
 
 public class KeyRepository : IKeyRepository
@@ -35,4 +36,9 @@ public Task CleanupKeys(DateTime createdBefore)
         _db.Keys.RemoveRange(_db.Keys.Where(x => x.CreatedAt < createdBefore));
         return _db.SaveChangesAsync();
     }
+
+    public Task<Key?> FindById(string id)
+    {
+        return _db.Keys.FirstOrDefaultAsync(x => x.Id == id);
+    }
 }
diff --git a/Storage/Storage.csproj b/Storage/Storage.csproj
@@ -7,19 +7,19 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="EFCore.NamingConventions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.7" />
+        <PackageReference Include="EFCore.NamingConventions" Version="6.0.0"/>
+        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.7"/>
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.5" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.0" />
-        <PackageReference Include="Ulid" Version="1.2.6" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.5"/>
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.0"/>
+        <PackageReference Include="Ulid" Version="1.2.6"/>
     </ItemGroup>
 
     <ItemGroup>
-        <Folder Include="Migrations" />
+        <Folder Include="Migrations"/>
     </ItemGroup>
 
 </Project>