example(no-ef): rename models, controllers seem to cause conflict

Author: jaredcnance

src/JsonApiDotNetCoreExample/Controllers/TodoItemsTestController.cs

@@ -11,19 +11,19 @@ public abstract class AbstractTodoItemsController<T> : JsonApiController<T> wher
     {
         protected AbstractTodoItemsController(
             IJsonApiContext jsonApiContext,
-            IEntityRepository<T, int> entityRepository,
+            IResourceService<T, int> service,
             ILoggerFactory loggerFactory)
-            : base(jsonApiContext, entityRepository, loggerFactory)
+            : base(jsonApiContext, service, loggerFactory)
         {
         }
-}
+    }
     public class TodoItemsTestController : AbstractTodoItemsController<TodoItem>
     {
         public TodoItemsTestController(
             IJsonApiContext jsonApiContext,
-            IEntityRepository<TodoItem> entityRepository,
+            IResourceService<TodoItem> service,
             ILoggerFactory loggerFactory) 
-            : base(jsonApiContext, entityRepository, loggerFactory)
+            : base(jsonApiContext, service, loggerFactory)
         { }
     }
 }

src/NoEntityFrameworkExample/Controllers/TodoItemsController.cs renamed to src/NoEntityFrameworkExample/Controllers/MyModelsController.cs

@@ -5,11 +5,11 @@
 
 namespace NoEntityFrameworkExample.Controllers
 {
-    public class TodoItemsController : JsonApiController<TodoItem>
+    public class MyModelsController : JsonApiController<MyModel>
     {
-        public TodoItemsController(
+        public MyModelsController(
             IJsonApiContext jsonApiContext, 
-            IResourceService<TodoItem> resourceService, 
+            IResourceService<MyModel> resourceService, 
             ILoggerFactory loggerFactory) 
             : base(jsonApiContext, resourceService, loggerFactory)
         { }

src/NoEntityFrameworkExample/Models/TodoItem.cs renamed to src/NoEntityFrameworkExample/Models/MyModel.cs

@@ -2,7 +2,7 @@
 
 namespace NoEntityFrameworkExample.Models
 {
-    public class TodoItem : Identifiable
+    public class MyModel : Identifiable
     {
         [Attr("description")]
         public string Description { get; set; }

src/NoEntityFrameworkExample/Services/TodoItemService.cs renamed to src/NoEntityFrameworkExample/Services/MyModelService.cs

@@ -7,9 +7,9 @@
 
 namespace NoEntityFrameworkExample.Services
 {
-    public class TodoItemService : IResourceService<TodoItem>
+    public class MyModelService : IResourceService<MyModel>
     {
-        public Task<TodoItem> CreateAsync(TodoItem entity)
+        public Task<MyModel> CreateAsync(MyModel entity)
         {
             throw new NotImplementedException();
         }
@@ -19,19 +19,19 @@ public Task<bool> DeleteAsync(int id)
             throw new NotImplementedException();
         }
 
-        public Task<IEnumerable<TodoItem>> GetAsync()
+        public Task<IEnumerable<MyModel>> GetAsync()
         {
-            return Task.Run<IEnumerable<TodoItem>>(() => {
-                return new List<TodoItem> {
-                    new TodoItem {
+            return Task.Run<IEnumerable<MyModel>>(() => {
+                return new List<MyModel> {
+                    new MyModel {
                         Id = 1,
                         Description = "description"
                     }
                 };
             });
         }
 
-        public Task<TodoItem> GetAsync(int id)
+        public Task<MyModel> GetAsync(int id)
         {
             throw new NotImplementedException();
         }
@@ -46,7 +46,7 @@ public Task<object> GetRelationshipsAsync(int id, string relationshipName)
             throw new NotImplementedException();
         }
 
-        public Task<TodoItem> UpdateAsync(int id, TodoItem entity)
+        public Task<MyModel> UpdateAsync(int id, MyModel entity)
         {
             throw new NotImplementedException();
         }

src/NoEntityFrameworkExample/Startup.cs

@@ -34,11 +34,11 @@ public void ConfigureServices(IServiceCollection services)
             services.AddJsonApi(options => {
                 options.Namespace = "api/v1";
                 options.BuildContextGraph((builder) => {
-                    builder.AddResource<TodoItem>("TodoItems");
+                    builder.AddResource<MyModel>("MyModels");
                 });
             }, mvcBuilder);
 
-            services.AddScoped<IResourceService<TodoItem>, TodoItemService>();
+            services.AddScoped<IResourceService<MyModel>, MyModelService>();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

test/JsonApiDotNetCoreExampleTests/Acceptance/Extensibility/NoEntityFrameworkTests.cs

@@ -25,15 +25,16 @@ public async Task Can_Implement_Custom_IResourceService_Without_EFAsync()
             var client = server.CreateClient();
 
             var httpMethod = new HttpMethod("GET");
-            var route = $"/api/v1/todo-items";
+            var route = $"/api/v1/my-models";
 
             var request = new HttpRequestMessage(httpMethod, route);
 
             // act
             var response = await client.SendAsync(request);
             var responseBody = await response.Content.ReadAsStringAsync();
             Console.WriteLine(responseBody);
-            var deserializedBody = server.GetService<IJsonApiDeSerializer>().DeserializeList<TodoItem>(responseBody);
+            var deserializedBody = server.GetService<IJsonApiDeSerializer>()
+                .DeserializeList<MyModel>(responseBody);
 
             // assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);