feat(fetch): get by id operation

Author: jaredcnance

src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs

@@ -100,13 +100,16 @@ public static void AddJsonApiInternals(
             services.AddScoped<IDbContextResolver, DbContextResolver>();
             services.AddScoped(typeof(IEntityRepository<>), typeof(DefaultEntityRepository<>));
             services.AddScoped(typeof(IEntityRepository<,>), typeof(DefaultEntityRepository<,>));
-            
+
             services.AddScoped(typeof(ICreateService<>), typeof(EntityResourceService<>));
             services.AddScoped(typeof(ICreateService<,>), typeof(EntityResourceService<,>));
 
             services.AddScoped(typeof(IGetAllService<>), typeof(EntityResourceService<>));
             services.AddScoped(typeof(IGetAllService<,>), typeof(EntityResourceService<,>));
 
+            services.AddScoped(typeof(IGetByIdService<>), typeof(EntityResourceService<>));
+            services.AddScoped(typeof(IGetByIdService<,>), typeof(EntityResourceService<,>));
+
             services.AddScoped(typeof(IResourceService<>), typeof(EntityResourceService<>));
             services.AddScoped(typeof(IResourceService<,>), typeof(EntityResourceService<,>));
             services.AddSingleton<JsonApiOptions>(jsonApiOptions);

src/JsonApiDotNetCore/Services/Operations/Processors/GetOpProcessor.cs

@@ -5,7 +5,6 @@
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Models.Operations;
 using JsonApiDotNetCore.Serialization;
-using JsonApiDotNetCore.Services;
 
 namespace JsonApiDotNetCore.Services.Operations.Processors
 {
@@ -21,32 +20,36 @@ public class GetOpProcessor<T> : GetOpProcessor<T, int>
         where T : class, IIdentifiable<int>
     {
         public GetOpProcessor(
-            IGetAllService<T, int> service,
+            IGetAllService<T, int> getAll,
+            IGetByIdService<T, int> getById,
             IJsonApiDeSerializer deSerializer,
             IDocumentBuilder documentBuilder,
             IContextGraph contextGraph,
             IJsonApiContext jsonApiContext
-        ) : base(service, deSerializer, documentBuilder, contextGraph, jsonApiContext)
+        ) : base(getAll, getById, deSerializer, documentBuilder, contextGraph, jsonApiContext)
         { }
     }
 
     public class GetOpProcessor<T, TId> : IGetOpProcessor<T, TId>
          where T : class, IIdentifiable<TId>
     {
-        private readonly IGetAllService<T, TId> _service;
+        private readonly IGetAllService<T, TId> _getAll;
+        private readonly IGetByIdService<T, TId> _getById;
         private readonly IJsonApiDeSerializer _deSerializer;
         private readonly IDocumentBuilder _documentBuilder;
         private readonly IContextGraph _contextGraph;
         private readonly IJsonApiContext _jsonApiContext;
 
         public GetOpProcessor(
-            IGetAllService<T, TId> service,
+            IGetAllService<T, TId> getAll,
+            IGetByIdService<T, TId> getById,
             IJsonApiDeSerializer deSerializer,
             IDocumentBuilder documentBuilder,
             IContextGraph contextGraph,
             IJsonApiContext jsonApiContext)
         {
-            _service = service;
+            _getAll = getAll;
+            _getById = getById;
             _deSerializer = deSerializer;
             _documentBuilder = documentBuilder;
             _contextGraph = contextGraph;
@@ -55,25 +58,43 @@ public GetOpProcessor(
 
         public async Task<Operation> ProcessAsync(Operation operation)
         {
-            var result = await _service.GetAsync();
-
             var operationResult = new Operation
             {
-                Op = OperationCode.add
+                Op = OperationCode.get
             };
 
+            operationResult.Data = string.IsNullOrWhiteSpace(operation.Ref.Id?.ToString())
+            ? await GetAllAsync(operation)
+            : await GetByIdAsync(operation);
+
+            return operationResult;
+        }
+
+        private async Task<object> GetAllAsync(Operation operation)
+        {
+            var result = await _getAll.GetAsync();
+
             var operations = new List<DocumentData>();
             foreach (var resource in result)
             {
                 var doc = _documentBuilder.GetData(
-                _contextGraph.GetContextEntity(operation.GetResourceTypeName()),
-                resource);
+                    _contextGraph.GetContextEntity(operation.GetResourceTypeName()),
+                    resource);
                 operations.Add(doc);
             }
 
-            operationResult.Data = operations;
+            return operations;
+        }
 
-            return operationResult;
+        private async Task<object> GetByIdAsync(Operation operation)
+        {
+            var id = TypeHelper.ConvertType<TId>(operation.Ref.Id);
+            var result = await _getById.GetAsync(id);
+            var doc = _documentBuilder.GetData(
+                _contextGraph.GetContextEntity(operation.GetResourceTypeName()),
+                result);
+
+            return doc;
         }
     }
 }

test/OperationsExampleTests/Get/GetTests.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using JsonApiDotNetCore.Models.Operations;
@@ -43,7 +44,35 @@ public async Task Can_Get_Articles()
             Assert.NotNull(result.data);
             Assert.Equal(HttpStatusCode.OK, result.response.StatusCode);
             Assert.Equal(1, result.data.Operations.Count);
-            Assert.Equal(articles.Count, result.data.Operations[0].DataList.Count);
+            Assert.Equal(articles.Count, result.data.Operations.Single().DataList.Count);
+        }
+
+        [Fact]
+        public async Task Can_Get_Article_By_Id()
+        {
+            // arrange
+            var context = _fixture.GetService<AppDbContext>();
+            var article = await context.Articles.LastAsync();
+
+            var content = new
+            {
+                operations = new[] {
+                    new Dictionary<string, object> {
+                        { "op", "get"},
+                        { "ref",  new { type = "articles", id = article.StringId } }
+                    }
+                }
+            };
+
+            // act
+            var result = await _fixture.PatchAsync<OperationsDocument>("api/bulk", content);
+
+            // assert
+            Assert.NotNull(result.response);
+            Assert.NotNull(result.data);
+            Assert.Equal(HttpStatusCode.OK, result.response.StatusCode);
+            Assert.Equal(1, result.data.Operations.Count);
+            Assert.Equal(article.Id.ToString(), result.data.Operations.Single().DataObject.Id);
         }
     }
 }