Merge branch 'master' into ReduceQuestXPGold

Author: Yeldur

src/Application/Games/Commands/GetGameUserCommand.cs

@@ -173,6 +173,7 @@ public async ValueTask<Result<GameUserViewModel>> Handle(GetGameUserCommand req,
 
                 // No need to save here since a character will be created and a save will be needed.
                 _db.ActivityLogs.Add(_activityLogService.CreateUserCreatedLog(user.Id));
+                await _questAssignmentService.AssignQuestsToNewUserAsync(user.Id, cancellationToken);
             }
             else
             {
@@ -208,7 +209,6 @@ await _db.Entry(user)
 
                 _db.ActivityLogs.Add(_activityLogService.CreateCharacterCreatedLog(user.Id, user.ActiveCharacter.Id));
                 await _db.SaveChangesAsync(cancellationToken);
-                await _questAssignmentService.AssignQuestsToNewUserAsync(user.Id, cancellationToken);
             }
             else
             {

src/Application/Quests/Commands/RerollQuestCommand.cs

@@ -35,12 +35,13 @@ public async ValueTask<Result> Handle(RerollQuestCommand req,
             CancellationToken cancellationToken)
         {
             int price = constants.QuestRerollDailyQuestPrice;
-            var userQuest = await db.UserQuests
+            var userDailyQuests = await db.UserQuests
                 .Include(uq => uq.QuestDefinition)
                 .Include(uq => uq.User!)
-                .FirstOrDefaultAsync(
-                    uq => uq.Id == req.UserQuestId && uq.UserId == req.UserId &&
-                          uq.QuestDefinition!.Type == QuestType.Daily, cancellationToken);
+                .Where(uq => uq.UserId == req.UserId && uq.QuestDefinition!.Type == QuestType.Daily)
+                .ToListAsync(cancellationToken);
+
+            var userQuest = userDailyQuests.FirstOrDefault(uq => uq.Id == req.UserQuestId);
 
             if (userQuest == null)
             {
@@ -68,9 +69,11 @@ public async ValueTask<Result> Handle(RerollQuestCommand req,
                 return new(CommonErrors.NotEnoughGold(price, user.Gold));
             }
 
+            var assignedQuestDefinitionIds = userDailyQuests.Select(uq => uq.QuestDefinitionId).ToHashSet();
+
             user.Gold -= price;
 
-            var newUserQuest = await questAssignmentService.ReplaceDailyUserQuestAsync(userQuest, cancellationToken);
+            var newUserQuest = await questAssignmentService.ReplaceDailyUserQuestAsync(userQuest, assignedQuestDefinitionIds,  cancellationToken);
 
             db.ActivityLogs.Add(activityLogService.CreateQuestRerolledLog(
                 req.UserId, userQuest.Id, newUserQuest.Id, price));

src/Application/Quests/Services/IQuestAssignmentService.cs

@@ -30,6 +30,7 @@ public interface IQuestAssignmentService
     /// Reroll selected quest.
     /// </summary>
     /// <param name="userQuest">Old user quest.</param>
+    /// <param name="assignedQuestDefinitionIds">All daily quests definitions assigned to user now.</param>
     /// <param name="cancellationToken">Cancellation token.</param>
-    Task<UserQuest> ReplaceDailyUserQuestAsync(UserQuest userQuest, CancellationToken cancellationToken = default);
+    Task<UserQuest> ReplaceDailyUserQuestAsync(UserQuest userQuest, HashSet<int> assignedQuestDefinitionIds, CancellationToken cancellationToken = default);
 }

src/Application/Quests/Services/QuestAssignmentService.cs

@@ -201,11 +201,10 @@ public async Task AssignQuestsToNewUserAsync(int userId, CancellationToken cance
         await db.SaveChangesAsync(cancellationToken);
     }
 
-    public async Task<UserQuest> ReplaceDailyUserQuestAsync(UserQuest userQuest,
-        CancellationToken cancellationToken = default)
+    public async Task<UserQuest> ReplaceDailyUserQuestAsync(UserQuest userQuest, HashSet<int> assignedQuestDefinitionIds, CancellationToken cancellationToken = default)
     {
         var questDefinitions = await db.QuestDefinitions
-            .Where(qd => qd.IsActive && qd.Type == QuestType.Daily && userQuest.QuestDefinition!.Id != qd.Id)
+            .Where(qd => qd.IsActive && qd.Type == QuestType.Daily && !assignedQuestDefinitionIds.Contains(qd.Id))
             .ToListAsync(cancellationToken);
 
         var randomQuestDefinition = questDefinitions.Shuffle().FirstOrDefault() ?? throw new InvalidOperationException("No available daily quest definitions found.");

src/Module.Server/Common/Models/CrpgAgentStatCalculateModel.cs

@@ -550,6 +550,7 @@ static double Polynomial(float x)
                     1.0f);
 
                 props.WeaponInaccuracy *= encumbranceMultiplier;
+                props.WeaponInaccuracy = MathF.Clamp(props.WeaponInaccuracy, 0f, 1f);
 
                 // Reload & draw speed penalty: linearly drops from 1.0 at 20 to 0.25 at 30
                 float reloadThrustMultiplier = totalEncumbrance <= 20f

test/Application.UTest/Quests/RerollQuestCommandTest.cs

@@ -311,8 +311,8 @@ public async Task ShouldRerollQuestSuccessfully()
         activityLogServiceMock.Setup(al => al.CreateQuestRerolledLog(user.Id, userQuest.Id, newUserQuest.Id, Constants.QuestRerollDailyQuestPrice))
             .Returns(new ActivityLog());
         Mock<IQuestAssignmentService> questAssignmentServiceMock = new();
-        questAssignmentServiceMock.Setup(q => q.ReplaceDailyUserQuestAsync(It.IsAny<UserQuest>(), It.IsAny<CancellationToken>()))
-            .Callback<UserQuest, CancellationToken>((uq, ct) =>
+        questAssignmentServiceMock.Setup(q => q.ReplaceDailyUserQuestAsync(It.IsAny<UserQuest>(), It.IsAny<HashSet<int>>(), It.IsAny<CancellationToken>()))
+            .Callback<UserQuest, HashSet<int>, CancellationToken>((uq, aq, ct) =>
             {
                 // Simulate removal of old quest and addition of new one as the real service does
                 ActDb.UserQuests.Remove(uq);
@@ -338,7 +338,7 @@ public async Task ShouldRerollQuestSuccessfully()
         var dbUser = await AssertDb.Users.FirstAsync(u => u.Id == user.Id);
         Assert.That(dbUser.Gold, Is.EqualTo(700)); // 1000 - 300
 
-        questAssignmentServiceMock.Verify(q => q.ReplaceDailyUserQuestAsync(It.IsAny<UserQuest>(), It.IsAny<CancellationToken>()), Times.Once);
+        questAssignmentServiceMock.Verify(q => q.ReplaceDailyUserQuestAsync(It.IsAny<UserQuest>(), It.IsAny<HashSet<int>>(), It.IsAny<CancellationToken>()), Times.Once);
         activityLogServiceMock.Verify(al => al.CreateQuestRerolledLog(
             user.Id, userQuest.Id, newUserQuest.Id, Constants.QuestRerollDailyQuestPrice), Times.Once);
 

test/Application.UTest/Quests/Services/QuestAssignmentServiceTest.cs

@@ -218,12 +218,14 @@ public async Task ReplaceDailyUserQuestShouldReplaceWithDifferentDefinitionAndKe
 
         QuestAssignmentService service = new(ActDb, Constants);
 
+        var assignedDailyQuests = await ActDb.UserQuests.Where(uq => uq.UserId == user.Id).Select(uq => uq.QuestDefinitionId).ToHashSetAsync();
+
         UserQuest oldUserQuest = await ActDb.UserQuests
             .Include(uq => uq.User)
             .Include(uq => uq.QuestDefinition)
             .FirstAsync(uq => uq.Id == 100);
 
-        UserQuest newUserQuest = await service.ReplaceDailyUserQuestAsync(oldUserQuest);
+        UserQuest newUserQuest = await service.ReplaceDailyUserQuestAsync(oldUserQuest, assignedDailyQuests);
 
         bool oldQuestExists = await AssertDb.UserQuests.AnyAsync(uq => uq.Id == 100);
         UserQuest dbNewQuest = await AssertDb.UserQuests