Adjusted tests a bit, also added new functions to the repository

Author: Oyvind Timian Dokk Husveg

exercise.tests/IntegrationTests/PostTests.cs

@@ -176,78 +176,46 @@ public async Task FailedCreatePostMessage(int userid, string content, string exp
             Assert.That(message["timestamp"], Is.Not.Null);
         }
         [Test]
-        public async Task GetAllPostsStatusAndMessage()
+        public async Task DeletePostById_SuccessAndNotFound()
         {
-            // Act
-            var response = await _client.GetAsync("/posts");
-            var contentString = await response.Content.ReadAsStringAsync();
-
-            JsonNode? message = null;
-            if (!string.IsNullOrWhiteSpace(contentString))
+            // Arrange, create a post first
+            var newPost = new CreatePostDTO
             {
-                message = JsonNode.Parse(contentString);
-            }
+                Userid = 1,
+                Content = "Temp post to delete"
+            };
+            var json = JsonSerializer.Serialize(newPost);
+            var requestBody = new StringContent(json, Encoding.UTF8, "application/json");
 
-            Console.WriteLine("Message: " + message);
+            var createResponse = await _client.PostAsync("/posts", requestBody);
+            var createContent = await createResponse.Content.ReadAsStringAsync();
+            var createMessage = JsonNode.Parse(createContent);
 
-            // Assert status
-            Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
+            int createdPostId = createMessage!["data"]!["id"]!.GetValue<int>();
 
-            // Assert JSON structure
-            Assert.That(message, Is.Not.Null);
-            Assert.That(message?["message"]?.GetValue<string>(), Is.EqualTo("success"));
+            // Act, delete the post
+            var deleteResponse = await _client.DeleteAsync($"/posts/{createdPostId}");
+            var deleteContent = await deleteResponse.Content.ReadAsStringAsync();
 
-            var data = message["data"];
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data.AsArray(), Has.Count.GreaterThanOrEqualTo(0));
+            // Assert delete success
+            Assert.That(deleteResponse.StatusCode, Is.EqualTo(HttpStatusCode.OK));
 
-            foreach (var post in data.AsArray())
-            {
-                Assert.That(post["id"]?.GetValue<int>(), Is.GreaterThan(0));
-                Assert.That(post["content"]?.GetValue<string>(), Is.Not.Null);
-                Assert.That(post["numLikes"]?.GetValue<int>(), Is.Not.Null);
-                Assert.That(post["comments"]?.AsArray(), Is.Not.Null);
-
-                var user = post["user"];
-                Assert.That(user, Is.Not.Null);
-                Assert.That(user!["id"]?.GetValue<int>(), Is.GreaterThan(0));
-                Assert.That(user["firstName"]?.GetValue<string>(), Is.Not.Null);
-                Assert.That(user["lastName"]?.GetValue<string>(), Is.Not.Null);
-                Assert.That(user["photo"]?.GetValue<string>(), Is.Not.Null);
-            }
-        }
+            // Act again, try deleting same post (should now be gone)
+            var deleteAgainResponse = await _client.DeleteAsync($"/posts/{createdPostId}");
+            var deleteAgainContent = await deleteAgainResponse.Content.ReadAsStringAsync();
+            var deleteAgainMessage = JsonNode.Parse(deleteAgainContent);
 
-        [TestCase(1, HttpStatusCode.NoContent)]  // existing post
-        [TestCase(9999999, HttpStatusCode.NotFound)]  // non-existing post
-        public async Task DeletePostById(int postId, HttpStatusCode expected)
-        {
-            // Act
-            var response = await _client.DeleteAsync($"/posts/{postId}");
-            var contentString = await response.Content.ReadAsStringAsync();
-
-            JsonNode? message = null;
-            if (!string.IsNullOrWhiteSpace(contentString))
-            {
-                message = JsonNode.Parse(contentString);
-            }
+            // Assert not found
+            Assert.That(deleteAgainResponse.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
+            Assert.That(deleteAgainMessage?["message"]?.GetValue<string>(), Is.EqualTo("Post not found"));
+        }
 
-            Console.WriteLine("Message: " + message);
 
-            // Assert status
-            Assert.That(response.StatusCode, Is.EqualTo(expected));
 
-            if (expected == HttpStatusCode.NotFound)
-            {
-                Assert.That(message, Is.Not.Null);
-                Assert.That(message?["message"]?.GetValue<string>(), Is.EqualTo("Post not found"));
-                Assert.That(message["data"], Is.Null);
-                Assert.That(message["timestamp"], Is.Not.Null);
-            }
-        }
 
