Refactor namespaces and nullability handling across project

SculptTechProject · SculptTechProject · commit d7ec8508d4d5 · 2025-11-22T20:53:05.000+01:00
- Standardized namespaces for better organization (`sparkly_server.Services.Users`, `sparkly_server.DTO.Auth`, etc.).
- Resolved nullability warnings using explicit null-forgiving operator (`!`) where applicable.
- Updated controller and service bindings to reflect namespace changes.
- Adjusted migrations to align with namespace updates.
- Enhanced `ProjectService` methods with better null checks and error handling.
diff --git a/Migrations/20251113212512_Init.Designer.cs b/Migrations/20251113212512_Init.Designer.cs
diff --git a/Migrations/20251113212512_Init.cs b/Migrations/20251113212512_Init.cs
@@ -3,7 +3,7 @@
 
 #nullable disable
 
-namespace sparkly_server.Migrations
+namespace sparkly_server.Services.Users.Migrations
 {
     /// <inheritdoc />
     public partial class Init : Migration
diff --git a/Migrations/20251114220854_Username.Designer.cs b/Migrations/20251114220854_Username.Designer.cs
diff --git a/Migrations/20251114220854_Username.cs b/Migrations/20251114220854_Username.cs
@@ -2,7 +2,7 @@
 
 #nullable disable
 
-namespace sparkly_server.Migrations
+namespace sparkly_server.Services.Users.Migrations
 {
     /// <inheritdoc />
     public partial class Username : Migration
diff --git a/Migrations/20251114234534_RefreshToken.Designer.cs b/Migrations/20251114234534_RefreshToken.Designer.cs
diff --git a/Migrations/20251114234534_RefreshToken.cs b/Migrations/20251114234534_RefreshToken.cs
@@ -3,7 +3,7 @@
 
 #nullable disable
 
-namespace sparkly_server.Migrations
+namespace sparkly_server.Services.Users.Migrations
 {
     /// <inheritdoc />
     public partial class RefreshToken : Migration
diff --git a/Migrations/20251119102854_Default_value_for_visibility.Designer.cs b/Migrations/20251119102854_Default_value_for_visibility.Designer.cs
diff --git a/Migrations/20251119102854_Default_value_for_visibility.cs b/Migrations/20251119102854_Default_value_for_visibility.cs
@@ -3,7 +3,7 @@
 
 #nullable disable
 
-namespace sparkly_server.Migrations
+namespace sparkly_server.Services.Users.Migrations
 {
     /// <inheritdoc />
     public partial class Default_value_for_visibility : Migration
diff --git a/Migrations/20251119191413_Members_project.Designer.cs b/Migrations/20251119191413_Members_project.Designer.cs
diff --git a/Migrations/20251119191413_Members_project.cs b/Migrations/20251119191413_Members_project.cs
@@ -2,7 +2,7 @@
 
 #nullable disable
 
-namespace sparkly_server.Migrations
+namespace sparkly_server.Services.Users.Migrations
 {
     /// <inheritdoc />
     public partial class Members_project : Migration
diff --git a/Migrations/AppDbContextModelSnapshot.cs b/Migrations/AppDbContextModelSnapshot.cs
@@ -8,7 +8,7 @@
 
 #nullable disable
 
-namespace sparkly_server.Migrations
+namespace sparkly_server.Services.Users.Migrations
 {
     [DbContext(typeof(AppDbContext))]
     partial class AppDbContextModelSnapshot : ModelSnapshot
diff --git a/Program.cs b/Program.cs
@@ -1,13 +1,12 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
+using Scalar.AspNetCore;
 using sparkly_server.Enum;
 using sparkly_server.Infrastructure;
 using sparkly_server.Services.Auth;
-using sparkly_server.Services.Users;
-using sparkly_server.Services.UserServices;
 using sparkly_server.Services.Projects;
-using Scalar.AspNetCore;
+using sparkly_server.Services.Users;
 using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
diff --git a/sparkly-server.csproj b/sparkly-server.csproj
@@ -47,4 +47,10 @@
       <Content Include=".github\workflows\ci.yml" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Compile Remove="sparkly-server.test\HealthzTest.cs" />
+      <Compile Remove="sparkly-server.test\TestWebAppliactionFactory.cs" />
+      <Compile Remove="sparkly-server.test\UserTest.cs" />
+    </ItemGroup>
+
 </Project>
diff --git a/sparkly-server.test/HealthzTest.cs b/sparkly-server.test/HealthzTest.cs
@@ -1,6 +1,7 @@
-﻿using System.Net;
+﻿using Sparkly.Tests.Infrastructure;
+using System.Net;
 
-namespace sparkly_server.test;
+namespace sparkly_server.Services.Users.test;
 
 public class HealthzTest : IClassFixture<TestWebApplicationFactory>
 {
diff --git a/sparkly-server.test/TestWebAppliactionFactory.cs b/sparkly-server.test/TestWebAppliactionFactory.cs
@@ -5,17 +5,17 @@
 using Microsoft.Extensions.DependencyInjection;
 using sparkly_server.Infrastructure;
 
-namespace sparkly_server.test;
+namespace Sparkly.Tests.Infrastructure;
 
 public class TestWebApplicationFactory : WebApplicationFactory<Program>
 {
     protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
         builder.UseEnvironment("Testing");
         
-        builder.ConfigureAppConfiguration((context, config) =>
+        builder.ConfigureAppConfiguration((config) =>
         {
-            var settings = new Dictionary<string, string>
+            var settings = new Dictionary<string, string?>
             {
                 ["SPARKLY_JWT_KEY"] = "this-is-very-long-test-jwt-key-123456",
                 ["SPARKLY_JWT_ISSUER"] = "sparkly-test-issuer"
diff --git a/sparkly-server.test/UserTest.cs b/sparkly-server.test/UserTest.cs
@@ -1,10 +1,11 @@
 ﻿using Microsoft.Extensions.DependencyInjection;
-using sparkly_server.DTO;
+using sparkly_server.DTO.Auth;
 using sparkly_server.Infrastructure;
+using Sparkly.Tests.Infrastructure;
 using System.Text;
 using System.Text.Json;
 
-namespace sparkly_server.test
+namespace sparkly_server.Services.Users.test
 {
     public class UserTest : IClassFixture<TestWebApplicationFactory>, IAsyncLifetime
     {
diff --git a/sparkly-server.test/sparkly-server.test.csproj b/sparkly-server.test/sparkly-server.test.csproj
@@ -6,6 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
+      <NoWarn>$(NoWarn);MSB3026</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Controllers/User/AuthController.cs b/src/Controllers/User/AuthController.cs
@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using sparkly_server.DTO;
+using sparkly_server.DTO.Auth;
 using sparkly_server.Services.Auth;
 using sparkly_server.Services.Users;
 
-namespace sparkly_server.Controllers
+namespace sparkly_server.Controllers.User
 {
     [ApiController]
     [Route("api/v1/auth")]
diff --git a/src/Controllers/User/ProfileController.cs b/src/Controllers/User/ProfileController.cs
@@ -1,10 +1,9 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using sparkly_server.Infrastructure;
-using sparkly_server.Services.Auth;
 using sparkly_server.Services.Users;
 
-namespace sparkly_server.Controllers
+namespace sparkly_server.Controllers.User
 {
     [Authorize]
     [ApiController]
diff --git a/src/DTO/Auth/Auth.cs b/src/DTO/Auth/Auth.cs
@@ -1,4 +1,4 @@
-namespace sparkly_server.DTO
+namespace sparkly_server.DTO.Auth
 {
     public record RegisterRequest(string Username, string Email, string Password);
     public record LoginRequest(string Identifier, string Password);
diff --git a/src/Domain/Auth/RefreshToken.cs b/src/Domain/Auth/RefreshToken.cs
@@ -1,3 +1,5 @@
+using sparkly_server.Domain.Users;
+
 namespace sparkly_server.Domain.Auth
 {
     public class RefreshToken
diff --git a/src/Domain/Projects/Project.cs b/src/Domain/Projects/Project.cs
@@ -1,13 +1,14 @@
-﻿using sparkly_server.Enum;
+﻿using sparkly_server.Domain.Users;
+using sparkly_server.Enum;
 
 namespace sparkly_server.Domain.Projects
 {
     public class Project
     {
         public Guid Id { get; private set; }
-        public string ProjectName { get; private set; }
-        public string Description { get; private set; }
-        public string Slug { get; private set; }
+        public string ProjectName { get; private set; } = string.Empty;
+        public string Description { get; private set; } = string.Empty;
+        public string Slug { get; private set; } = string.Empty;
         public DateTime CreatedAt { get; private set; }
         public Guid OwnerId { get; private set; }
         private readonly List<string> _tags = new();
@@ -152,7 +153,7 @@ public void RemoveMember(User user)
             if (user is null)
                 throw new ArgumentNullException(nameof(user));
 
-            if (_members.Any(m => m.Id == user.Id))
+            if (!_members.Any(m => m.Id == user.Id))
                 return;
 
             _members.Remove(user);
diff --git a/src/Domain/Users/User.cs b/src/Domain/Users/User.cs
@@ -1,7 +1,7 @@
 using sparkly_server.Domain.Auth;
 using sparkly_server.Domain.Projects;
 
-namespace sparkly_server.Domain
+namespace sparkly_server.Domain.Users
 {
     public class User
     {
diff --git a/src/Infrastructure/AppDbContext.cs b/src/Infrastructure/AppDbContext.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
-using sparkly_server.Domain;
 using sparkly_server.Domain.Auth;
 using sparkly_server.Domain.Projects;
+using sparkly_server.Domain.Users;
 using sparkly_server.Enum;
 
 namespace sparkly_server.Infrastructure
diff --git a/src/Services/Auth/AuthService.cs b/src/Services/Auth/AuthService.cs
@@ -55,7 +55,7 @@ public async Task<AuthResult> RefreshAsync(string refreshToken, CancellationToke
         {
             if (string.IsNullOrWhiteSpace(refreshToken))
             {
-                return null;
+                return null!;
             }
 
             var entity = await _db.RefreshTokens
@@ -64,7 +64,7 @@ public async Task<AuthResult> RefreshAsync(string refreshToken, CancellationToke
 
             if (entity is null || !entity.IsActive)
             {
-                return null;
+                return null!;
             }
 
             var user = entity.User;
diff --git a/src/Services/Auth/IJwtProvider.cs b/src/Services/Auth/IJwtProvider.cs
@@ -1,4 +1,4 @@
-using sparkly_server.Domain;
+using sparkly_server.Domain.Users;
 
 namespace sparkly_server.Services.Auth
 {
diff --git a/src/Services/Auth/JwtProvider.cs b/src/Services/Auth/JwtProvider.cs
@@ -1,5 +1,5 @@
 using Microsoft.IdentityModel.Tokens;
-using sparkly_server.Domain;
+using sparkly_server.Domain.Users;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Security.Cryptography;
diff --git a/src/Services/Projects/ProjectService.cs b/src/Services/Projects/ProjectService.cs
@@ -41,9 +41,11 @@ public async Task<Project> CreateProjectAsync(string name, string description, P
             return project;
         }
         
-        public Task<Project> GetProjectByIdAsync(Guid projectId, CancellationToken cancellationToken = default)
+        public async Task<Project> GetProjectByIdAsync(Guid projectId, CancellationToken cancellationToken = default)
         {
-            var project = _projects.GetByIdAsync(projectId, cancellationToken);
+            var project = await _projects.GetByIdAsync(projectId, cancellationToken)
+                          ?? throw new InvalidOperationException("Project not found");
+
             return project;
         }
         
@@ -214,7 +216,7 @@ public async Task DeleteProjectAsync(Guid projectId, CancellationToken cancellat
             if (!isOwner && !isAdmin)
                 throw new UnauthorizedAccessException("You are not allowed to delete this project.");
 
-            _projects.DeleteAsync(projectId, cancellationToken);
+            await _projects.DeleteAsync(projectId, cancellationToken);
             
             await _projects.SaveChangesAsync(cancellationToken);
         }
diff --git a/src/Services/Users/IUserRepository.cs b/src/Services/Users/IUserRepository.cs
@@ -1,4 +1,4 @@
-using sparkly_server.Domain;
+using sparkly_server.Domain.Users;
 
 namespace sparkly_server.Services.Users
 {
diff --git a/src/Services/Users/IUserService.cs b/src/Services/Users/IUserService.cs
@@ -1,4 +1,4 @@
-using sparkly_server.Domain;
+using sparkly_server.Domain.Users;
 
 namespace sparkly_server.Services.Users
 {
diff --git a/src/Services/Users/UserRepository.cs b/src/Services/Users/UserRepository.cs
@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using sparkly_server.Domain;
+using sparkly_server.Domain.Users;
 using sparkly_server.Infrastructure;
 
 namespace sparkly_server.Services.Users
diff --git a/src/Services/Users/UserService.cs b/src/Services/Users/UserService.cs
@@ -1,8 +1,7 @@
 using Microsoft.AspNetCore.Identity;
-using sparkly_server.Domain;
-using sparkly_server.Services.Users;
+using sparkly_server.Domain.Users;
 
-namespace sparkly_server.Services.UserServices
+namespace sparkly_server.Services.Users
 {
     public class UserService : IUserService
     {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#nullable disable`
`5`	`5`
`6`		`-namespace sparkly_server.Migrations`
	`6`	`+namespace sparkly_server.Services.Users.Migrations`
`7`	`7`	`{`
`8`	`8`	`/// <inheritdoc />`
`9`	`9`	`public partial class Init : Migration`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#nullable disable`
`4`	`4`
`5`		`-namespace sparkly_server.Migrations`
	`5`	`+namespace sparkly_server.Services.Users.Migrations`
`6`	`6`	`{`
`7`	`7`	`/// <inheritdoc />`
`8`	`8`	`public partial class Username : Migration`