improvements

codeandwhisky · codeandwhisky · commit 9a5883674ea8 · 2025-08-18T13:36:58.000+05:30
diff --git a/src/Extensions/WebAppBuilderExtension.cs b/src/Extensions/WebAppBuilderExtension.cs
@@ -1,24 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using FluentValidation;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http.Json;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OpenApi.Models;
 using Serilog;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using System;
-using Microsoft.EntityFrameworkCore;
 using System.Threading.RateLimiting;
-using Microsoft.AspNetCore.RateLimiting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Configuration;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.IdentityModel.Tokens;
 using NetAPI.Infrastructure;
diff --git a/src/Extensions/WebAppExtensions.cs b/src/Extensions/WebAppExtensions.cs
@@ -1,10 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using Microsoft.AspNetCore.Builder;
 using Serilog;
-using NetAPI.Features.Posts;
-using Microsoft.OpenApi.Models;
-using NetAPI.Common.Api;
 using NetAPI.Features;
 using NetAPI.Features.GraphQL.Configuration;
 
diff --git a/src/Features/GraphQL/Configuration/GraphQLConfiguration.cs b/src/Features/GraphQL/Configuration/GraphQLConfiguration.cs
@@ -1,9 +1,3 @@
-using HotChocolate.Diagnostics;
-using HotChocolate.Execution.Configuration;
-using HotChocolate.Execution;
-using HotChocolate.Language;
-using HotChocolate.AspNetCore;
-using HotChocolate.AspNetCore.Extensions;
 using Microsoft.EntityFrameworkCore;
 using NetAPI.Features.GraphQL.Data;
 using NetAPI.Features.GraphQL.DataLoaders;
diff --git a/src/Features/GraphQL/Configuration/GraphQLVoyagerExtensions.cs b/src/Features/GraphQL/Configuration/GraphQLVoyagerExtensions.cs
@@ -1,6 +1,3 @@
-using Microsoft.AspNetCore.Http;
-using System.Text;
-
 namespace NetAPI.Features.GraphQL.Configuration;
 
 /// <summary>
diff --git a/src/Features/GraphQL/DataLoaders/BlogDataLoaders.cs b/src/Features/GraphQL/DataLoaders/BlogDataLoaders.cs
@@ -15,7 +15,7 @@ public BlogByIdDataLoader(
         IDbContextFactory<BlogDbContext> dbContextFactory,
         IBatchScheduler batchScheduler,
         DataLoaderOptions? options = null)
-        : base(batchScheduler, options)
+        : base(batchScheduler, options ?? new DataLoaderOptions())
     {
         _dbContextFactory = dbContextFactory;
     }
@@ -76,7 +76,7 @@ public PostByIdDataLoader(
         IDbContextFactory<BlogDbContext> dbContextFactory,
         IBatchScheduler batchScheduler,
         DataLoaderOptions? options = null)
-        : base(batchScheduler, options)
+        : base(batchScheduler, options ?? new DataLoaderOptions())
     {
         _dbContextFactory = dbContextFactory;
     }
diff --git a/src/Features/GraphQL/Resolvers/FieldResolvers.cs b/src/Features/GraphQL/Resolvers/FieldResolvers.cs
@@ -1,4 +1,3 @@
-using HotChocolate;
 using NetAPI.Features.GraphQL.DataLoaders;
 using NetAPI.Features.GraphQL.Models;
 using NetAPI.Features.GraphQL.Services;
@@ -44,7 +43,7 @@ public async Task<IEnumerable<CommentType>> GetRecentCommentsAsync(
         CancellationToken cancellationToken)
     {
         var comments = await commentLoader.LoadAsync(blog.Id, cancellationToken);
-        return comments.Take(10).Select(MapCommentToType); // Return only recent 10 comments
+        return comments?.Take(10).Select(MapCommentToType) ?? Enumerable.Empty<CommentType>(); // Return only recent 10 comments
     }
 
     /// <summary>
