diff --git a/Francesco.Recipes.World/Repositories/Instruction/IInstructionRepository.cs b/Francesco.Recipes.World/Repositories/Instruction/IInstructionRepository.cs index 057eb02..e1fd1e6 100644 --- a/Francesco.Recipes.World/Repositories/Instruction/IInstructionRepository.cs +++ b/Francesco.Recipes.World/Repositories/Instruction/IInstructionRepository.cs @@ -10,8 +10,8 @@ Task RemoveInstructionFromRecipeAsync(Guid recipeId, Guid instructionId); - Task SwapInstructionOrderAsync(Instruction a, Instruction b); + Task SwapInstructionNumbersAsync(Instruction a, Instruction b); - Task> GetInstructionsByInstructionIdAsync(Guid instructionId); + Task> GetInstructionsOfRecipeAsync(Guid instructionId); } } diff --git a/Francesco.Recipes.World/Repositories/Instruction/InstructionRepository.cs b/Francesco.Recipes.World/Repositories/Instruction/InstructionRepository.cs index a95e22d..9a4445d 100644 --- a/Francesco.Recipes.World/Repositories/Instruction/InstructionRepository.cs +++ b/Francesco.Recipes.World/Repositories/Instruction/InstructionRepository.cs @@ -70,7 +70,7 @@ } } - public async Task> GetInstructionsByInstructionIdAsync(Guid instructionId) + public async Task> GetInstructionsOfRecipeAsync(Guid instructionId) { var instruction = await _context.Instructions .Include(i => i.Recipe) @@ -85,7 +85,7 @@ return instruction.Recipe.Instructions.ToList(); } - public async Task SwapInstructionOrderAsync(Instruction a, Instruction b) + public async Task SwapInstructionNumbersAsync(Instruction a, Instruction b) { if (a == null) { diff --git a/Francesco.Recipes.World/Services/Instruction/InstructionService.cs b/Francesco.Recipes.World/Services/Instruction/InstructionService.cs index 895cf66..c7a4acc 100644 --- a/Francesco.Recipes.World/Services/Instruction/InstructionService.cs +++ b/Francesco.Recipes.World/Services/Instruction/InstructionService.cs @@ -19,7 +19,7 @@ namespace Francesco.Recipes.World.Services.Instruction private async Task MoveInstructionAsync(Guid instructionId, bool moveUp) { - var instructions = await _instructionRepository.GetInstructionsByInstructionIdAsync(instructionId); + var instructions = await _instructionRepository.GetInstructionsOfRecipeAsync(instructionId); var instruction = instructions.FirstOrDefault(i => i.Id == instructionId); @@ -36,12 +36,12 @@ namespace Francesco.Recipes.World.Services.Instruction return; } - var targetNumber = moveUp ? instruction.Number - 1 : instruction.Number + 1; + var targetNumber = moveUp ? instruction.Number + 1 : instruction.Number - 1; var neighbor = instructions.FirstOrDefault(i => i.Number == targetNumber); if (neighbor != null) { - await _instructionRepository.SwapInstructionOrderAsync(instruction, neighbor); + await _instructionRepository.SwapInstructionNumbersAsync(instruction, neighbor); } } }