Revert "提交"

This reverts commit b96d895809.

backend/IMTest/Service/AuthServiceTest.cs

@@ -1,208 +1,208 @@
-using AutoMapper;
-using IM_API.Dtos.Auth;
-using IM_API.Dtos.User;
-using IM_API.Exceptions;
-using IM_API.Interface.Services;
-using IM_API.Models;
-using IM_API.Services;
-using IM_API.Tools;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using Moq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Xunit;
-
-public class AuthServiceTests
-{
-    // ---------- 辅助：创建独立的 InMemory DbContext ----------
-    private ImContext CreateDbContext()
-    {
-        var options = new DbContextOptionsBuilder<ImContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-
-        var context = new ImContext(options);
-        return context;
-    }
-
-    // ---------- 可用于模拟 SaveChanges 抛异常的 DbContext ----------
-    private class ThrowOnSaveImContext : ImContext
-    {
-        private readonly bool _throw;
-        public ThrowOnSaveImContext(DbContextOptions<ImContext> options, bool throwOnSave) : base(options)
-        {
-            _throw = throwOnSave;
-        }
-
-        public override Task<int> SaveChangesAsync(CancellationToken cancellationToken = default)
-        {
-            if (_throw) throw new InvalidOperationException("Simulated DB save error");
-            return base.SaveChangesAsync(cancellationToken);
-        }
-    }
-
-    // ---------- 默认 AutoMapper（简易映射配置） ----------
-    private IMapper CreateMapper()
-    {
-        var config = new MapperConfiguration(cfg =>
-        {
-            cfg.CreateMap<RegisterRequestDto, User>();
-            cfg.CreateMap<User, UserInfoDto>();
-        });
-        return config.CreateMapper();
-    }
-
-    // ---------- 创建 Service（允许注入自定义 mapper） ----------
-    private AuthService CreateService(ImContext context, IMapper mapper = null)
-    {
-        var loggerMock = new Mock<ILogger<AuthService>>();
-        var mapperToUse = mapper ?? CreateMapper();
-        var mockCache = new Mock<ICacheService>();
-        return new AuthService(context, loggerMock.Object, mapperToUse,mockCache.Object);
-    }
-
-    // --------------------- 测试用例 ---------------------
-
-    [Fact]
-    public async Task LoginAsync_ShouldReturnUser_WhenValidCredentials()
-    {
-        var context = CreateDbContext();
-        context.Users.Add(new User { Id = 1, Username = "Tom", Password = "123456", NickName = "测试用户" });
-        await context.SaveChangesAsync();
-
-        var service = CreateService(context);
-
-        var result = await service.LoginAsync(new LoginRequestDto
-        {
-            Username = "Tom",
-            Password = "123456"
-        });
-
-        Assert.NotNull(result);
-        Assert.Equal(1, result.Id);
-        Assert.Equal("Tom", result.Username);
-    }
-
-    [Fact]
-    public async Task LoginAsync_ShouldThrowException_WhenInvalidCredentials()
-    {
-        var context = CreateDbContext();
-        var service = CreateService(context);
-
-        await Assert.ThrowsAsync<BaseException>(async () =>
-        {
-            await service.LoginAsync(new LoginRequestDto
-            {
-                Username = "NotExist",
-                Password = "wrong"
-            });
-        });
-    }
-
-    [Fact]
-    public async Task LoginAsync_IsCaseSensitive_ForUsername()
-    {
-        // 说明：当前实现是精确匹配 => 区分大小写
-        var context = CreateDbContext();
-        context.Users.Add(new User { Id = 10, Username = "Tom", Password = "p" });
-        await context.SaveChangesAsync();
-
-        var service = CreateService(context);
-
-        // 使用小写用户名应失败（表明当前逻辑区分大小写）
-        await Assert.ThrowsAsync<BaseException>(async () =>
-        {
-            await service.LoginAsync(new LoginRequestDto { Username = "tom", Password = "p" });
-        });
-    }
-
-    [Fact]
-    public async Task RegisterAsync_ShouldPersistUserAndReturnDto_WhenNewUser()
-    {
-        var context = CreateDbContext();
-        var service = CreateService(context);
-
-        var request = new RegisterRequestDto
-        {
-            Username = "Jerry",
-            Password = "123456"
-        };
-
-        var result = await service.RegisterAsync(request);
-
-        // 返回值正确
-        Assert.NotNull(result);
-        Assert.Equal("Jerry", result.Username);
-        Assert.True(result.Id > 0);
-
-        // DB 中确实存在该用户
-        var persisted = await context.Users.FirstOrDefaultAsync(u => u.Username == "Jerry");
-        Assert.NotNull(persisted);
-        Assert.Equal("Jerry", persisted.Username);
-    }
-
-    [Fact]
-    public async Task RegisterAsync_ShouldThrowException_WhenUserExists()
-    {
-        var context = CreateDbContext();
-        context.Users.Add(new User { Username = "Tom", Password = "12223" });
-        await context.SaveChangesAsync();
-
-        var service = CreateService(context);
-
-        var request = new RegisterRequestDto { Username = "Tom", Password = "123" };
-
-        await Assert.ThrowsAsync<BaseException>(() => service.RegisterAsync(request));
-    }
-
-    [Fact]
-    public async Task RegisterAsync_ShouldThrow_WhenMapperThrows()
-    {
-        var context = CreateDbContext();
-
-        var mapperMock = new Mock<IMapper>();
-        mapperMock.Setup(m => m.Map<User>(It.IsAny<RegisterRequestDto>()))
-                  .Throws(new Exception("mapper failure"));
-
-        var service = CreateService(context, mapperMock.Object);
-
-        var req = new RegisterRequestDto { Username = "A", Password = "B" };
-
-        var ex = await Assert.ThrowsAsync<Exception>(() => service.RegisterAsync(req));
-        Assert.Contains("mapper failure", ex.Message);
-    }
-
-    [Fact]
-    public async Task RegisterAsync_ShouldPropagateSaveException_WhenSaveFails()
-    {
-        var options = new DbContextOptionsBuilder<ImContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-
-        // 使用自定义上下文在 SaveChanges 时抛异常
-        var throwingContext = new ThrowOnSaveImContext(options, throwOnSave: true);
-
-        var service = CreateService(throwingContext);
-
-        var req = new RegisterRequestDto { Username = "X", Password = "P" };
-
-        var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => service.RegisterAsync(req));
-        Assert.Contains("Simulated DB save error", ex.Message);
-    }
-
-    [Fact]
-    public async Task RegisterAsync_NullDto_ThrowsNullReferenceException_CurrentBehavior()
-    {
-        // 说明：当前实现没有对 dto 为 null 做检查，会触发 NullReferenceException。
-        // 建议：在生产代码中改为抛 ArgumentNullException 或者进行参数校验并返回明确错误。
-        var context = CreateDbContext();
-        var service = CreateService(context);
-
-        await Assert.ThrowsAsync<NullReferenceException>(async () =>
-        {
-            await service.RegisterAsync(null);
-        });
-    }
-}
+using AutoMapper;
+using IM_API.Dtos.Auth;
+using IM_API.Dtos.User;
+using IM_API.Exceptions;
+using IM_API.Interface.Services;
+using IM_API.Models;
+using IM_API.Services;
+using IM_API.Tools;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Moq;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit;
+
+public class AuthServiceTests
+{
+    // ---------- 辅助：创建独立的 InMemory DbContext ----------
+    private ImContext CreateDbContext()
+    {
+        var options = new DbContextOptionsBuilder<ImContext>()
+            .UseInMemoryDatabase(Guid.NewGuid().ToString())
+            .Options;
+
+        var context = new ImContext(options);
+        return context;
+    }
+
+    // ---------- 可用于模拟 SaveChanges 抛异常的 DbContext ----------
+    private class ThrowOnSaveImContext : ImContext
+    {
+        private readonly bool _throw;
+        public ThrowOnSaveImContext(DbContextOptions<ImContext> options, bool throwOnSave) : base(options)
+        {
+            _throw = throwOnSave;
+        }
+
+        public override Task<int> SaveChangesAsync(CancellationToken cancellationToken = default)
+        {
+            if (_throw) throw new InvalidOperationException("Simulated DB save error");
+            return base.SaveChangesAsync(cancellationToken);
+        }
+    }
+
+    // ---------- 默认 AutoMapper（简易映射配置） ----------
+    private IMapper CreateMapper()
+    {
+        var config = new MapperConfiguration(cfg =>
+        {
+            cfg.CreateMap<RegisterRequestDto, User>();
+            cfg.CreateMap<User, UserInfoDto>();
+        });
+        return config.CreateMapper();
+    }
+
+    // ---------- 创建 Service（允许注入自定义 mapper） ----------
+    private AuthService CreateService(ImContext context, IMapper mapper = null)
+    {
+        var loggerMock = new Mock<ILogger<AuthService>>();
+        var mapperToUse = mapper ?? CreateMapper();
+        var mockCache = new Mock<ICacheService>();
+        return new AuthService(context, loggerMock.Object, mapperToUse,mockCache.Object);
+    }
+
+    // --------------------- 测试用例 ---------------------
+
+    [Fact]
+    public async Task LoginAsync_ShouldReturnUser_WhenValidCredentials()
+    {
+        var context = CreateDbContext();
+        context.Users.Add(new User { Id = 1, Username = "Tom", Password = "123456", NickName = "测试用户" });
+        await context.SaveChangesAsync();
+
+        var service = CreateService(context);
+
+        var result = await service.LoginAsync(new LoginRequestDto
+        {
+            Username = "Tom",
+            Password = "123456"
+        });
+
+        Assert.NotNull(result);
+        Assert.Equal(1, result.Id);
+        Assert.Equal("Tom", result.Username);
+    }
+
+    [Fact]
+    public async Task LoginAsync_ShouldThrowException_WhenInvalidCredentials()
+    {
+        var context = CreateDbContext();
+        var service = CreateService(context);
+
+        await Assert.ThrowsAsync<BaseException>(async () =>
+        {
+            await service.LoginAsync(new LoginRequestDto
+            {
+                Username = "NotExist",
+                Password = "wrong"
+            });
+        });
+    }
+
+    [Fact]
+    public async Task LoginAsync_IsCaseSensitive_ForUsername()
+    {
+        // 说明：当前实现是精确匹配 => 区分大小写
+        var context = CreateDbContext();
+        context.Users.Add(new User { Id = 10, Username = "Tom", Password = "p" });
+        await context.SaveChangesAsync();
+
+        var service = CreateService(context);
+
+        // 使用小写用户名应失败（表明当前逻辑区分大小写）
+        await Assert.ThrowsAsync<BaseException>(async () =>
+        {
+            await service.LoginAsync(new LoginRequestDto { Username = "tom", Password = "p" });
+        });
+    }
+
+    [Fact]
+    public async Task RegisterAsync_ShouldPersistUserAndReturnDto_WhenNewUser()
+    {
+        var context = CreateDbContext();
+        var service = CreateService(context);
+
+        var request = new RegisterRequestDto
+        {
+            Username = "Jerry",
+            Password = "123456"
+        };
+
+        var result = await service.RegisterAsync(request);
+
+        // 返回值正确
+        Assert.NotNull(result);
+        Assert.Equal("Jerry", result.Username);
+        Assert.True(result.Id > 0);
+
+        // DB 中确实存在该用户
+        var persisted = await context.Users.FirstOrDefaultAsync(u => u.Username == "Jerry");
+        Assert.NotNull(persisted);
+        Assert.Equal("Jerry", persisted.Username);
+    }
+
+    [Fact]
+    public async Task RegisterAsync_ShouldThrowException_WhenUserExists()
+    {
+        var context = CreateDbContext();
+        context.Users.Add(new User { Username = "Tom", Password = "12223" });
+        await context.SaveChangesAsync();
+
+        var service = CreateService(context);
+
+        var request = new RegisterRequestDto { Username = "Tom", Password = "123" };
+
+        await Assert.ThrowsAsync<BaseException>(() => service.RegisterAsync(request));
+    }
+
+    [Fact]
+    public async Task RegisterAsync_ShouldThrow_WhenMapperThrows()
+    {
+        var context = CreateDbContext();
+
+        var mapperMock = new Mock<IMapper>();
+        mapperMock.Setup(m => m.Map<User>(It.IsAny<RegisterRequestDto>()))
+                  .Throws(new Exception("mapper failure"));
+
+        var service = CreateService(context, mapperMock.Object);
+
+        var req = new RegisterRequestDto { Username = "A", Password = "B" };
+
+        var ex = await Assert.ThrowsAsync<Exception>(() => service.RegisterAsync(req));
+        Assert.Contains("mapper failure", ex.Message);
+    }
+
+    [Fact]
+    public async Task RegisterAsync_ShouldPropagateSaveException_WhenSaveFails()
+    {
+        var options = new DbContextOptionsBuilder<ImContext>()
+            .UseInMemoryDatabase(Guid.NewGuid().ToString())
+            .Options;
+
+        // 使用自定义上下文在 SaveChanges 时抛异常
+        var throwingContext = new ThrowOnSaveImContext(options, throwOnSave: true);
+
+        var service = CreateService(throwingContext);
+
+        var req = new RegisterRequestDto { Username = "X", Password = "P" };
+
+        var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => service.RegisterAsync(req));
+        Assert.Contains("Simulated DB save error", ex.Message);
+    }
+
+    [Fact]
+    public async Task RegisterAsync_NullDto_ThrowsNullReferenceException_CurrentBehavior()
+    {
+        // 说明：当前实现没有对 dto 为 null 做检查，会触发 NullReferenceException。
+        // 建议：在生产代码中改为抛 ArgumentNullException 或者进行参数校验并返回明确错误。
+        var context = CreateDbContext();
+        var service = CreateService(context);
+
+        await Assert.ThrowsAsync<NullReferenceException>(async () =>
+        {
+            await service.RegisterAsync(null);
+        });
+    }
+}