@@ -56,7 +55,7 @@ public async Task<int> GetPublishedPostCountAsync(
         CancellationToken cancellationToken)
     {
         var posts = await postLoader.LoadAsync(blog.Id, cancellationToken);
-        return posts.Count(p => p.IsPublished);
+        return posts?.Count(p => p.IsPublished) ?? 0;
     }
 
     /// <summary>
@@ -68,7 +67,7 @@ public async Task<int> GetDraftPostCountAsync(
         CancellationToken cancellationToken)
     {
         var posts = await postLoader.LoadAsync(blog.Id, cancellationToken);
-        return posts.Count(p => !p.IsPublished);
+        return posts?.Count(p => !p.IsPublished) ?? 0;
     }
 
     /// <summary>
@@ -80,7 +79,7 @@ public async Task<int> GetTotalViewsAsync(
         CancellationToken cancellationToken)
     {
         var posts = await postLoader.LoadAsync(blog.Id, cancellationToken);
-        return posts.Sum(p => p.ViewCount);
+        return posts?.Sum(p => p.ViewCount) ?? 0;
     }
 
     /// <summary>
@@ -92,7 +91,7 @@ public async Task<int> GetTotalLikesAsync(
         CancellationToken cancellationToken)
     {
         var posts = await postLoader.LoadAsync(blog.Id, cancellationToken);
-        return posts.Sum(p => p.LikeCount);
+        return posts?.Sum(p => p.LikeCount) ?? 0;
     }
 
     /// <summary>