-        [TestCase(1, "Updated content", HttpStatusCode.OK)]
+        [TestCase(5, "Updated content", HttpStatusCode.OK)]
         [TestCase(9999999, "Updated content", HttpStatusCode.NotFound)]
-        [TestCase(1, "", HttpStatusCode.BadRequest)]
+        [TestCase(5, "", HttpStatusCode.BadRequest)]
         public async Task UpdatePostById(int postId, string newContent, HttpStatusCode expected)
         {
             // Arrange

exercise.wwwapi/Endpoints/PostEndpoints.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using exercise.wwwapi.Data;
 using exercise.wwwapi.DTOs;
 using exercise.wwwapi.DTOs.GetUsers;
 using exercise.wwwapi.DTOs.Posts;
@@ -17,8 +18,9 @@ public static void ConfigurePostEndpoints(this WebApplication app)
             posts.MapPost("/", CreatePost).WithSummary("Create post");
             posts.MapGet("/", GetAllPosts).WithSummary("Get all posts");
             posts.MapPatch("/{id}", UpdatePost).WithSummary("Update a certain post");
-            posts.MapDelete("/{id}", GetAllPosts).WithSummary("Remove a certain post");
+            posts.MapDelete("/{id}", DeletePost).WithSummary("Remove a certain post");
         }
+
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
@@ -72,8 +74,7 @@ public static IResult UpdatePost(IRepository<Post> service, IMapper mapper, int
                     Message = "Content cannot be empty"
                 });
 
-            // TODO: Add new getbyid that uses includes
-            var post = service.GetById(id);
+            Post? post = service.GetById(id, q=>q.Include(p => p.User));
 
             if (post == null) return TypedResults.NotFound(new ResponseDTO<Object> { Message = "Post not found" });
 
@@ -88,5 +89,18 @@ public static IResult UpdatePost(IRepository<Post> service, IMapper mapper, int
 
             return TypedResults.Ok(new ResponseDTO<PostDTO> { Message = "Success", Data = postDTO });
         }
+
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        private static IResult DeletePost(IRepository<Post> service, int id)
+        {
+            Post? post = service.GetById(id, q => q.Include(p => p.User));
+            if (post == null) return TypedResults.NotFound(new ResponseDTO<Object> { Message = "Post not found" });
+
+            service.Delete(id);
+            service.Save();
+
+            return TypedResults.Ok(new ResponseDTO<PostDTO> { Message = "Success" });
+        }
     }
 }

exercise.wwwapi/Repository/IRepository.cs

@@ -11,6 +11,7 @@ public interface IRepository<T> where T : class
 
         IEnumerable<T> GetAllFiltered(Expression<Func<T, bool>> filter);
         IEnumerable<T> GetWithIncludes(Func<IQueryable<T>, IQueryable<T>> includeQuery);
+        T? GetById(int id, Func<IQueryable<T>, IQueryable<T>> includeQuery);
         T GetById(object id);
         void Insert(T obj);
         void Update(T obj);

exercise.wwwapi/Repository/Repository.cs

@@ -50,6 +50,13 @@ public T GetById(object id)
             return _table.Find(id);
         }
 
+        public T? GetById(int id, Func<IQueryable<T>, IQueryable<T>> includeQuery)
+        {
+            IQueryable<T> query = _table.Where(e => EF.Property<int>(e, "Id") == id);
+            query = includeQuery(query);
+            return query.FirstOrDefault();
+        }
+
         public void Insert(T obj)
         {
             _table.Add(obj);