backend/IMTest/Service/FriendServiceTest.cs

@@ -1,149 +1,149 @@
-using AutoMapper;
-using IM_API.Domain.Events;
-using IM_API.Dtos.Friend;
-using IM_API.Exceptions;
-using IM_API.Models;
-using IM_API.Services;
-using MassTransit; // 必须引入
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using Moq;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Xunit;
-
-public class FriendServiceTests
-{
-    private readonly Mock<IPublishEndpoint> _mockEndpoint = new();
-    private readonly Mock<ILogger<FriendService>> _mockLogger = new();
-
-    #region 辅助构造方法
-    private ImContext CreateDbContext()
-    {
-        var options = new DbContextOptionsBuilder<ImContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString()) // 确保每个测试数据库隔离
-            .Options;
-        return new ImContext(options);
-    }
-
-    private IMapper CreateMapper()
-    {
-        var config = new MapperConfiguration(cfg =>
-        {
-            // 补充你业务中实际需要的映射规则
-            cfg.CreateMap<Friend, FriendInfoDto>();
-            cfg.CreateMap<FriendRequestDto, FriendRequest>();
-            cfg.CreateMap<FriendRequest, Friend>()
-                .ForMember(d => d.UserId, o => o.MapFrom(s => s.ResponseUser))
-                .ForMember(d => d.FriendId, o => o.MapFrom(s => s.RequestUser));
-        });
-        return config.CreateMapper();
-    }
-
-    private FriendService CreateService(ImContext context)
-    {
-        // 注入 Mock 对象和真实的 Mapper/Context
-        return new FriendService(context, _mockLogger.Object, CreateMapper(), _mockEndpoint.Object);
-    }
-    #endregion
-
-    [Fact]
-    public async Task SendFriendRequestAsync_Success_ShouldSaveAndPublish()
-    {
-        // Arrange
-        var context = CreateDbContext();
-        context.Users.AddRange(
-            new User { Id = 1, Username = "Sender", Password = "..." },
-            new User { Id = 2, Username = "Receiver", Password = "..." }
-        );
-        await context.SaveChangesAsync();
-        var service = CreateService(context);
-        var dto = new FriendRequestDto { ToUserId = 2, FromUserId = 2, Description = "Hello" , RemarkName = "测试备注" };
-
-        // Act
-        //var result = await service.SendFriendRequestAsync(dto);
-
-        // Assert
-        //Assert.True(result);
-        //Assert.Single(context.FriendRequests);
-
-        // 验证事件是否发布到了 MQ
-        /*
-        _mockEndpoint.Verify(x => x.Publish(
-            It.Is<RequestFriendEvent>(e => e.FromUserId == 1 && e.ToUserId == 2),
-            It.IsAny<CancellationToken>()),
-            Times.Once);
-        */
-    }
-
-    [Fact]
-    public async Task SendFriendRequestAsync_UserNotFound_ShouldThrow()
-    {
-        // Arrange
-        var context = CreateDbContext();
-        var service = CreateService(context);
-        var dto = new FriendRequestDto { ToUserId = 99 }; // 不存在的用户
-
-        // Act & Assert
-        await Assert.ThrowsAsync<BaseException>(() => service.SendFriendRequestAsync(dto));
-    }
-
-    [Fact]
-    public async Task SendFriendRequestAsync_AlreadyExists_ShouldThrow()
-    {
-        // Arrange
-        var context = CreateDbContext();
-        context.Users.Add(new User { Id = 2, Password = "123", Username = "111" });
-        context.FriendRequests.Add(new FriendRequest
-        {
-            RequestUser = 1,
-            ResponseUser = 2,
-            State = (sbyte)FriendRequestState.Pending,
-            RemarkName = "测试备注"
-        });
-        await context.SaveChangesAsync();
-        var service = CreateService(context);
-
-        // Act & Assert
-        await Assert.ThrowsAsync<BaseException>(() => service.SendFriendRequestAsync(new FriendRequestDto { ToUserId = 2 }));
-    }
-
-    [Fact]
-    public async Task BlockFriendAsync_ValidId_ShouldUpdateStatus()
-    {
-        // Arrange
-        var context = CreateDbContext();
-        var friend = new Friend { Id = 50, UserId = 1, FriendId = 2, StatusEnum = FriendStatus.Added,RemarkName = "测试备注" };
-        context.Friends.Add(friend);
-        await context.SaveChangesAsync();
-        var service = CreateService(context);
-
-        // Act
-        await service.BlockeFriendAsync(50);
-
-        // Assert
-        var updated = await context.Friends.FindAsync(50);
-        Assert.Equal(FriendStatus.Blocked, updated.StatusEnum);
-    }
-
-    [Fact]
-    public async Task GetFriendListAsync_ShouldFilterByStatus()
-    {
-        // Arrange
-        var context = CreateDbContext();
-        context.Friends.AddRange(
-            new Friend { UserId = 1, FriendId = 2, StatusEnum = FriendStatus.Added,RemarkName = "111" },
-            new Friend { UserId = 1, FriendId = 3, StatusEnum = FriendStatus.Blocked,RemarkName = "222" }
-        );
-        await context.SaveChangesAsync();
-        var service = CreateService(context);
-
-        // Act
-        var result = await service.GetFriendListAsync(1, 1, 10, false);
-
-        // Assert
-        //Assert.Single(result); // 只应该拿到 Added 状态的
-    }
+using AutoMapper;
+using IM_API.Domain.Events;
+using IM_API.Dtos.Friend;
+using IM_API.Exceptions;
+using IM_API.Models;
+using IM_API.Services;
+using MassTransit; // 必须引入
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Moq;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit;
+
+public class FriendServiceTests
+{
+    private readonly Mock<IPublishEndpoint> _mockEndpoint = new();
+    private readonly Mock<ILogger<FriendService>> _mockLogger = new();
+
+    #region 辅助构造方法
+    private ImContext CreateDbContext()
+    {
+        var options = new DbContextOptionsBuilder<ImContext>()
+            .UseInMemoryDatabase(Guid.NewGuid().ToString()) // 确保每个测试数据库隔离
+            .Options;
+        return new ImContext(options);
+    }
+
+    private IMapper CreateMapper()
+    {
+        var config = new MapperConfiguration(cfg =>
+        {
+            // 补充你业务中实际需要的映射规则
+            cfg.CreateMap<Friend, FriendInfoDto>();
+            cfg.CreateMap<FriendRequestDto, FriendRequest>();
+            cfg.CreateMap<FriendRequest, Friend>()
+                .ForMember(d => d.UserId, o => o.MapFrom(s => s.ResponseUser))
+                .ForMember(d => d.FriendId, o => o.MapFrom(s => s.RequestUser));
+        });
+        return config.CreateMapper();
+    }
+
+    private FriendService CreateService(ImContext context)
+    {
+        // 注入 Mock 对象和真实的 Mapper/Context
+        return new FriendService(context, _mockLogger.Object, CreateMapper(), _mockEndpoint.Object);
+    }
+    #endregion
+
+    [Fact]
+    public async Task SendFriendRequestAsync_Success_ShouldSaveAndPublish()
+    {
+        // Arrange
+        var context = CreateDbContext();
+        context.Users.AddRange(
+            new User { Id = 1, Username = "Sender", Password = "..." },
+            new User { Id = 2, Username = "Receiver", Password = "..." }
+        );
+        await context.SaveChangesAsync();
+        var service = CreateService(context);
+        var dto = new FriendRequestDto { ToUserId = 2, FromUserId = 2, Description = "Hello" , RemarkName = "测试备注" };
+
+        // Act
+        //var result = await service.SendFriendRequestAsync(dto);
+
+        // Assert
+        //Assert.True(result);
+        //Assert.Single(context.FriendRequests);
+
+        // 验证事件是否发布到了 MQ
+        /*
+        _mockEndpoint.Verify(x => x.Publish(
+            It.Is<RequestFriendEvent>(e => e.FromUserId == 1 && e.ToUserId == 2),
+            It.IsAny<CancellationToken>()),
+            Times.Once);
+        */
+    }
+
+    [Fact]
+    public async Task SendFriendRequestAsync_UserNotFound_ShouldThrow()
+    {
+        // Arrange
+        var context = CreateDbContext();
+        var service = CreateService(context);
+        var dto = new FriendRequestDto { ToUserId = 99 }; // 不存在的用户
+
+        // Act & Assert
+        await Assert.ThrowsAsync<BaseException>(() => service.SendFriendRequestAsync(dto));
+    }
+
+    [Fact]
+    public async Task SendFriendRequestAsync_AlreadyExists_ShouldThrow()
+    {
+        // Arrange
+        var context = CreateDbContext();
+        context.Users.Add(new User { Id = 2, Password = "123", Username = "111" });
+        context.FriendRequests.Add(new FriendRequest
+        {
+            RequestUser = 1,
+            ResponseUser = 2,
+            State = (sbyte)FriendRequestState.Pending,
+            RemarkName = "测试备注"
+        });
+        await context.SaveChangesAsync();
+        var service = CreateService(context);
+
+        // Act & Assert
+        await Assert.ThrowsAsync<BaseException>(() => service.SendFriendRequestAsync(new FriendRequestDto { ToUserId = 2 }));
+    }
+
+    [Fact]
+    public async Task BlockFriendAsync_ValidId_ShouldUpdateStatus()
+    {
+        // Arrange
+        var context = CreateDbContext();
+        var friend = new Friend { Id = 50, UserId = 1, FriendId = 2, StatusEnum = FriendStatus.Added,RemarkName = "测试备注" };
+        context.Friends.Add(friend);
+        await context.SaveChangesAsync();
+        var service = CreateService(context);
+
+        // Act
+        await service.BlockeFriendAsync(50);
+
+        // Assert
+        var updated = await context.Friends.FindAsync(50);
+        Assert.Equal(FriendStatus.Blocked, updated.StatusEnum);
+    }
+
+    [Fact]
+    public async Task GetFriendListAsync_ShouldFilterByStatus()
+    {
+        // Arrange
+        var context = CreateDbContext();
+        context.Friends.AddRange(
+            new Friend { UserId = 1, FriendId = 2, StatusEnum = FriendStatus.Added,RemarkName = "111" },
+            new Friend { UserId = 1, FriendId = 3, StatusEnum = FriendStatus.Blocked,RemarkName = "222" }
+        );
+        await context.SaveChangesAsync();
+        var service = CreateService(context);
+
+        // Act
+        var result = await service.GetFriendListAsync(1, 1, 10, false);
+
+        // Assert
+        //Assert.Single(result); // 只应该拿到 Added 状态的
+    }
 }