@@ -105,7 +104,7 @@ public async Task<int> GetTotalLikesAsync(
         CancellationToken cancellationToken)
     {
         var posts = await postLoader.LoadAsync(blog.Id, cancellationToken);
-        var mostPopular = posts.OrderByDescending(p => p.ViewCount).FirstOrDefault();
+        var mostPopular = posts?.OrderByDescending(p => p.ViewCount).FirstOrDefault();
         
         if (mostPopular == null) return null;
         
@@ -122,7 +121,7 @@ public async Task<int> GetTotalLikesAsync(
         CancellationToken cancellationToken)
     {
         var posts = await postLoader.LoadAsync(blog.Id, cancellationToken);
-        var latest = posts.OrderByDescending(p => p.CreatedAt).FirstOrDefault();
+        var latest = posts?.OrderByDescending(p => p.CreatedAt).FirstOrDefault();
         
         if (latest == null) return null;
         
@@ -226,7 +225,7 @@ public async Task<IEnumerable<CommentType>> GetCommentsAsync(
         CancellationToken cancellationToken)
     {
         var comments = await commentLoader.LoadAsync(post.Id, cancellationToken);
-        return comments.Select(MapCommentToType);
+        return comments?.Select(MapCommentToType) ?? Enumerable.Empty<CommentType>();
     }
 
     /// <summary>
@@ -238,7 +237,7 @@ public async Task<IEnumerable<CommentType>> GetApprovedCommentsAsync(
         CancellationToken cancellationToken)
     {
         var comments = await commentLoader.LoadAsync(post.Id, cancellationToken);
-        return comments.Where(c => c.IsApproved).Select(MapCommentToType);
+        return comments?.Where(c => c.IsApproved).Select(MapCommentToType) ?? Enumerable.Empty<CommentType>();
     }
 
     /// <summary>
@@ -250,10 +249,10 @@ public async Task<IEnumerable<CommentType>> GetRecentCommentsAsync(
         CancellationToken cancellationToken)
     {
         var comments = await commentLoader.LoadAsync(post.Id, cancellationToken);
-        return comments.Where(c => c.IsApproved)
+        return comments?.Where(c => c.IsApproved)
                       .OrderByDescending(c => c.CreatedAt)
                       .Take(5)
-                      .Select(MapCommentToType);
+                      .Select(MapCommentToType) ?? Enumerable.Empty<CommentType>();
     }
 
     /// <summary>
@@ -394,9 +393,9 @@ public TimeSpan GetTimeAgo([Parent] CommentType comment)
     }
 
     // Helper methods
-    private static async Task<BlogType> MapBlogToTypeAsync(Blog blog, IBlogService blogService, CancellationToken cancellationToken)
+    private static Task<BlogType> MapBlogToTypeAsync(Blog blog, IBlogService blogService, CancellationToken cancellationToken)
     {
-        return new BlogType
+        return Task.FromResult(new BlogType
         {
             Id = blog.Id,
             Title = blog.Title,
@@ -410,12 +409,12 @@ private static async Task<BlogType> MapBlogToTypeAsync(Blog blog, IBlogService b
             PostCount = blog.Posts?.Count ?? 0,
             CommentCount = blog.Comments?.Count ?? 0,
             LastPostDate = blog.Posts?.OrderByDescending(p => p.CreatedAt).FirstOrDefault()?.CreatedAt
-        };
+        });
     }
 
-    private static async Task<PostType> MapPostToTypeAsync(Post post, IPostService postService, CancellationToken cancellationToken)
+    private static Task<PostType> MapPostToTypeAsync(Post post, IPostService postService, CancellationToken cancellationToken)
     {
-        return new PostType
+        return Task.FromResult(new PostType
         {
             Id = post.Id,
             Title = post.Title,
@@ -434,7 +433,7 @@ private static async Task<PostType> MapPostToTypeAsync(Post post, IPostService p
             CommentCount = post.Comments?.Count ?? 0,
             ReadingTime = CalculateReadingTime(post.Content),
             Slug = GenerateSlug(post.Title)
-        };
+        });
     }
 
     private static CommentType MapCommentToType(Comment comment)
diff --git a/src/Features/GraphQL/Resolvers/Mutation.cs b/src/Features/GraphQL/Resolvers/Mutation.cs
@@ -1,8 +1,6 @@
 using GqlAuthorize = HotChocolate.Authorization.AuthorizeAttribute;
-using Microsoft.AspNetCore.Authorization;
 using NetAPI.Features.GraphQL.Services;
 using NetAPI.Features.GraphQL.Types;
-using System.Security.Claims;
 
 namespace NetAPI.Features.GraphQL.Resolvers;
 
diff --git a/src/Features/GraphQL/Resolvers/Query.cs b/src/Features/GraphQL/Resolvers/Query.cs
@@ -2,7 +2,6 @@
 using NetAPI.Features.GraphQL.Models;
 using NetAPI.Features.GraphQL.Services;
 using NetAPI.Features.GraphQL.Types;
-using System.Security.Claims;
 
 namespace NetAPI.Features.GraphQL.Resolvers;
 
@@ -181,9 +180,9 @@ public async Task<SearchResultType> SearchAsync(
     }
 
     // Helper methods for mapping entities to GraphQL types
-    private static async Task<BlogType> MapBlogToTypeAsync(Blog blog, IBlogService blogService, CancellationToken cancellationToken)
+    private static Task<BlogType> MapBlogToTypeAsync(Blog blog, IBlogService blogService, CancellationToken cancellationToken)
     {
-        return new BlogType
+        return Task.FromResult(new BlogType
         {
             Id = blog.Id,
             Title = blog.Title,
@@ -197,12 +196,12 @@ private static async Task<BlogType> MapBlogToTypeAsync(Blog blog, IBlogService b
             PostCount = blog.Posts?.Count ?? 0,
             CommentCount = blog.Comments?.Count ?? 0,
             LastPostDate = blog.Posts?.OrderByDescending(p => p.CreatedAt).FirstOrDefault()?.CreatedAt
-        };
+        });
     }
 
-    private static async Task<PostType> MapPostToTypeAsync(Post post, IPostService postService, CancellationToken cancellationToken)
+    private static Task<PostType> MapPostToTypeAsync(Post post, IPostService postService, CancellationToken cancellationToken)
     {
-        return new PostType
+        return Task.FromResult(new PostType
         {
             Id = post.Id,
             Title = post.Title,
@@ -221,7 +220,7 @@ private static async Task<PostType> MapPostToTypeAsync(Post post, IPostService p
             CommentCount = post.Comments?.Count ?? 0,
             ReadingTime = CalculateReadingTime(post.Content),
             Slug = GenerateSlug(post.Title)
-        };
+        });
     }
 
     private static CommentType MapCommentToType(Comment comment)
diff --git a/src/Features/GraphQL/Resolvers/Subscription.cs b/src/Features/GraphQL/Resolvers/Subscription.cs
@@ -1,4 +1,3 @@
-using NetAPI.Features.GraphQL.DataLoaders;
 using NetAPI.Features.GraphQL.Models;
 using NetAPI.Features.GraphQL.Types;
 
diff --git a/src/Features/GraphQL/Services/BlogService.cs b/src/Features/GraphQL/Services/BlogService.cs
@@ -2,7 +2,6 @@
 using NetAPI.Features.GraphQL.Data;
 using NetAPI.Features.GraphQL.Models;
 using NetAPI.Features.GraphQL.Types;
-using System.Text.RegularExpressions;
 
 namespace NetAPI.Features.GraphQL.Services;
 
diff --git a/src/Features/Posts/CreatePost.cs b/src/Features/Posts/CreatePost.cs
@@ -12,9 +12,9 @@ public static void Map(IEndpointRouteBuilder app) => app
     public record Request(string Title, string? Content);
     public record CreatedResponse(int Id);
 
-    private static async Task<Ok<CreatedResponse>> Handle(Request request, ClaimsPrincipal claimsPrincipal, CancellationToken cancellationToken)
+    private static Task<Ok<CreatedResponse>> Handle(Request request, ClaimsPrincipal claimsPrincipal, CancellationToken cancellationToken)
     {
         var response = new CreatedResponse(2);
-        return TypedResults.Ok(response);
+        return Task.FromResult(TypedResults.Ok(response));
     }
 }
