From e2b84974d0ac0383c9e574bce9f3f34d80ead9cd Mon Sep 17 00:00:00 2001 From: slimahmad6 Date: Fri, 28 Mar 2025 14:07:32 +0100 Subject: [PATCH 01/12] CODERUB : Added line break --- GitFyle.Core.Api/Controllers/ContributionTypesController.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/GitFyle.Core.Api/Controllers/ContributionTypesController.cs b/GitFyle.Core.Api/Controllers/ContributionTypesController.cs index cc7deb2d..cf57ba67 100644 --- a/GitFyle.Core.Api/Controllers/ContributionTypesController.cs +++ b/GitFyle.Core.Api/Controllers/ContributionTypesController.cs @@ -23,7 +23,8 @@ public ContributionTypesController(IContributionTypeService contributionTypeServ this.contributionTypeService = contributionTypeService; [HttpPost] - public async ValueTask> PostContributionTypeAsync(ContributionType contributionType) + public async ValueTask> PostContributionTypeAsync( + ContributionType contributionType) { try { From efe9d3694658aea55e52522b295addbb7a1a3925 Mon Sep 17 00:00:00 2001 From: slimahmad6 Date: Fri, 28 Mar 2025 14:08:48 +0100 Subject: [PATCH 02/12] CODERUB : Added line break --- .../Controllers/ContributionTypesController.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/GitFyle.Core.Api/Controllers/ContributionTypesController.cs b/GitFyle.Core.Api/Controllers/ContributionTypesController.cs index cf57ba67..cb35e3b4 100644 --- a/GitFyle.Core.Api/Controllers/ContributionTypesController.cs +++ b/GitFyle.Core.Api/Controllers/ContributionTypesController.cs @@ -38,7 +38,8 @@ public async ValueTask> PostContributionTypeAsync return BadRequest(contributionTypeValidationException.InnerException); } catch (ContributionTypeDependencyValidationException contributionTypeDependencyValidationException) - when (contributionTypeDependencyValidationException.InnerException is AlreadyExistsContributionTypeException) + when (contributionTypeDependencyValidationException.InnerException is + AlreadyExistsContributionTypeException) { return Conflict(contributionTypeDependencyValidationException.InnerException); } @@ -134,7 +135,8 @@ public async ValueTask> PutContributionTypeAsync( return Conflict(contributionTypeDependencyValidationException.InnerException); } catch (ContributionTypeDependencyValidationException contributionTypeDependencyValidationException) - when (contributionTypeDependencyValidationException.InnerException is InvalidReferenceContributionTypeException) + when (contributionTypeDependencyValidationException.InnerException is + InvalidReferenceContributionTypeException) { return FailedDependency(contributionTypeDependencyValidationException.InnerException); } @@ -153,7 +155,8 @@ public async ValueTask> PutContributionTypeAsync( } [HttpDelete("{contributionTypeId}")] - public async ValueTask> DeleteContributionTypeByIdAsync(Guid contributionTypeId) + public async ValueTask> DeleteContributionTypeByIdAsync( + Guid contributionTypeId) { try { @@ -172,7 +175,8 @@ public async ValueTask> DeleteContributionTypeByI return BadRequest(contributionTypeValidationException.InnerException); } catch (ContributionTypeDependencyValidationException contributionTypeDependencyValidationException) - when (contributionTypeDependencyValidationException.InnerException is InvalidReferenceContributionTypeException) + when (contributionTypeDependencyValidationException.InnerException is + InvalidReferenceContributionTypeException) { return FailedDependency(contributionTypeDependencyValidationException.InnerException); } From 0fc58d86f6ee1922aa2c6afe4065c0951b76b1fd Mon Sep 17 00:00:00 2001 From: slimahmad6 Date: Mon, 31 Mar 2025 21:18:58 +0100 Subject: [PATCH 03/12] CODERUB : Fixed indentation and naming --- ...nTypesControllerTests.Exceptions.Delete.cs | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs index 49e63242..2bedcc84 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs @@ -22,7 +22,7 @@ public partial class ContributionTypesControllerTests public async Task ShouldReturnBadRequestOnDeleteIfValidationErrorOccursAsync(Xeption validationException) { // given - Guid someId = Guid.NewGuid(); + Guid someContributionTypeId = Guid.NewGuid(); BadRequestObjectResult expectedBadRequestObjectResult = BadRequest(validationException.InnerException); @@ -36,7 +36,7 @@ public async Task ShouldReturnBadRequestOnDeleteIfValidationErrorOccursAsync(Xep // when ActionResult actualActionResult = - await this.contributionTypesController.DeleteContributionTypeByIdAsync(someId); + await this.contributionTypesController.DeleteContributionTypeByIdAsync(someContributionTypeId); // then actualActionResult.ShouldBeEquivalentTo(expectedActionResult); @@ -54,7 +54,7 @@ public async Task ShouldReturnInternalServerErrorOnDeleteIfServerErrorOccurredAs Xeption validationException) { // given - Guid someId = Guid.NewGuid(); + Guid someContributionTypeId = Guid.NewGuid(); InternalServerErrorObjectResult expectedBadRequestObjectResult = InternalServerError(validationException); @@ -68,7 +68,7 @@ public async Task ShouldReturnInternalServerErrorOnDeleteIfServerErrorOccurredAs // when ActionResult actualActionResult = - await this.contributionTypesController.DeleteContributionTypeByIdAsync(someId); + await this.contributionTypesController.DeleteContributionTypeByIdAsync(someContributionTypeId); // then actualActionResult.ShouldBeEquivalentTo(expectedActionResult); @@ -84,7 +84,7 @@ public async Task ShouldReturnInternalServerErrorOnDeleteIfServerErrorOccurredAs public async Task ShouldReturnNotFoundOnDeleteIfItemDoesNotExistAsync() { // given - Guid someId = Guid.NewGuid(); + Guid someContributionTypeId = Guid.NewGuid(); string someMessage = GetRandomString(); var notFoundContributionTypeException = @@ -108,7 +108,7 @@ public async Task ShouldReturnNotFoundOnDeleteIfItemDoesNotExistAsync() // when ActionResult actualActionResult = - await this.contributionTypesController.DeleteContributionTypeByIdAsync(someId); + await this.contributionTypesController.DeleteContributionTypeByIdAsync(someContributionTypeId); // then actualActionResult.ShouldBeEquivalentTo(expectedActionResult); @@ -124,7 +124,7 @@ public async Task ShouldReturnNotFoundOnDeleteIfItemDoesNotExistAsync() public async Task ShouldReturnLockedOnDeleteIfRecordIsLockedAsync() { // given - Guid someId = Guid.NewGuid(); + Guid someContributionTypeId = Guid.NewGuid(); var someInnerException = new Exception(); string someMessage = GetRandomString(); var someDictionaryData = GetRandomDictionaryData(); @@ -141,11 +141,11 @@ public async Task ShouldReturnLockedOnDeleteIfRecordIsLockedAsync() innerException: lockedContributionTypeException, data: someDictionaryData); - LockedObjectResult expectedConflictObjectResult = + LockedObjectResult expectedFailedDependencyObjectResult = Locked(lockedContributionTypeException); var expectedActionResult = - new ActionResult(expectedConflictObjectResult); + new ActionResult(expectedFailedDependencyObjectResult ); this.contributionTypeServiceMock.Setup(service => service.RemoveContributionTypeByIdAsync(It.IsAny())) @@ -153,7 +153,7 @@ public async Task ShouldReturnLockedOnDeleteIfRecordIsLockedAsync() // when ActionResult actualActionResult = - await this.contributionTypesController.DeleteContributionTypeByIdAsync(someId); + await this.contributionTypesController.DeleteContributionTypeByIdAsync(someContributionTypeId); // then actualActionResult.ShouldBeEquivalentTo(expectedActionResult); @@ -166,31 +166,31 @@ public async Task ShouldReturnLockedOnDeleteIfRecordIsLockedAsync() } [Fact] - public async Task ShouldReturnFailedDependencyOnDeleteIfReferenceErrorOccursAsync() + public async Task ShouldReturnFailedDependencyOnDeleteIfReferenceExceptionOccursAsync() { // given - Guid someId = Guid.NewGuid(); + Guid someContributionTypeId = Guid.NewGuid(); ContributionType someContributionType = CreateRandomContributionType(); var someInnerException = new Exception(); string someMessage = GetRandomString(); - var invalidReferenceContributionTypeException = - new InvalidReferenceContributionTypeException( - message: someMessage, - innerException: someInnerException, - data: someInnerException.Data); + var invalidReferenceContributionTypeException = + new InvalidReferenceContributionTypeException( + message: someMessage, + innerException: someInnerException, + data: someInnerException.Data); - var contributionTypeDependencyValidationException = - new ContributionTypeDependencyValidationException( - message: someMessage, - innerException: invalidReferenceContributionTypeException, - data: invalidReferenceContributionTypeException.Data); + var contributionTypeDependencyValidationException = + new ContributionTypeDependencyValidationException( + message: someMessage, + innerException: invalidReferenceContributionTypeException, + data: invalidReferenceContributionTypeException.Data); - FailedDependencyObjectResult expectedConflictObjectResult = - FailedDependency(invalidReferenceContributionTypeException); + FailedDependencyObjectResult expectedFailedDependencyObjectResult = + FailedDependency(invalidReferenceContributionTypeException); - var expectedActionResult = - new ActionResult(expectedConflictObjectResult); + var expectedActionResult = + new ActionResult(expectedFailedDependencyObjectResult ); this.contributionTypeServiceMock.Setup(service => @@ -199,7 +199,7 @@ public async Task ShouldReturnFailedDependencyOnDeleteIfReferenceErrorOccursAsyn // when ActionResult actualActionResult = - await this.contributionTypesController.DeleteContributionTypeByIdAsync(someId); + await this.contributionTypesController.DeleteContributionTypeByIdAsync(someContributionTypeId); // then actualActionResult.ShouldBeEquivalentTo(expectedActionResult); From bc1452a9d5c13647afd2f001d253125f46d858d0 Mon Sep 17 00:00:00 2001 From: slimahmad6 Date: Mon, 31 Mar 2025 22:13:08 +0100 Subject: [PATCH 04/12] CODERUB: Fixed naming and indentation --- ...nTypesControllerTests.Exceptions.Delete.cs | 41 ++++++++++--------- .../ContributionTypesController.cs | 4 +- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs index 2bedcc84..eeddbe07 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs @@ -19,7 +19,8 @@ public partial class ContributionTypesControllerTests { [Theory] [MemberData(nameof(ValidationExceptions))] - public async Task ShouldReturnBadRequestOnDeleteIfValidationErrorOccursAsync(Xeption validationException) + public async Task ShouldReturnBadRequestOnDeleteIfValidationExceptionOccursAsync( + Xeption validationException) { // given Guid someContributionTypeId = Guid.NewGuid(); @@ -50,21 +51,21 @@ public async Task ShouldReturnBadRequestOnDeleteIfValidationErrorOccursAsync(Xep [Theory] [MemberData(nameof(ServerExceptions))] - public async Task ShouldReturnInternalServerErrorOnDeleteIfServerErrorOccurredAsync( - Xeption validationException) + public async Task ShouldReturnInternalServerErrorOnDeleteIfServerExceptionOccurredAsync( + Xeption serverException) { // given Guid someContributionTypeId = Guid.NewGuid(); - InternalServerErrorObjectResult expectedBadRequestObjectResult = - InternalServerError(validationException); + InternalServerErrorObjectResult expectedInternalServerErrorObjectResult = + InternalServerError(serverException); var expectedActionResult = - new ActionResult(expectedBadRequestObjectResult); + new ActionResult(expectedInternalServerErrorObjectResult); this.contributionTypeServiceMock.Setup(service => service.RemoveContributionTypeByIdAsync(It.IsAny())) - .ThrowsAsync(validationException); + .ThrowsAsync(serverException); // when ActionResult actualActionResult = @@ -81,7 +82,7 @@ public async Task ShouldReturnInternalServerErrorOnDeleteIfServerErrorOccurredAs } [Fact] - public async Task ShouldReturnNotFoundOnDeleteIfItemDoesNotExistAsync() + public async Task ShouldReturnNotFoundOnDeleteIfContributionTypeDoesNotExistAsync() { // given Guid someContributionTypeId = Guid.NewGuid(); @@ -121,7 +122,7 @@ public async Task ShouldReturnNotFoundOnDeleteIfItemDoesNotExistAsync() } [Fact] - public async Task ShouldReturnLockedOnDeleteIfRecordIsLockedAsync() + public async Task ShouldReturnLockedOnDeleteIfLockedContributionTypeExceptionOccursAsync() { // given Guid someContributionTypeId = Guid.NewGuid(); @@ -130,22 +131,22 @@ public async Task ShouldReturnLockedOnDeleteIfRecordIsLockedAsync() var someDictionaryData = GetRandomDictionaryData(); var lockedContributionTypeException = - new LockedContributionTypeException( - message: someMessage, - innerException: someInnerException, - data: someInnerException.Data); + new LockedContributionTypeException( + message: someMessage, + innerException: someInnerException, + data: someInnerException.Data); var contributionTypeDependencyValidationException = - new ContributionTypeDependencyValidationException( - message: someMessage, - innerException: lockedContributionTypeException, - data: someDictionaryData); + new ContributionTypeDependencyValidationException( + message: someMessage, + innerException: lockedContributionTypeException, + data: someDictionaryData); - LockedObjectResult expectedFailedDependencyObjectResult = - Locked(lockedContributionTypeException); + LockedObjectResult expectedLockedObjectResult = + Locked(lockedContributionTypeException); var expectedActionResult = - new ActionResult(expectedFailedDependencyObjectResult ); + new ActionResult(expectedLockedObjectResult); this.contributionTypeServiceMock.Setup(service => service.RemoveContributionTypeByIdAsync(It.IsAny())) diff --git a/GitFyle.Core.Api/Controllers/ContributionTypesController.cs b/GitFyle.Core.Api/Controllers/ContributionTypesController.cs index cb35e3b4..64519916 100644 --- a/GitFyle.Core.Api/Controllers/ContributionTypesController.cs +++ b/GitFyle.Core.Api/Controllers/ContributionTypesController.cs @@ -160,10 +160,10 @@ public async ValueTask> DeleteContributionTypeByI { try { - ContributionType deleteContributionType = + ContributionType removedContributionType = await this.contributionTypeService.RemoveContributionTypeByIdAsync(contributionTypeId); - return Ok(deleteContributionType); + return Ok(removedContributionType); } catch (ContributionTypeValidationException contributionTypeValidationException) when (contributionTypeValidationException.InnerException is NotFoundContributionTypeException) From 89f267f474dfe8ef58f51011d7935717a82f3c71 Mon Sep 17 00:00:00 2001 From: slimahmad6 Date: Fri, 4 Apr 2025 19:56:21 +0100 Subject: [PATCH 05/12] CODERUB : Fixed indentation and naming --- ...tionTypesControllerTests.Exceptions.Put.cs | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Put.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Put.cs index 8a1e43b2..8ba5923f 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Put.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Put.cs @@ -18,7 +18,8 @@ public partial class ContributionTypesControllerTests { [Theory] [MemberData(nameof(ValidationExceptions))] - public async Task ShouldReturnBadRequestOnPutIfValidationErrorOccursAsync(Xeption validationException) + public async Task ShouldReturnBadRequestOnPutIfValidationExceptionOccursAsync( + Xeption validationException) { // given ContributionType someContributionType = CreateRandomContributionType(); @@ -49,21 +50,21 @@ public async Task ShouldReturnBadRequestOnPutIfValidationErrorOccursAsync(Xeptio [Theory] [MemberData(nameof(ServerExceptions))] - public async Task ShouldReturnInternalServerErrorOnPutIfServerErrorOccurredAsync( - Xeption validationException) + public async Task ShouldReturnInternalServerErrorOnPutIfServerExceptionOccurredAsync( + Xeption serverException) { // given ContributionType someContributionType = CreateRandomContributionType(); - InternalServerErrorObjectResult expectedBadRequestObjectResult = - InternalServerError(validationException); + InternalServerErrorObjectResult expectedInternalServerObjectResult = + InternalServerError(serverException); var expectedActionResult = - new ActionResult(expectedBadRequestObjectResult); + new ActionResult(expectedInternalServerObjectResult); this.contributionTypeServiceMock.Setup(service => service.ModifyContributionTypeAsync(It.IsAny())) - .ThrowsAsync(validationException); + .ThrowsAsync(serverException); // when ActionResult actualActionResult = @@ -120,7 +121,7 @@ public async Task ShouldReturnNotFoundOnPutIfItemDoesNotExistAsync() } [Fact] - public async Task ShouldReturnConflictOnPutIfAlreadyExistsContributionTypeErrorOccursAsync() + public async Task ShouldReturnConflictOnPutIfAlreadyExistsContributionTypeExceptionOccursAsync() { // given ContributionType someContributionType = CreateRandomContributionType(); @@ -165,7 +166,7 @@ public async Task ShouldReturnConflictOnPutIfAlreadyExistsContributionTypeErrorO } [Fact] - public async Task ShouldReturnFailedDependencyOnPutIfReferenceErrorOccursAsync() + public async Task ShouldReturnFailedDependencyOnPutIfReferenceExceptionOccursAsync() { // given ContributionType someContributionType = CreateRandomContributionType(); @@ -185,11 +186,11 @@ public async Task ShouldReturnFailedDependencyOnPutIfReferenceErrorOccursAsync() innerException: invalidReferenceContributionTypeException, data: someDictionaryData); - FailedDependencyObjectResult expectedConflictObjectResult = + FailedDependencyObjectResult expectedDependencyObjectResult = FailedDependency(invalidReferenceContributionTypeException); var expectedActionResult = - new ActionResult(expectedConflictObjectResult); + new ActionResult(expectedDependencyObjectResult); this.contributionTypeServiceMock.Setup(service => service.ModifyContributionTypeAsync(It.IsAny())) From 995dd0060fae7f46219e5c0d4582101b709dba0f Mon Sep 17 00:00:00 2001 From: slimahmad6 Date: Fri, 4 Apr 2025 19:59:13 +0100 Subject: [PATCH 06/12] COODERUB : Fixed naming --- .../ContributionTypesControllerTests.Exceptions.Put.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Put.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Put.cs index 8ba5923f..ad2f32d5 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Put.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Put.cs @@ -81,7 +81,7 @@ public async Task ShouldReturnInternalServerErrorOnPutIfServerExceptionOccurredA } [Fact] - public async Task ShouldReturnNotFoundOnPutIfItemDoesNotExistAsync() + public async Task ShouldReturnNotFoundOnPutIfContributionTypeDoesNotExistAsync() { // given ContributionType someContributionType = CreateRandomContributionType(); @@ -186,11 +186,11 @@ public async Task ShouldReturnFailedDependencyOnPutIfReferenceExceptionOccursAsy innerException: invalidReferenceContributionTypeException, data: someDictionaryData); - FailedDependencyObjectResult expectedDependencyObjectResult = + FailedDependencyObjectResult expectedFailedDependencyObjectResult = FailedDependency(invalidReferenceContributionTypeException); var expectedActionResult = - new ActionResult(expectedDependencyObjectResult); + new ActionResult(expectedFailedDependencyObjectResult); this.contributionTypeServiceMock.Setup(service => service.ModifyContributionTypeAsync(It.IsAny())) From 171e2f29fe1485ae767a2e9f4fc45002d28590a4 Mon Sep 17 00:00:00 2001 From: slimahmad6 Date: Sat, 5 Apr 2025 14:38:59 +0100 Subject: [PATCH 07/12] CODERUB: Removed space --- GitFyle.Core.Api/Controllers/ContributionTypesController.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/GitFyle.Core.Api/Controllers/ContributionTypesController.cs b/GitFyle.Core.Api/Controllers/ContributionTypesController.cs index 64519916..9fc2713e 100644 --- a/GitFyle.Core.Api/Controllers/ContributionTypesController.cs +++ b/GitFyle.Core.Api/Controllers/ContributionTypesController.cs @@ -198,6 +198,5 @@ public async ValueTask> DeleteContributionTypeByI return InternalServerError(contributionTypeServiceException); } } - } } From b1d75ed886c65bfbcbb2c1709a27230841c03e7f Mon Sep 17 00:00:00 2001 From: slimahmad6 Date: Tue, 15 Apr 2025 10:43:36 +0100 Subject: [PATCH 08/12] CODERUB: RemoveContributionTypeByIdAsync to use specific inputId instead of any Guid --- .../ContributionTypesControllerTests.Logic.Delete.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Logic.Delete.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Logic.Delete.cs index 416299b2..e0ceeafa 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Logic.Delete.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Logic.Delete.cs @@ -30,7 +30,7 @@ public async Task ShouldRemoveContributionTypeOnDeleteByIdAsync() new ActionResult(expectedObjectResult); contributionTypeServiceMock - .Setup(service => service.RemoveContributionTypeByIdAsync(It.IsAny())) + .Setup(service => service.RemoveContributionTypeByIdAsync(inputId)) .ReturnsAsync(storageContributionType); // when @@ -41,7 +41,7 @@ public async Task ShouldRemoveContributionTypeOnDeleteByIdAsync() actualActionResult.ShouldBeEquivalentTo(expectedActionResult); contributionTypeServiceMock - .Verify(service => service.RemoveContributionTypeByIdAsync(It.IsAny()), + .Verify(service => service.RemoveContributionTypeByIdAsync(inputId), Times.Once); contributionTypeServiceMock.VerifyNoOtherCalls(); From 371ac172191ff3e05cc878fd704fb092d6886845 Mon Sep 17 00:00:00 2001 From: slimahmad6 Date: Tue, 15 Apr 2025 10:56:45 +0100 Subject: [PATCH 09/12] CODERUB: Removed extra namespaces --- ...nTypesControllerTests.Exceptions.Delete.cs | 5 +-- .../ContributionTypesController.cs | 45 +++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs index eeddbe07..2b26b774 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs @@ -3,7 +3,6 @@ // ---------------------------------------------------------------------------------- using System; -using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; using GitFyle.Core.Api.Models.Foundations.ContributionTypes; using GitFyle.Core.Api.Models.Foundations.ContributionTypes.Exceptions; @@ -20,7 +19,7 @@ public partial class ContributionTypesControllerTests [Theory] [MemberData(nameof(ValidationExceptions))] public async Task ShouldReturnBadRequestOnDeleteIfValidationExceptionOccursAsync( - Xeption validationException) + Xeption validationException) { // given Guid someContributionTypeId = Guid.NewGuid(); @@ -52,7 +51,7 @@ public async Task ShouldReturnBadRequestOnDeleteIfValidationExceptionOccursAsync [Theory] [MemberData(nameof(ServerExceptions))] public async Task ShouldReturnInternalServerErrorOnDeleteIfServerExceptionOccurredAsync( - Xeption serverException) + Xeption serverException) { // given Guid someContributionTypeId = Guid.NewGuid(); diff --git a/GitFyle.Core.Api/Controllers/ContributionTypesController.cs b/GitFyle.Core.Api/Controllers/ContributionTypesController.cs index d9a0caf9..a103481d 100644 --- a/GitFyle.Core.Api/Controllers/ContributionTypesController.cs +++ b/GitFyle.Core.Api/Controllers/ContributionTypesController.cs @@ -155,5 +155,50 @@ public async ValueTask> PutContributionTypeAsync( return InternalServerError(contributionTypeServiceException); } } + + [HttpDelete("{contributionTypeId}")] + public async ValueTask> DeleteContributionTypeByIdAsync( + Guid contributionTypeId) + { + try + { + ContributionType removedContributionType = + await this.contributionTypeService.RemoveContributionTypeByIdAsync(contributionTypeId); + + return Ok(removedContributionType); + } + catch (ContributionTypeValidationException contributionTypeValidationException) + when (contributionTypeValidationException.InnerException is NotFoundContributionTypeException) + { + return NotFound(contributionTypeValidationException.InnerException); + } + catch (ContributionTypeValidationException contributionTypeValidationException) + { + return BadRequest(contributionTypeValidationException.InnerException); + } + catch (ContributionTypeDependencyValidationException contributionTypeDependencyValidationException) + when (contributionTypeDependencyValidationException.InnerException + is InvalidReferenceContributionTypeException) + { + return FailedDependency(contributionTypeDependencyValidationException.InnerException); + } + catch (ContributionTypeDependencyValidationException contributionTypeDependencyValidationException) + when (contributionTypeDependencyValidationException.InnerException is LockedContributionTypeException) + { + return Locked(contributionTypeDependencyValidationException.InnerException); + } + catch (ContributionTypeDependencyValidationException contributionTypeDependencyValidationException) + { + return BadRequest(contributionTypeDependencyValidationException.InnerException); + } + catch (ContributionTypeDependencyException contributionTypeDependencyException) + { + return InternalServerError(contributionTypeDependencyException); + } + catch (ContributionTypeServiceException contributionTypeServiceException) + { + return InternalServerError(contributionTypeServiceException); + } + } } } From 9307354a73e97ea2de13ed65810ac5d428f51189 Mon Sep 17 00:00:00 2001 From: slimahmad6 Date: Sat, 26 Apr 2025 16:20:34 +0100 Subject: [PATCH 10/12] CODERUB: Fixed method name --- .../ContributionTypesControllerTests.Exceptions.Post.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Post.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Post.cs index 6b212fe7..11b226f7 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Post.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Post.cs @@ -18,7 +18,7 @@ public partial class ContributionTypesControllerTests { [Theory] [MemberData(nameof(ValidationExceptions))] - public async Task ShouldReturnBadRequestOnDeleteIfValidationExceptionOccursAsync( + public async Task ShouldReturnBadRequestOnPostIfValidationExceptionOccursAsync( Xeption validationException) { // given From ce5f37d7c278781a1eff302d2451cb3f750fec9b Mon Sep 17 00:00:00 2001 From: slimahmad6 Date: Thu, 1 May 2025 16:09:02 +0100 Subject: [PATCH 11/12] CODE RUB: Added line breaks and removed extra space --- ...ionTypesControllerTests.Exceptions.Delete.cs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs index 2b26b774..faef289a 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs @@ -36,7 +36,8 @@ public async Task ShouldReturnBadRequestOnDeleteIfValidationExceptionOccursAsync // when ActionResult actualActionResult = - await this.contributionTypesController.DeleteContributionTypeByIdAsync(someContributionTypeId); + await this.contributionTypesController.DeleteContributionTypeByIdAsync( + someContributionTypeId); // then actualActionResult.ShouldBeEquivalentTo(expectedActionResult); @@ -68,7 +69,8 @@ public async Task ShouldReturnInternalServerErrorOnDeleteIfServerExceptionOccurr // when ActionResult actualActionResult = - await this.contributionTypesController.DeleteContributionTypeByIdAsync(someContributionTypeId); + await this.contributionTypesController.DeleteContributionTypeByIdAsync( + someContributionTypeId); // then actualActionResult.ShouldBeEquivalentTo(expectedActionResult); @@ -108,7 +110,8 @@ public async Task ShouldReturnNotFoundOnDeleteIfContributionTypeDoesNotExistAsyn // when ActionResult actualActionResult = - await this.contributionTypesController.DeleteContributionTypeByIdAsync(someContributionTypeId); + await this.contributionTypesController.DeleteContributionTypeByIdAsync( + someContributionTypeId); // then actualActionResult.ShouldBeEquivalentTo(expectedActionResult); @@ -153,7 +156,8 @@ public async Task ShouldReturnLockedOnDeleteIfLockedContributionTypeExceptionOcc // when ActionResult actualActionResult = - await this.contributionTypesController.DeleteContributionTypeByIdAsync(someContributionTypeId); + await this.contributionTypesController.DeleteContributionTypeByIdAsync( + someContributionTypeId); // then actualActionResult.ShouldBeEquivalentTo(expectedActionResult); @@ -190,7 +194,7 @@ public async Task ShouldReturnFailedDependencyOnDeleteIfReferenceExceptionOccurs FailedDependency(invalidReferenceContributionTypeException); var expectedActionResult = - new ActionResult(expectedFailedDependencyObjectResult ); + new ActionResult(expectedFailedDependencyObjectResult); this.contributionTypeServiceMock.Setup(service => @@ -199,7 +203,8 @@ public async Task ShouldReturnFailedDependencyOnDeleteIfReferenceExceptionOccurs // when ActionResult actualActionResult = - await this.contributionTypesController.DeleteContributionTypeByIdAsync(someContributionTypeId); + await this.contributionTypesController.DeleteContributionTypeByIdAsync( + someContributionTypeId); // then actualActionResult.ShouldBeEquivalentTo(expectedActionResult); From dfb290d371bafbdef79abcb259e7db5c65c25345 Mon Sep 17 00:00:00 2001 From: slimahmad6 Date: Fri, 23 May 2025 16:34:18 +0100 Subject: [PATCH 12/12] CODERUB: Fixed indentation --- ...nTypesControllerTests.Exceptions.Delete.cs | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs index faef289a..b6353322 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/ContributionTypes/ContributionTypesControllerTests.Exceptions.Delete.cs @@ -133,22 +133,22 @@ public async Task ShouldReturnLockedOnDeleteIfLockedContributionTypeExceptionOcc var someDictionaryData = GetRandomDictionaryData(); var lockedContributionTypeException = - new LockedContributionTypeException( - message: someMessage, - innerException: someInnerException, - data: someInnerException.Data); + new LockedContributionTypeException( + message: someMessage, + innerException: someInnerException, + data: someInnerException.Data); var contributionTypeDependencyValidationException = - new ContributionTypeDependencyValidationException( - message: someMessage, - innerException: lockedContributionTypeException, - data: someDictionaryData); + new ContributionTypeDependencyValidationException( + message: someMessage, + innerException: lockedContributionTypeException, + data: someDictionaryData); LockedObjectResult expectedLockedObjectResult = - Locked(lockedContributionTypeException); + Locked(lockedContributionTypeException); var expectedActionResult = - new ActionResult(expectedLockedObjectResult); + new ActionResult(expectedLockedObjectResult); this.contributionTypeServiceMock.Setup(service => service.RemoveContributionTypeByIdAsync(It.IsAny())) @@ -179,23 +179,22 @@ public async Task ShouldReturnFailedDependencyOnDeleteIfReferenceExceptionOccurs string someMessage = GetRandomString(); var invalidReferenceContributionTypeException = - new InvalidReferenceContributionTypeException( - message: someMessage, - innerException: someInnerException, - data: someInnerException.Data); + new InvalidReferenceContributionTypeException( + message: someMessage, + innerException: someInnerException, + data: someInnerException.Data); var contributionTypeDependencyValidationException = - new ContributionTypeDependencyValidationException( - message: someMessage, - innerException: invalidReferenceContributionTypeException, - data: invalidReferenceContributionTypeException.Data); + new ContributionTypeDependencyValidationException( + message: someMessage, + innerException: invalidReferenceContributionTypeException, + data: invalidReferenceContributionTypeException.Data); FailedDependencyObjectResult expectedFailedDependencyObjectResult = - FailedDependency(invalidReferenceContributionTypeException); + FailedDependency(invalidReferenceContributionTypeException); var expectedActionResult = - new ActionResult(expectedFailedDependencyObjectResult); - + new ActionResult(expectedFailedDependencyObjectResult); this.contributionTypeServiceMock.Setup(service => service.RemoveContributionTypeByIdAsync(It.IsAny()))