backend/IMTest/Service/GroupServiceTest.cs

@@ -1,94 +1,94 @@
-using AutoMapper;
-using IM_API.Dtos.Group;
-using IM_API.Models;
-using IM_API.Services;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using Moq;
-using Xunit;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MassTransit;
-using IM_API.Configs;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-
-namespace IM_API.Tests.Services
-{
-    public class GroupServiceTests
-    {
-        private readonly ImContext _context;
-        private readonly IMapper _mapper;
-        private readonly Mock<ILogger<GroupService>> _loggerMock = new();
-        private readonly Mock<IPublishEndpoint> _publishMock = new();
-
-        public GroupServiceTests()
-        {
-            // 1. 配置内存数据库
-            var options = new DbContextOptionsBuilder<ImContext>()
-                .UseInMemoryDatabase(databaseName: Guid.NewGuid().ToString())
-                .Options;
-            _context = new ImContext(options);
-
-            // 2. 配置真实的 AutoMapper (ProjectTo 必须使用真实配置，不能用 Mock)
-            var config = new MapperConfiguration(cfg =>
-            {
-                // 替换为你项目中真实的 Profile 类名
-                cfg.AddProfile<MapperConfig>();
-                // 如果有多个 Profile，可以继续添加或者加载整个程序集
-                // cfg.AddMaps(typeof(GroupProfile).Assembly); 
-            });
-            _mapper = config.CreateMapper();
-        }
-
-        [Fact]
-        public async Task GetGroupList_ShouldReturnPagedAndOrderedData()
-        {
-            // Arrange (准备数据)
-            var userId = 1;
-            var groups = new List<Group>
-            {
-                new Group { Id = 101, Name = "Group A", Avatar = "1111" },
-                new Group { Id = 102, Name = "Group B" , Avatar = "1111"},
-                new Group { Id = 103, Name = "Group C", Avatar = "1111" }
-            };
-
-            _context.Groups.AddRange(groups);
-            _context.GroupMembers.AddRange(new List<GroupMember>
-            {
-                new GroupMember { UserId = userId, GroupId = 101 },
-                new GroupMember { UserId = userId, GroupId = 102 },
-                new GroupMember { UserId = userId, GroupId = 103 }
-            });
-            await _context.SaveChangesAsync();
-
-            var userService = new Mock<UserService>();
-
-            var service = new GroupService(_context, _mapper, _loggerMock.Object, _publishMock.Object,userService.Object);
-
-            // Act (执行测试: 第1页，每页2条，倒序)
-            var result = await service.GetGroupListAsync(userId, page: 1, limit: 2, desc: true);
-
-            // Assert (断言)
-            Assert.NotNull(result);
-            Assert.Equal(2, result.Count);
-            Assert.Equal(103, result[0].Id); // 倒序最大的是 103
-            Assert.Equal(102, result[1].Id);
-        }
-
-        [Fact]
-        public async Task GetGroupList_ShouldReturnEmpty_WhenUserHasNoGroups()
-        {
-
-            var userSerivce = new Mock<UserService>();
-            // Arrange
-            var service = new GroupService(_context, _mapper, _loggerMock.Object, _publishMock.Object, userSerivce.Object);
-
-            // Act
-            var result = await service.GetGroupListAsync(userId: 999, page: 1, limit: 10, desc: false);
-
-            // Assert
-            Assert.Empty(result);
-        }
-    }
+using AutoMapper;
+using IM_API.Dtos.Group;
+using IM_API.Models;
+using IM_API.Services;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Xunit;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using MassTransit;
+using IM_API.Configs;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+
+namespace IM_API.Tests.Services
+{
+    public class GroupServiceTests
+    {
+        private readonly ImContext _context;
+        private readonly IMapper _mapper;
+        private readonly Mock<ILogger<GroupService>> _loggerMock = new();
+        private readonly Mock<IPublishEndpoint> _publishMock = new();
+
+        public GroupServiceTests()
+        {
+            // 1. 配置内存数据库
+            var options = new DbContextOptionsBuilder<ImContext>()
+                .UseInMemoryDatabase(databaseName: Guid.NewGuid().ToString())
+                .Options;
+            _context = new ImContext(options);
+
+            // 2. 配置真实的 AutoMapper (ProjectTo 必须使用真实配置，不能用 Mock)
+            var config = new MapperConfiguration(cfg =>
+            {
+                // 替换为你项目中真实的 Profile 类名
+                cfg.AddProfile<MapperConfig>();
+                // 如果有多个 Profile，可以继续添加或者加载整个程序集
+                // cfg.AddMaps(typeof(GroupProfile).Assembly); 
+            });
+            _mapper = config.CreateMapper();
+        }
+
+        [Fact]
+        public async Task GetGroupList_ShouldReturnPagedAndOrderedData()
+        {
+            // Arrange (准备数据)
+            var userId = 1;
+            var groups = new List<Group>
+            {
+                new Group { Id = 101, Name = "Group A", Avatar = "1111" },
+                new Group { Id = 102, Name = "Group B" , Avatar = "1111"},
+                new Group { Id = 103, Name = "Group C", Avatar = "1111" }
+            };
+
+            _context.Groups.AddRange(groups);
+            _context.GroupMembers.AddRange(new List<GroupMember>
+            {
+                new GroupMember { UserId = userId, GroupId = 101 },
+                new GroupMember { UserId = userId, GroupId = 102 },
+                new GroupMember { UserId = userId, GroupId = 103 }
+            });
+            await _context.SaveChangesAsync();
+
+            var userService = new Mock<UserService>();
+
+            var service = new GroupService(_context, _mapper, _loggerMock.Object, _publishMock.Object,userService.Object);
+
+            // Act (执行测试: 第1页，每页2条，倒序)
+            var result = await service.GetGroupListAsync(userId, page: 1, limit: 2, desc: true);
+
+            // Assert (断言)
+            Assert.NotNull(result);
+            Assert.Equal(2, result.Count);
+            Assert.Equal(103, result[0].Id); // 倒序最大的是 103
+            Assert.Equal(102, result[1].Id);
+        }
+
+        [Fact]
+        public async Task GetGroupList_ShouldReturnEmpty_WhenUserHasNoGroups()
+        {
+
+            var userSerivce = new Mock<UserService>();
+            // Arrange
+            var service = new GroupService(_context, _mapper, _loggerMock.Object, _publishMock.Object, userSerivce.Object);
+
+            // Act
+            var result = await service.GetGroupListAsync(userId: 999, page: 1, limit: 10, desc: false);
+
+            // Assert
+            Assert.Empty(result);
+        }
+    }
 }

backend/IMTest/Service/UserServiceTest.cs

@@ -1,186 +1,186 @@
-using AutoMapper;
-using IM_API.Dtos.User;
-using IM_API.Exceptions;
-using IM_API.Interface.Services;
-using IM_API.Models;
-using IM_API.Services;
-using IM_API.Tools;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using Moq;
-using StackExchange.Redis;
-using System;
-using System.Threading.Tasks;
-using Xunit;
-
-public class UserServiceTests
-{
-    private ImContext CreateDbContext()
-    {
-        var options = new DbContextOptionsBuilder<ImContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString())
-            .Options;
-
-        return new ImContext(options);
-    }
-
-    private IMapper CreateMapper()
-    {
-        var config = new MapperConfiguration(cfg =>
-        {
-            cfg.CreateMap<User, UserInfoDto>();
-            cfg.CreateMap<UpdateUserDto, User>();
-        });
-        return config.CreateMapper();
-    }
-
-    private UserService CreateService(ImContext context)
-    {
-        var loggerMock = new Mock<ILogger<UserService>>();
-        var mapper = CreateMapper();
-        var mockCache = new Mock<ICacheService>();
-        var res = new Mock<IConnectionMultiplexer>();
-        return new UserService(context, loggerMock.Object, mapper , mockCache.Object, res.Object);
-    }
-
-    // ========== GetUserInfoAsync ==========
-    [Fact]
-    public async Task GetUserInfoAsync_ShouldReturnUser_WhenExists()
-    {
-        var context = CreateDbContext();
-        context.Users.Add(new User { Id = 1, Username = "Tom", Password = "123456" });
-        await context.SaveChangesAsync();
-
-        var service = CreateService(context);
-        var result = await service.GetUserInfoAsync(1);
-
-        Assert.NotNull(result);
-        Assert.Equal("Tom", result.Username);
-    }
-
-    [Fact]
-    public async Task GetUserInfoAsync_ShouldThrow_WhenNotFound()
-    {
-        var service = CreateService(CreateDbContext());
-
-        await Assert.ThrowsAsync<BaseException>(() =>
-            service.GetUserInfoAsync(999)
-        );
-    }
-
-    // ========== GetUserInfoByUsernameAsync ==========
-    [Fact]
-    public async Task GetUserInfoByUsernameAsync_ShouldReturn_WhenExists()
-    {
-        var context = CreateDbContext();
-        context.Users.Add(new User { Id = 2, Username = "Jerry", Password = "aaa" });
-        await context.SaveChangesAsync();
-
-        var service = CreateService(context);
-        var result = await service.GetUserInfoByUsernameAsync("Jerry");
-
-        Assert.NotNull(result);
-        Assert.Equal(2, result.Id);
-    }
-
-    [Fact]
-    public async Task GetUserInfoByUsernameAsync_ShouldThrow_WhenNotFound()
-    {
-        var service = CreateService(CreateDbContext());
-
-        await Assert.ThrowsAsync<BaseException>(() =>
-            service.GetUserInfoByUsernameAsync("Nobody")
-        );
-    }
-
-    // ========== ResetPasswordAsync ==========
-    [Fact]
-    public async Task ResetPasswordAsync_ShouldReset_WhenCorrectPassword()
-    {
-        var context = CreateDbContext();
-        context.Users.Add(new User { Id = 3, Username = "test", Password = "old" });
-        await context.SaveChangesAsync();
-
-        var service = CreateService(context);
-        var result = await service.ResetPasswordAsync(3, "old", "new");
-
-        Assert.True(result);
-        Assert.Equal("new", context.Users.Find(3).Password);
-    }
-
-    [Fact]
-    public async Task ResetPasswordAsync_ShouldThrow_WhenWrongPassword()
-    {
-        var context = CreateDbContext();
-        context.Users.Add(new User { Id = 4, Username = "test", Password = "oldPwd" });
-        await context.SaveChangesAsync();
-
-        var service = CreateService(context);
-
-        await Assert.ThrowsAsync<BaseException>(() =>
-            service.ResetPasswordAsync(4, "wrong", "new")
-        );
-    }
-
-    [Fact]
-    public async Task ResetPasswordAsync_ShouldThrow_WhenUserNotFound()
-    {
-        var service = CreateService(CreateDbContext());
-
-        await Assert.ThrowsAsync<BaseException>(() =>
-            service.ResetPasswordAsync(123, "anything", "new")
-        );
-    }
-
-    // ========== UpdateOlineStatusAsync ==========
-    [Fact]
-    public async Task UpdateOlineStatusAsync_ShouldUpdateStatus()
-    {
-        var context = CreateDbContext();
-        context.Users.Add(new User { Id = 5, Username = "test", Password = "p", OnlineStatusEnum = UserOnlineStatus.Offline });
-        await context.SaveChangesAsync();
-
-        var service = CreateService(context);
-        var result = await service.UpdateOlineStatusAsync(5, UserOnlineStatus.Online);
-
-        Assert.True(result);
-        Assert.Equal(UserOnlineStatus.Online, context.Users.Find(5).OnlineStatusEnum);
-    }
-
-    [Fact]
-    public async Task UpdateOlineStatusAsync_ShouldThrow_WhenUserNotFound()
-    {
-        var service = CreateService(CreateDbContext());
-
-        await Assert.ThrowsAsync<BaseException>(() =>
-            service.UpdateOlineStatusAsync(999, UserOnlineStatus.Online)
-        );
-    }
-
-    // ========== UpdateUserAsync ==========
-    [Fact]
-    public async Task UpdateUserAsync_ShouldUpdateUserFields()
-    {
-        var context = CreateDbContext();
-        context.Users.Add(new User { Id = 6, Username = "test", Password = "p", NickName = "OldName" });
-        await context.SaveChangesAsync();
-
-        var service = CreateService(context);
-        var dto = new UpdateUserDto { NickName = "NewName" };
-
-        var result = await service.UpdateUserAsync(6, dto);
-
-        Assert.NotNull(result);
-        Assert.Equal("NewName", context.Users.Find(6).NickName);
-    }
-
-    [Fact]
-    public async Task UpdateUserAsync_ShouldThrow_WhenNotFound()
-    {
-        var service = CreateService(CreateDbContext());
-
-        await Assert.ThrowsAsync<BaseException>(() =>
-            service.UpdateUserAsync(123, new UpdateUserDto { NickName = "Test" })
-        );
-    }
-}
+using AutoMapper;
+using IM_API.Dtos.User;
+using IM_API.Exceptions;
+using IM_API.Interface.Services;
+using IM_API.Models;
+using IM_API.Services;
+using IM_API.Tools;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Moq;
+using StackExchange.Redis;
+using System;
+using System.Threading.Tasks;
+using Xunit;
+
+public class UserServiceTests
+{
+    private ImContext CreateDbContext()
+    {
+        var options = new DbContextOptionsBuilder<ImContext>()
+            .UseInMemoryDatabase(Guid.NewGuid().ToString())
+            .Options;
+
+        return new ImContext(options);
+    }
+
+    private IMapper CreateMapper()
+    {
+        var config = new MapperConfiguration(cfg =>
+        {
+            cfg.CreateMap<User, UserInfoDto>();
+            cfg.CreateMap<UpdateUserDto, User>();
+        });
+        return config.CreateMapper();
+    }
+
+    private UserService CreateService(ImContext context)
+    {
+        var loggerMock = new Mock<ILogger<UserService>>();
+        var mapper = CreateMapper();
+        var mockCache = new Mock<ICacheService>();
+        var res = new Mock<IConnectionMultiplexer>();
+        return new UserService(context, loggerMock.Object, mapper , mockCache.Object, res.Object);
+    }
+
+    // ========== GetUserInfoAsync ==========
+    [Fact]
+    public async Task GetUserInfoAsync_ShouldReturnUser_WhenExists()
+    {
+        var context = CreateDbContext();
+        context.Users.Add(new User { Id = 1, Username = "Tom", Password = "123456" });
+        await context.SaveChangesAsync();
+
+        var service = CreateService(context);
+        var result = await service.GetUserInfoAsync(1);
+
+        Assert.NotNull(result);
+        Assert.Equal("Tom", result.Username);
+    }
+
+    [Fact]
+    public async Task GetUserInfoAsync_ShouldThrow_WhenNotFound()
+    {
+        var service = CreateService(CreateDbContext());
+
+        await Assert.ThrowsAsync<BaseException>(() =>
+            service.GetUserInfoAsync(999)
+        );
+    }
+
+    // ========== GetUserInfoByUsernameAsync ==========
+    [Fact]
+    public async Task GetUserInfoByUsernameAsync_ShouldReturn_WhenExists()
+    {
+        var context = CreateDbContext();
+        context.Users.Add(new User { Id = 2, Username = "Jerry", Password = "aaa" });
+        await context.SaveChangesAsync();
+
+        var service = CreateService(context);
+        var result = await service.GetUserInfoByUsernameAsync("Jerry");
+
+        Assert.NotNull(result);
+        Assert.Equal(2, result.Id);
+    }
+
+    [Fact]
+    public async Task GetUserInfoByUsernameAsync_ShouldThrow_WhenNotFound()
+    {
+        var service = CreateService(CreateDbContext());
+
+        await Assert.ThrowsAsync<BaseException>(() =>
+            service.GetUserInfoByUsernameAsync("Nobody")
+        );
+    }
+
+    // ========== ResetPasswordAsync ==========
+    [Fact]
+    public async Task ResetPasswordAsync_ShouldReset_WhenCorrectPassword()
+    {
+        var context = CreateDbContext();
+        context.Users.Add(new User { Id = 3, Username = "test", Password = "old" });
+        await context.SaveChangesAsync();
+
+        var service = CreateService(context);
+        var result = await service.ResetPasswordAsync(3, "old", "new");
+
+        Assert.True(result);
+        Assert.Equal("new", context.Users.Find(3).Password);
+    }
+
+    [Fact]
+    public async Task ResetPasswordAsync_ShouldThrow_WhenWrongPassword()
+    {
+        var context = CreateDbContext();
+        context.Users.Add(new User { Id = 4, Username = "test", Password = "oldPwd" });
+        await context.SaveChangesAsync();
+
+        var service = CreateService(context);
+
+        await Assert.ThrowsAsync<BaseException>(() =>
+            service.ResetPasswordAsync(4, "wrong", "new")
+        );
+    }
+
+    [Fact]
+    public async Task ResetPasswordAsync_ShouldThrow_WhenUserNotFound()
+    {
+        var service = CreateService(CreateDbContext());
+
+        await Assert.ThrowsAsync<BaseException>(() =>
+            service.ResetPasswordAsync(123, "anything", "new")
+        );
+    }
+
+    // ========== UpdateOlineStatusAsync ==========
+    [Fact]
+    public async Task UpdateOlineStatusAsync_ShouldUpdateStatus()
+    {
+        var context = CreateDbContext();
+        context.Users.Add(new User { Id = 5, Username = "test", Password = "p", OnlineStatusEnum = UserOnlineStatus.Offline });
+        await context.SaveChangesAsync();
+
+        var service = CreateService(context);
+        var result = await service.UpdateOlineStatusAsync(5, UserOnlineStatus.Online);
+
+        Assert.True(result);
+        Assert.Equal(UserOnlineStatus.Online, context.Users.Find(5).OnlineStatusEnum);
+    }
+
+    [Fact]
+    public async Task UpdateOlineStatusAsync_ShouldThrow_WhenUserNotFound()
+    {
+        var service = CreateService(CreateDbContext());
+
+        await Assert.ThrowsAsync<BaseException>(() =>
+            service.UpdateOlineStatusAsync(999, UserOnlineStatus.Online)
+        );
+    }
+
+    // ========== UpdateUserAsync ==========
+    [Fact]
+    public async Task UpdateUserAsync_ShouldUpdateUserFields()
+    {
+        var context = CreateDbContext();
+        context.Users.Add(new User { Id = 6, Username = "test", Password = "p", NickName = "OldName" });
+        await context.SaveChangesAsync();
+
+        var service = CreateService(context);
+        var dto = new UpdateUserDto { NickName = "NewName" };
+
+        var result = await service.UpdateUserAsync(6, dto);
+
+        Assert.NotNull(result);
+        Assert.Equal("NewName", context.Users.Find(6).NickName);
+    }
+
+    [Fact]
+    public async Task UpdateUserAsync_ShouldThrow_WhenNotFound()
+    {
+        var service = CreateService(CreateDbContext());
+
+        await Assert.ThrowsAsync<BaseException>(() =>
+            service.UpdateUserAsync(123, new UpdateUserDto { NickName = "Test" })
+        );
+    }
+}