diff --git a/src/Infrastructure/DependencyInjection.cs b/src/Infrastructure/DependencyInjection.cs
@@ -1,9 +1,6 @@
 namespace NetAPI.Infrastructure;
 
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using Microsoft.AspNetCore.Builder;
-using Serilog;
 
 [ExcludeFromCodeCoverage]
 public static class DependencyInjection
diff --git a/src/Program.cs b/src/Program.cs
@@ -1,10 +1,4 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
-using System;
-using Microsoft.AspNetCore.Http;
 using Serilog;
-using Microsoft.Extensions.Configuration;
 
 
 try

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public BlogByIdDataLoader(`
`15`	`15`	`IDbContextFactory<BlogDbContext> dbContextFactory,`
`16`	`16`	`IBatchScheduler batchScheduler,`
`17`	`17`	`DataLoaderOptions? options = null)`
`18`		`- : base(batchScheduler, options)`
	`18`	`+ : base(batchScheduler, options ?? new DataLoaderOptions())`
`19`	`19`	`{`
`20`	`20`	`_dbContextFactory = dbContextFactory;`
`21`	`21`	`}`
`@@ -76,7 +76,7 @@ public PostByIdDataLoader(`
`76`	`76`	`IDbContextFactory<BlogDbContext> dbContextFactory,`
`77`	`77`	`IBatchScheduler batchScheduler,`
`78`	`78`	`DataLoaderOptions? options = null)`
`79`		`- : base(batchScheduler, options)`
	`79`	`+ : base(batchScheduler, options ?? new DataLoaderOptions())`
`80`	`80`	`{`
`81`	`81`	`_dbContextFactory = dbContextFactory;`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using HotChocolate;`
`2`	`1`	`using NetAPI.Features.GraphQL.DataLoaders;`
`3`	`2`	`using NetAPI.Features.GraphQL.Models;`
`4`	`3`	`using NetAPI.Features.GraphQL.Services;`
`@@ -44,7 +43,7 @@ public async Task<IEnumerable<CommentType>> GetRecentCommentsAsync(`
`44`	`43`	`CancellationToken cancellationToken)`
`45`	`44`	`{`
`46`	`45`	`var comments = await commentLoader.LoadAsync(blog.Id, cancellationToken);`
`47`		`- return comments.Take(10).Select(MapCommentToType); // Return only recent 10 comments`
	`46`	`+ return comments?.Take(10).Select(MapCommentToType) ?? Enumerable.Empty<CommentType>(); // Return only recent 10 comments`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`/// <summary>`
`@@ -56,7 +55,7 @@ public async Task<int> GetPublishedPostCountAsync(`
`56`	`55`	`CancellationToken cancellationToken)`
`57`	`56`	`{`
`58`	`57`	`var posts = await postLoader.LoadAsync(blog.Id, cancellationToken);`
`59`		`- return posts.Count(p => p.IsPublished);`
	`58`	`+ return posts?.Count(p => p.IsPublished) ?? 0;`
`60`	`59`	`}`
`61`	`60`
`62`	`61`	`/// <summary>`
`@@ -68,7 +67,7 @@ public async Task<int> GetDraftPostCountAsync(`
`68`	`67`	`CancellationToken cancellationToken)`
`69`	`68`	`{`
`70`	`69`	`var posts = await postLoader.LoadAsync(blog.Id, cancellationToken);`
`71`		`- return posts.Count(p => !p.IsPublished);`
	`70`	`+ return posts?.Count(p => !p.IsPublished) ?? 0;`
`72`	`71`	`}`
`73`	`72`
`74`	`73`	`/// <summary>`
`@@ -80,7 +79,7 @@ public async Task<int> GetTotalViewsAsync(`
`80`	`79`	`CancellationToken cancellationToken)`
`81`	`80`	`{`
`82`	`81`	`var posts = await postLoader.LoadAsync(blog.Id, cancellationToken);`
`83`		`- return posts.Sum(p => p.ViewCount);`
	`82`	`+ return posts?.Sum(p => p.ViewCount) ?? 0;`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`/// <summary>`
`@@ -92,7 +91,7 @@ public async Task<int> GetTotalLikesAsync(`
`92`	`91`	`CancellationToken cancellationToken)`
`93`	`92`	`{`
`94`	`93`	`var posts = await postLoader.LoadAsync(blog.Id, cancellationToken);`
`95`		`- return posts.Sum(p => p.LikeCount);`
	`94`	`+ return posts?.Sum(p => p.LikeCount) ?? 0;`
`96`	`95`	`}`
`97`	`96`
`98`	`97`	`/// <summary>`
`@@ -105,7 +104,7 @@ public async Task<int> GetTotalLikesAsync(`
`105`	`104`	`CancellationToken cancellationToken)`
`106`	`105`	`{`
`107`	`106`	`var posts = await postLoader.LoadAsync(blog.Id, cancellationToken);`
`108`		`- var mostPopular = posts.OrderByDescending(p => p.ViewCount).FirstOrDefault();`
	`107`	`+ var mostPopular = posts?.OrderByDescending(p => p.ViewCount).FirstOrDefault();`
`109`	`108`
`110`	`109`	`if (mostPopular == null) return null;`
`111`	`110`
`@@ -122,7 +121,7 @@ public async Task<int> GetTotalLikesAsync(`
`122`	`121`	`CancellationToken cancellationToken)`
`123`	`122`	`{`
`124`	`123`	`var posts = await postLoader.LoadAsync(blog.Id, cancellationToken);`
`125`		`- var latest = posts.OrderByDescending(p => p.CreatedAt).FirstOrDefault();`
	`124`	`+ var latest = posts?.OrderByDescending(p => p.CreatedAt).FirstOrDefault();`
`126`	`125`
`127`	`126`	`if (latest == null) return null;`
`128`	`127`
`@@ -226,7 +225,7 @@ public async Task<IEnumerable<CommentType>> GetCommentsAsync(`
`226`	`225`	`CancellationToken cancellationToken)`
`227`	`226`	`{`
`228`	`227`	`var comments = await commentLoader.LoadAsync(post.Id, cancellationToken);`
`229`		`- return comments.Select(MapCommentToType);`
	`228`	`+ return comments?.Select(MapCommentToType) ?? Enumerable.Empty<CommentType>();`
`230`	`229`	`}`
`231`	`230`
`232`	`231`	`/// <summary>`
`@@ -238,7 +237,7 @@ public async Task<IEnumerable<CommentType>> GetApprovedCommentsAsync(`
`238`	`237`	`CancellationToken cancellationToken)`
`239`	`238`	`{`
`240`	`239`	`var comments = await commentLoader.LoadAsync(post.Id, cancellationToken);`
`241`		`- return comments.Where(c => c.IsApproved).Select(MapCommentToType);`
	`240`	`+ return comments?.Where(c => c.IsApproved).Select(MapCommentToType) ?? Enumerable.Empty<CommentType>();`
`242`	`241`	`}`
`243`	`242`
`244`	`243`	`/// <summary>`
`@@ -250,10 +249,10 @@ public async Task<IEnumerable<CommentType>> GetRecentCommentsAsync(`
`250`	`249`	`CancellationToken cancellationToken)`
`251`	`250`	`{`
`252`	`251`	`var comments = await commentLoader.LoadAsync(post.Id, cancellationToken);`
`253`		`- return comments.Where(c => c.IsApproved)`
	`252`	`+ return comments?.Where(c => c.IsApproved)`
`254`	`253`	`.OrderByDescending(c => c.CreatedAt)`
`255`	`254`	`.Take(5)`
`256`		`- .Select(MapCommentToType);`
	`255`	`+ .Select(MapCommentToType) ?? Enumerable.Empty<CommentType>();`
`257`	`256`	`}`
`258`	`257`
`259`	`258`	`/// <summary>`
`@@ -394,9 +393,9 @@ public TimeSpan GetTimeAgo([Parent] CommentType comment)`
`394`	`393`	`}`
`395`	`394`
`396`	`395`	`// Helper methods`
`397`		`- private static async Task<BlogType> MapBlogToTypeAsync(Blog blog, IBlogService blogService, CancellationToken cancellationToken)`
	`396`	`+ private static Task<BlogType> MapBlogToTypeAsync(Blog blog, IBlogService blogService, CancellationToken cancellationToken)`
`398`	`397`	`{`
`399`		`- return new BlogType`
	`398`	`+ return Task.FromResult(new BlogType`
`400`	`399`	`{`
`401`	`400`	`Id = blog.Id,`
`402`	`401`	`Title = blog.Title,`
`@@ -410,12 +409,12 @@ private static async Task<BlogType> MapBlogToTypeAsync(Blog blog, IBlogService b`
`410`	`409`	`PostCount = blog.Posts?.Count ?? 0,`
`411`	`410`	`CommentCount = blog.Comments?.Count ?? 0,`
`412`	`411`	`LastPostDate = blog.Posts?.OrderByDescending(p => p.CreatedAt).FirstOrDefault()?.CreatedAt`
`413`		`- };`
	`412`	`+ });`
`414`	`413`	`}`
`415`	`414`
`416`		`- private static async Task<PostType> MapPostToTypeAsync(Post post, IPostService postService, CancellationToken cancellationToken)`
	`415`	`+ private static Task<PostType> MapPostToTypeAsync(Post post, IPostService postService, CancellationToken cancellationToken)`
`417`	`416`	`{`
`418`		`- return new PostType`
	`417`	`+ return Task.FromResult(new PostType`
`419`	`418`	`{`
`420`	`419`	`Id = post.Id,`
`421`	`420`	`Title = post.Title,`
`@@ -434,7 +433,7 @@ private static async Task<PostType> MapPostToTypeAsync(Post post, IPostService p`
`434`	`433`	`CommentCount = post.Comments?.Count ?? 0,`
`435`	`434`	`ReadingTime = CalculateReadingTime(post.Content),`
`436`	`435`	`Slug = GenerateSlug(post.Title)`
`437`		`- };`
	`436`	`+ });`
`438`	`437`	`}`
`439`	`438`
`440`	`439`	`private static CommentType MapCommentToType(Comment comment)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using NetAPI.Features.GraphQL.Models;`
`3`	`3`	`using NetAPI.Features.GraphQL.Services;`
`4`	`4`	`using NetAPI.Features.GraphQL.Types;`
`5`		`-using System.Security.Claims;`
`6`	`5`
`7`	`6`	`namespace NetAPI.Features.GraphQL.Resolvers;`
`8`	`7`
`@@ -181,9 +180,9 @@ public async Task<SearchResultType> SearchAsync(`
`181`	`180`	`}`
`182`	`181`
`183`	`182`	`// Helper methods for mapping entities to GraphQL types`
`184`		`- private static async Task<BlogType> MapBlogToTypeAsync(Blog blog, IBlogService blogService, CancellationToken cancellationToken)`
	`183`	`+ private static Task<BlogType> MapBlogToTypeAsync(Blog blog, IBlogService blogService, CancellationToken cancellationToken)`
`185`	`184`	`{`
`186`		`- return new BlogType`
	`185`	`+ return Task.FromResult(new BlogType`
`187`	`186`	`{`
`188`	`187`	`Id = blog.Id,`
`189`	`188`	`Title = blog.Title,`
`@@ -197,12 +196,12 @@ private static async Task<BlogType> MapBlogToTypeAsync(Blog blog, IBlogService b`
`197`	`196`	`PostCount = blog.Posts?.Count ?? 0,`
`198`	`197`	`CommentCount = blog.Comments?.Count ?? 0,`
`199`	`198`	`LastPostDate = blog.Posts?.OrderByDescending(p => p.CreatedAt).FirstOrDefault()?.CreatedAt`
`200`		`- };`
	`199`	`+ });`
`201`	`200`	`}`
`202`	`201`
`203`		`- private static async Task<PostType> MapPostToTypeAsync(Post post, IPostService postService, CancellationToken cancellationToken)`
	`202`	`+ private static Task<PostType> MapPostToTypeAsync(Post post, IPostService postService, CancellationToken cancellationToken)`
`204`	`203`	`{`
`205`		`- return new PostType`
	`204`	`+ return Task.FromResult(new PostType`
`206`	`205`	`{`
`207`	`206`	`Id = post.Id,`
`208`	`207`	`Title = post.Title,`
`@@ -221,7 +220,7 @@ private static async Task<PostType> MapPostToTypeAsync(Post post, IPostService p`
`221`	`220`	`CommentCount = post.Comments?.Count ?? 0,`
`222`	`221`	`ReadingTime = CalculateReadingTime(post.Content),`
`223`	`222`	`Slug = GenerateSlug(post.Title)`
`224`		`- };`
	`223`	`+ });`
`225`	`224`	`}`
`226`	`225`
`227`	`226`	`private static CommentType MapCommentToType(Comment comment)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using NetAPI.Features.GraphQL.DataLoaders;`
`2`	`1`	`using NetAPI.Features.GraphQL.Models;`
`3`	`2`	`using NetAPI.Features.GraphQL.Types;`
`4`	`3`