From a0baa57c0a3fe877c7709cdeacaf477477040f55 Mon Sep 17 00:00:00 2001 From: Greg Hays Date: Tue, 27 May 2025 15:48:16 -0700 Subject: [PATCH 1/5] CODE RUB: Code Cleanup --- .../RepositoriesApiTests.Logic.cs | 2 +- .../Apis/Repositories/RepositoriesApiTests.cs | 3 +-- ...nTypesControllerTests.Exceptions.Delete.cs | 1 - ...ionTypesControllerTests.Exceptions.Post.cs | 6 ++--- ...tionTypesControllerTests.Exceptions.Put.cs | 12 ++++----- ...utionsControllerTests.Exceptions.Delete.cs | 26 +++++++++---------- ...ibutionsControllerTests.Exceptions.Post.cs | 14 +++++----- ...ributionsControllerTests.Exceptions.Put.cs | 2 -- ...tributionsControllerTests.Logic.GetById.cs | 2 +- ...utionTypeServiceTests.Exceptions.Modify.cs | 10 +++---- .../ContributionTypesController.cs | 10 +++---- .../Controllers/ContributionsController.cs | 8 +++--- .../Controllers/SourcesController.cs | 4 +-- GitFyle.Core.Api/GitFyle.Core.Api.csproj | 4 +++ ...validReferenceContributionTypeException.cs | 2 +- .../FailedOperationContributionException.cs | 7 ++--- .../InvalidReferenceContributionException.cs | 2 +- .../InvalidReferenceContributorException.cs | 2 +- 18 files changed, 57 insertions(+), 60 deletions(-) diff --git a/GitFyle.Core.Api.Tests.Acceptance/Apis/Repositories/RepositoriesApiTests.Logic.cs b/GitFyle.Core.Api.Tests.Acceptance/Apis/Repositories/RepositoriesApiTests.Logic.cs index 6e65459f..ce328c17 100644 --- a/GitFyle.Core.Api.Tests.Acceptance/Apis/Repositories/RepositoriesApiTests.Logic.cs +++ b/GitFyle.Core.Api.Tests.Acceptance/Apis/Repositories/RepositoriesApiTests.Logic.cs @@ -70,7 +70,7 @@ public async Task ShouldGetAllRepositoriesAsync() // then foreach (Repository expectedRepository in expectedRepositories) { - Repository actualRepository = + Repository actualRepository = actualRepositories.Single(repository => repository.Id == expectedRepository.Id); actualRepository.Should().BeEquivalentTo(expectedRepository); diff --git a/GitFyle.Core.Api.Tests.Acceptance/Apis/Repositories/RepositoriesApiTests.cs b/GitFyle.Core.Api.Tests.Acceptance/Apis/Repositories/RepositoriesApiTests.cs index 2c61b526..bba6ea98 100644 --- a/GitFyle.Core.Api.Tests.Acceptance/Apis/Repositories/RepositoriesApiTests.cs +++ b/GitFyle.Core.Api.Tests.Acceptance/Apis/Repositories/RepositoriesApiTests.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; using GitFyle.Core.Api.Tests.Acceptance.Brokers; using GitFyle.Core.Api.Tests.Acceptance.Models.Repositories; using GitFyle.Core.Api.Tests.Acceptance.Models.Sources; @@ -60,7 +59,7 @@ private async ValueTask PostRandomRepository(Guid sourceId) return randomRepository; } - + private static Repository CreateRandomRepository(Guid sourceId) => CreateRepositoryFiller(sourceId).Create(); 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 0b37a5a8..a25c1037 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; 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..f8d92bd1 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 @@ -104,7 +104,7 @@ public async Task ShouldReturnConflictOnPostIfAlreadyExistsContributionTypeExcep ConflictObjectResult expectedConflictObjectResult = Conflict(alreadyExistsContributionTypeException); - var expectedActionResult = + var expectedActionResult = new ActionResult(expectedConflictObjectResult); this.contributionTypeServiceMock.Setup(service => @@ -145,7 +145,7 @@ public async Task ShouldReturnFailedDependencyOnPostIfReferenceExceptionOccursAs innerException: invalidReferenceContributionTypeException, data: invalidReferenceContributionTypeException.Data); - FailedDependencyObjectResult expectedFailedDependencyObjectResult = + FailedDependencyObjectResult expectedFailedDependencyObjectResult = FailedDependency(invalidReferenceContributionTypeException); var expectedActionResult = @@ -156,7 +156,7 @@ public async Task ShouldReturnFailedDependencyOnPostIfReferenceExceptionOccursAs .ThrowsAsync(contributionTypeDependencyValidationException); // when - ActionResult actualActionResult = + ActionResult actualActionResult = await this.contributionTypesController.PostContributionTypeAsync(someContributionType); // then 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 2a504ac3..e05c64c0 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 @@ -56,10 +56,10 @@ public async Task ShouldReturnInternalServerErrorOnPutIfServerExceptionOccurredA // given ContributionType someContributionType = CreateRandomContributionType(); - InternalServerErrorObjectResult expectedInternalServerErrorObjectResult = + InternalServerErrorObjectResult expectedInternalServerErrorObjectResult = InternalServerError(serverException); - var expectedActionResult = + var expectedActionResult = new ActionResult(expectedInternalServerErrorObjectResult); this.contributionTypeServiceMock.Setup(service => @@ -67,7 +67,7 @@ public async Task ShouldReturnInternalServerErrorOnPutIfServerExceptionOccurredA .ThrowsAsync(serverException); // when - ActionResult actualActionResult = + ActionResult actualActionResult = await this.contributionTypesController.PutContributionTypeAsync(someContributionType); // then @@ -186,18 +186,18 @@ public async Task ShouldReturnFailedDependencyOnPutIfReferenceExceptionOccursAsy innerException: invalidReferenceContributionTypeException, data: someDictionaryData); - FailedDependencyObjectResult expectedFailedDependencyObjectResult = + FailedDependencyObjectResult expectedFailedDependencyObjectResult = FailedDependency(invalidReferenceContributionTypeException); var expectedActionResult = new ActionResult(expectedFailedDependencyObjectResult); - this.contributionTypeServiceMock.Setup(service => + this.contributionTypeServiceMock.Setup(service => service.ModifyContributionTypeAsync(It.IsAny())) .ThrowsAsync(contributionTypeDependencyValidationException); // when - ActionResult actualActionResult = + ActionResult actualActionResult = await this.contributionTypesController.PutContributionTypeAsync(someContributionType); // then diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Delete.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Delete.cs index 0a4ed2eb..765ee56b 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Delete.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Delete.cs @@ -24,11 +24,11 @@ public async Task ShouldReturnBadRequestOnDeleteIfValidationExceptionOccursAsync // given Guid someContributionId = Guid.NewGuid(); - BadRequestObjectResult expectedInternalServerErrorObjectResult = + BadRequestObjectResult expectedInternalServerErrorObjectResult = BadRequest(validationException.InnerException); - var expectedActionResult = - new ActionResult(expectedInternalServerErrorObjectResult ); + var expectedActionResult = + new ActionResult(expectedInternalServerErrorObjectResult); this.contributionServiceMock.Setup(service => service.RemoveContributionByIdAsync(It.IsAny())) @@ -57,23 +57,23 @@ public async Task ShouldReturnFailedDependencyOnDeleteIfReferenceExceptionOccurs var someInnerException = new Exception(); string someMessage = GetRandomString(); - var invalidReferenceContributionException = + var invalidReferenceContributionException = new InvalidReferenceContributionException( message: someMessage, innerException: someInnerException, data: someInnerException.Data); - var contributionDependencyValidationException = + var contributionDependencyValidationException = new ContributionDependencyValidationException( message: someMessage, innerException: invalidReferenceContributionException, data: invalidReferenceContributionException.Data); - FailedDependencyObjectResult expectedLockedObjectResult = + FailedDependencyObjectResult expectedLockedObjectResult = FailedDependency(invalidReferenceContributionException); - var expectedActionResult = - new ActionResult(expectedLockedObjectResult ); + var expectedActionResult = + new ActionResult(expectedLockedObjectResult); this.contributionServiceMock.Setup(service => @@ -102,10 +102,10 @@ public async Task ShouldReturnInternalServerErrorOnDeleteIfServerErrorOccurredAs // given Guid someContributionId = Guid.NewGuid(); - InternalServerErrorObjectResult expectedInternalServerErrorObjectResult = + InternalServerErrorObjectResult expectedInternalServerErrorObjectResult = InternalServerError(serverException); - var expectedActionResult = + var expectedActionResult = new ActionResult(expectedInternalServerErrorObjectResult); this.contributionServiceMock.Setup(service => @@ -175,13 +175,13 @@ public async Task ShouldReturnLockedOnDeleteIfLockedContributionExceptionOccursA string someMessage = GetRandomString(); var someDictionaryData = GetRandomDictionaryData(); - var lockedContributionException = + var lockedContributionException = new LockedContributionException( message: someMessage, innerException: someInnerException, data: someInnerException.Data); - var contributionDependencyValidationException = + var contributionDependencyValidationException = new ContributionDependencyValidationException( message: someMessage, innerException: lockedContributionException, @@ -191,7 +191,7 @@ public async Task ShouldReturnLockedOnDeleteIfLockedContributionExceptionOccursA Locked(lockedContributionException); var expectedActionResult = - new ActionResult(expectedLockedObjectResult ); + new ActionResult(expectedLockedObjectResult); this.contributionServiceMock.Setup(service => service.RemoveContributionByIdAsync(It.IsAny())) diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Post.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Post.cs index 4d8ba9b5..548a0f03 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Post.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Post.cs @@ -56,7 +56,7 @@ public async Task ShouldReturnFailedDependencyOnPostIfReferenceExceptionOccursAs var someInnerException = new Exception(); string someMessage = GetRandomString(); - var invalidReferenceContributionException = + var invalidReferenceContributionException = new InvalidReferenceContributionException( message: someMessage, innerException: someInnerException, @@ -68,7 +68,7 @@ public async Task ShouldReturnFailedDependencyOnPostIfReferenceExceptionOccursAs innerException: invalidReferenceContributionException, data: invalidReferenceContributionException.Data); - FailedDependencyObjectResult expectedConflictObjectResult = + FailedDependencyObjectResult expectedConflictObjectResult = FailedDependency(invalidReferenceContributionException); var expectedActionResult = new ActionResult(expectedConflictObjectResult); @@ -78,7 +78,7 @@ public async Task ShouldReturnFailedDependencyOnPostIfReferenceExceptionOccursAs .ThrowsAsync(contributionDependencyValidationException); // when - ActionResult actualActionResult = + ActionResult actualActionResult = await this.contributionsController.PostContributionAsync(someContribution); // then @@ -90,7 +90,7 @@ public async Task ShouldReturnFailedDependencyOnPostIfReferenceExceptionOccursAs this.contributionServiceMock.VerifyNoOtherCalls(); } - + [Theory] [MemberData(nameof(ServerExceptions))] public async Task ShouldReturnInternalServerErrorOnPostIfServerExceptionOccurredAsync( @@ -144,10 +144,10 @@ public async Task ShouldReturnConflictOnPostIfAlreadyExistsContributionException innerException: alreadyExistsContributionException, data: someDictionaryData); - ConflictObjectResult expectedConflictObjectResult = + ConflictObjectResult expectedConflictObjectResult = Conflict(alreadyExistsContributionException); - var expectedActionResult = + var expectedActionResult = new ActionResult(expectedConflictObjectResult); this.contributionServiceMock.Setup(service => @@ -155,7 +155,7 @@ public async Task ShouldReturnConflictOnPostIfAlreadyExistsContributionException .ThrowsAsync(contributionDependencyValidationException); // when - ActionResult actualActionResult = + ActionResult actualActionResult = await this.contributionsController.PostContributionAsync(someContribution); // then diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Put.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Put.cs index 1c82e030..e84b69d2 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Put.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Put.cs @@ -6,8 +6,6 @@ using System.Threading.Tasks; using GitFyle.Core.Api.Models.Foundations.Contributions; using GitFyle.Core.Api.Models.Foundations.Contributions.Exceptions; -using GitFyle.Core.Api.Models.Foundations.ContributionTypes.Exceptions; -using GitFyle.Core.Api.Models.Foundations.ContributionTypes; using Microsoft.AspNetCore.Mvc; using Moq; using RESTFulSense.Clients.Extensions; diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Logic.GetById.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Logic.GetById.cs index 67f81033..0bfe70ba 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Logic.GetById.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Logic.GetById.cs @@ -34,7 +34,7 @@ public async Task ShouldReturnOkWithRecordOnGetByIdAsync() .ReturnsAsync(storageContribution); // when - ActionResult actualActionResult = + ActionResult actualActionResult = await contributionsController.GetContributionByIdAsync(inputId); // then diff --git a/GitFyle.Core.Api.Tests.Unit/Services/Foundations/ContributionTypes/ContributionTypeServiceTests.Exceptions.Modify.cs b/GitFyle.Core.Api.Tests.Unit/Services/Foundations/ContributionTypes/ContributionTypeServiceTests.Exceptions.Modify.cs index bbab3609..5774c154 100644 --- a/GitFyle.Core.Api.Tests.Unit/Services/Foundations/ContributionTypes/ContributionTypeServiceTests.Exceptions.Modify.cs +++ b/GitFyle.Core.Api.Tests.Unit/Services/Foundations/ContributionTypes/ContributionTypeServiceTests.Exceptions.Modify.cs @@ -84,13 +84,13 @@ public async Task ShouldThrowValidationExceptionOnModifyIfReferenceErrorOccursAn var invalidContributionTypeReferenceException = new InvalidReferenceContributionTypeException( - message: "Invalid contributionType reference error occurred.", + message: "Invalid contributionType reference error occurred.", innerException: foreignKeyConstraintConflictException, data: foreignKeyConstraintConflictException.Data); - var expectedContributionTypeDependencyValidationException = + var expectedContributionTypeDependencyValidationException = new ContributionTypeDependencyValidationException( - message: "ContributionType dependency validation error occurred, fix errors and try again.", + message: "ContributionType dependency validation error occurred, fix errors and try again.", innerException: invalidContributionTypeReferenceException, data: invalidContributionTypeReferenceException.Data); @@ -205,13 +205,13 @@ private async Task ShouldThrowDependencyValidationExceptionOnModifyIfDbUpdateCon var dbUpdateConcurrencyException = new DbUpdateConcurrencyException(); - var lockedContributionTypeException = + var lockedContributionTypeException = new LockedContributionTypeException( message: "Locked contributionType record error occurred, please try again.", innerException: dbUpdateConcurrencyException, data: dbUpdateConcurrencyException.Data); - var expectedContributionTypeDependencyValidationException = + var expectedContributionTypeDependencyValidationException = new ContributionTypeDependencyValidationException( message: "ContributionType dependency validation error occurred, fix errors and try again.", innerException: lockedContributionTypeException, diff --git a/GitFyle.Core.Api/Controllers/ContributionTypesController.cs b/GitFyle.Core.Api/Controllers/ContributionTypesController.cs index ad620cdd..f3ef3988 100644 --- a/GitFyle.Core.Api/Controllers/ContributionTypesController.cs +++ b/GitFyle.Core.Api/Controllers/ContributionTypesController.cs @@ -38,13 +38,13 @@ public async ValueTask> PostContributionTypeAsync return BadRequest(contributionTypeValidationException.InnerException); } catch (ContributionTypeDependencyValidationException contributionTypeDependencyValidationException) - when (contributionTypeDependencyValidationException.InnerException + when (contributionTypeDependencyValidationException.InnerException is AlreadyExistsContributionTypeException) { return Conflict(contributionTypeDependencyValidationException.InnerException); } catch (ContributionTypeDependencyValidationException contributionTypeDependencyValidationException) - when (contributionTypeDependencyValidationException.InnerException + when (contributionTypeDependencyValidationException.InnerException is InvalidReferenceContributionTypeException) { return FailedDependency(contributionTypeDependencyValidationException.InnerException); @@ -137,13 +137,13 @@ public async ValueTask> PutContributionTypeAsync( return BadRequest(contributionTypeValidationException.InnerException); } catch (ContributionTypeDependencyValidationException contributionTypeDependencyValidationException) - when (contributionTypeDependencyValidationException.InnerException is + when (contributionTypeDependencyValidationException.InnerException is AlreadyExistsContributionTypeException) { return Conflict(contributionTypeDependencyValidationException.InnerException); } catch (ContributionTypeDependencyValidationException contributionTypeDependencyValidationException) - when (contributionTypeDependencyValidationException.InnerException is + when (contributionTypeDependencyValidationException.InnerException is InvalidReferenceContributionTypeException) { return FailedDependency(contributionTypeDependencyValidationException.InnerException); @@ -183,7 +183,7 @@ public async ValueTask> DeleteContributionTypeByI return BadRequest(contributionTypeValidationException.InnerException); } catch (ContributionTypeDependencyValidationException contributionTypeDependencyValidationException) - when (contributionTypeDependencyValidationException.InnerException + when (contributionTypeDependencyValidationException.InnerException is InvalidReferenceContributionTypeException) { return FailedDependency(contributionTypeDependencyValidationException.InnerException); diff --git a/GitFyle.Core.Api/Controllers/ContributionsController.cs b/GitFyle.Core.Api/Controllers/ContributionsController.cs index d4c703cc..52edf925 100644 --- a/GitFyle.Core.Api/Controllers/ContributionsController.cs +++ b/GitFyle.Core.Api/Controllers/ContributionsController.cs @@ -37,7 +37,7 @@ public async ValueTask> PostContributionAsync(Contrib return BadRequest(repositoryValidationException.InnerException); } catch (ContributionDependencyValidationException contributionDependencyValidationException) - when (contributionDependencyValidationException.InnerException is + when (contributionDependencyValidationException.InnerException is InvalidReferenceContributionException) { return FailedDependency(contributionDependencyValidationException.InnerException); @@ -86,7 +86,7 @@ public async ValueTask> GetContributionByIdAsync(Guid { try { - Contribution contribution = + Contribution contribution = await this.contributionService.RetrieveContributionByIdAsync(contributionId); return Ok(contribution); @@ -134,13 +134,13 @@ public async ValueTask> PutContributionAsync(Contribu return BadRequest(contributionValidationException.InnerException); } catch (ContributionDependencyValidationException contributionDependencyValidationException) - when (contributionDependencyValidationException.InnerException is + when (contributionDependencyValidationException.InnerException is AlreadyExistsContributionException) { return Conflict(contributionDependencyValidationException.InnerException); } catch (ContributionDependencyValidationException contributionDependencyValidationException) - when (contributionDependencyValidationException.InnerException is + when (contributionDependencyValidationException.InnerException is InvalidReferenceContributionException) { return FailedDependency(contributionDependencyValidationException.InnerException); diff --git a/GitFyle.Core.Api/Controllers/SourcesController.cs b/GitFyle.Core.Api/Controllers/SourcesController.cs index 3d143271..51b245ee 100644 --- a/GitFyle.Core.Api/Controllers/SourcesController.cs +++ b/GitFyle.Core.Api/Controllers/SourcesController.cs @@ -60,10 +60,10 @@ public async ValueTask>> GetAllSourcesAsync() { try { - IQueryable sourcees = + IQueryable sources = await this.sourceService.RetrieveAllSourcesAsync(); - return Ok(sourcees); + return Ok(sources); } catch (SourceDependencyException sourceDependencyException) { diff --git a/GitFyle.Core.Api/GitFyle.Core.Api.csproj b/GitFyle.Core.Api/GitFyle.Core.Api.csproj index 0bc39c4f..f5f67120 100644 --- a/GitFyle.Core.Api/GitFyle.Core.Api.csproj +++ b/GitFyle.Core.Api/GitFyle.Core.Api.csproj @@ -7,6 +7,10 @@ CS1998 + + + + diff --git a/GitFyle.Core.Api/Models/Foundations/ContributionTypes/Exceptions/InvalidReferenceContributionTypeException.cs b/GitFyle.Core.Api/Models/Foundations/ContributionTypes/Exceptions/InvalidReferenceContributionTypeException.cs index 213749a6..fe5434a1 100644 --- a/GitFyle.Core.Api/Models/Foundations/ContributionTypes/Exceptions/InvalidReferenceContributionTypeException.cs +++ b/GitFyle.Core.Api/Models/Foundations/ContributionTypes/Exceptions/InvalidReferenceContributionTypeException.cs @@ -11,7 +11,7 @@ namespace GitFyle.Core.Api.Models.Foundations.ContributionTypes.Exceptions public class InvalidReferenceContributionTypeException : Xeption { public InvalidReferenceContributionTypeException(string message, Exception innerException, IDictionary data) - : base(message, innerException,data) + : base(message, innerException, data) { } } } \ No newline at end of file diff --git a/GitFyle.Core.Api/Models/Foundations/Contributions/Exceptions/FailedOperationContributionException.cs b/GitFyle.Core.Api/Models/Foundations/Contributions/Exceptions/FailedOperationContributionException.cs index 131e7f6b..a276a062 100644 --- a/GitFyle.Core.Api/Models/Foundations/Contributions/Exceptions/FailedOperationContributionException.cs +++ b/GitFyle.Core.Api/Models/Foundations/Contributions/Exceptions/FailedOperationContributionException.cs @@ -2,17 +2,14 @@ // Copyright (c) The Standard Organization: A coalition of the Good-Hearted Engineers // ---------------------------------------------------------------------------------- -using Microsoft.EntityFrameworkCore; +using System; using Xeptions; namespace GitFyle.Core.Api.Tests.Unit.Services.Foundations.Contributions { internal class FailedOperationContributionException : Xeption { - private string message; - private DbUpdateException innerException; - - public FailedOperationContributionException(string message, DbUpdateException innerException) + public FailedOperationContributionException(string message, Exception innerException) : base(message, innerException) { } } diff --git a/GitFyle.Core.Api/Models/Foundations/Contributions/Exceptions/InvalidReferenceContributionException.cs b/GitFyle.Core.Api/Models/Foundations/Contributions/Exceptions/InvalidReferenceContributionException.cs index d87aa7ca..1d325a39 100644 --- a/GitFyle.Core.Api/Models/Foundations/Contributions/Exceptions/InvalidReferenceContributionException.cs +++ b/GitFyle.Core.Api/Models/Foundations/Contributions/Exceptions/InvalidReferenceContributionException.cs @@ -11,7 +11,7 @@ namespace GitFyle.Core.Api.Models.Foundations.Contributions.Exceptions public class InvalidReferenceContributionException : Xeption { public InvalidReferenceContributionException(string message, Exception innerException, IDictionary data) - : base(message, innerException,data) + : base(message, innerException, data) { } } } \ No newline at end of file diff --git a/GitFyle.Core.Api/Models/Foundations/Contributors/Exceptions/InvalidReferenceContributorException.cs b/GitFyle.Core.Api/Models/Foundations/Contributors/Exceptions/InvalidReferenceContributorException.cs index 49ea91aa..2ff51b51 100644 --- a/GitFyle.Core.Api/Models/Foundations/Contributors/Exceptions/InvalidReferenceContributorException.cs +++ b/GitFyle.Core.Api/Models/Foundations/Contributors/Exceptions/InvalidReferenceContributorException.cs @@ -11,7 +11,7 @@ namespace GitFyle.Core.Api.Models.Foundations.Contributors.Exceptions public class InvalidReferenceContributorException : Xeption { public InvalidReferenceContributorException(string message, Exception innerException, IDictionary data) - : base(message, innerException,data) + : base(message, innerException, data) { } } } \ No newline at end of file From 3884ad416c6c2d618acde315a31c273421e74e7f Mon Sep 17 00:00:00 2001 From: Greg Hays Date: Wed, 28 May 2025 11:23:33 -0700 Subject: [PATCH 2/5] CODE RUB: Comment Resolution --- ...ionTypesControllerTests.Exceptions.Post.cs | 2 +- ...tionTypesControllerTests.Exceptions.Put.cs | 2 +- ...ibutionsControllerTests.Exceptions.Post.cs | 2 +- ...tributionsControllerTests.Logic.GetById.cs | 2 +- ...utionTypeServiceTests.Exceptions.Modify.cs | 16 ++--- .../Controllers/ContributionsController.cs | 13 ++-- GitFyle.Core.Api/GitFyle.Core.Api.csproj | 72 ++++++++++--------- 7 files changed, 59 insertions(+), 50 deletions(-) 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 f8d92bd1..aff250c9 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 @@ -146,7 +146,7 @@ public async Task ShouldReturnFailedDependencyOnPostIfReferenceExceptionOccursAs data: invalidReferenceContributionTypeException.Data); FailedDependencyObjectResult expectedFailedDependencyObjectResult = - FailedDependency(invalidReferenceContributionTypeException); + FailedDependency(invalidReferenceContributionTypeException); var expectedActionResult = new ActionResult(expectedFailedDependencyObjectResult); 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 e05c64c0..dcd9402f 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 @@ -198,7 +198,7 @@ public async Task ShouldReturnFailedDependencyOnPutIfReferenceExceptionOccursAsy // when ActionResult actualActionResult = - await this.contributionTypesController.PutContributionTypeAsync(someContributionType); + await this.contributionTypesController.PutContributionTypeAsync(someContributionType); // then actualActionResult.ShouldBeEquivalentTo(expectedActionResult); diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Post.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Post.cs index 548a0f03..7f376bc8 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Post.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Exceptions.Post.cs @@ -79,7 +79,7 @@ public async Task ShouldReturnFailedDependencyOnPostIfReferenceExceptionOccursAs // when ActionResult actualActionResult = - await this.contributionsController.PostContributionAsync(someContribution); + await this.contributionsController.PostContributionAsync(someContribution); // then actualActionResult.ShouldBeEquivalentTo(expectedActionResult); diff --git a/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Logic.GetById.cs b/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Logic.GetById.cs index 0bfe70ba..48962dfe 100644 --- a/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Logic.GetById.cs +++ b/GitFyle.Core.Api.Tests.Unit/Controllers/Contributions/ContributionsControllerTests.Logic.GetById.cs @@ -35,7 +35,7 @@ public async Task ShouldReturnOkWithRecordOnGetByIdAsync() // when ActionResult actualActionResult = - await contributionsController.GetContributionByIdAsync(inputId); + await contributionsController.GetContributionByIdAsync(inputId); // then actualActionResult.ShouldBeEquivalentTo(expectedActionResult); diff --git a/GitFyle.Core.Api.Tests.Unit/Services/Foundations/ContributionTypes/ContributionTypeServiceTests.Exceptions.Modify.cs b/GitFyle.Core.Api.Tests.Unit/Services/Foundations/ContributionTypes/ContributionTypeServiceTests.Exceptions.Modify.cs index 5774c154..08b0fa26 100644 --- a/GitFyle.Core.Api.Tests.Unit/Services/Foundations/ContributionTypes/ContributionTypeServiceTests.Exceptions.Modify.cs +++ b/GitFyle.Core.Api.Tests.Unit/Services/Foundations/ContributionTypes/ContributionTypeServiceTests.Exceptions.Modify.cs @@ -83,16 +83,16 @@ public async Task ShouldThrowValidationExceptionOnModifyIfReferenceErrorOccursAn new ForeignKeyConstraintConflictException(message: exceptionMessage); var invalidContributionTypeReferenceException = - new InvalidReferenceContributionTypeException( - message: "Invalid contributionType reference error occurred.", - innerException: foreignKeyConstraintConflictException, - data: foreignKeyConstraintConflictException.Data); + new InvalidReferenceContributionTypeException( + message: "Invalid contributionType reference error occurred.", + innerException: foreignKeyConstraintConflictException, + data: foreignKeyConstraintConflictException.Data); var expectedContributionTypeDependencyValidationException = - new ContributionTypeDependencyValidationException( - message: "ContributionType dependency validation error occurred, fix errors and try again.", - innerException: invalidContributionTypeReferenceException, - data: invalidContributionTypeReferenceException.Data); + new ContributionTypeDependencyValidationException( + message: "ContributionType dependency validation error occurred, fix errors and try again.", + innerException: invalidContributionTypeReferenceException, + data: invalidContributionTypeReferenceException.Data); this.dateTimeBrokerMock.Setup(broker => broker.GetCurrentDateTimeOffsetAsync()) diff --git a/GitFyle.Core.Api/Controllers/ContributionsController.cs b/GitFyle.Core.Api/Controllers/ContributionsController.cs index 52edf925..a577a15a 100644 --- a/GitFyle.Core.Api/Controllers/ContributionsController.cs +++ b/GitFyle.Core.Api/Controllers/ContributionsController.cs @@ -37,8 +37,8 @@ public async ValueTask> PostContributionAsync(Contrib return BadRequest(repositoryValidationException.InnerException); } catch (ContributionDependencyValidationException contributionDependencyValidationException) - when (contributionDependencyValidationException.InnerException is - InvalidReferenceContributionException) + when (contributionDependencyValidationException.InnerException is + InvalidReferenceContributionException) { return FailedDependency(contributionDependencyValidationException.InnerException); } @@ -67,7 +67,7 @@ public async ValueTask>> GetAllContributio try { IQueryable contributions = - await this.contributionService.RetrieveAllContributionsAsync(); + await this.contributionService.RetrieveAllContributionsAsync(); return Ok(contributions); } @@ -87,7 +87,7 @@ public async ValueTask> GetContributionByIdAsync(Guid try { Contribution contribution = - await this.contributionService.RetrieveContributionByIdAsync(contributionId); + await this.contributionService.RetrieveContributionByIdAsync(contributionId); return Ok(contribution); } @@ -135,7 +135,7 @@ public async ValueTask> PutContributionAsync(Contribu } catch (ContributionDependencyValidationException contributionDependencyValidationException) when (contributionDependencyValidationException.InnerException is - AlreadyExistsContributionException) + AlreadyExistsContributionException) { return Conflict(contributionDependencyValidationException.InnerException); } @@ -179,7 +179,8 @@ public async ValueTask> DeleteContributionByIdAsync(G return BadRequest(contributionValidationException.InnerException); } catch (ContributionDependencyValidationException contributionDependencyValidationException) - when (contributionDependencyValidationException.InnerException is InvalidReferenceContributionException) + when (contributionDependencyValidationException.InnerException is + InvalidReferenceContributionException) { return FailedDependency(contributionDependencyValidationException.InnerException); } diff --git a/GitFyle.Core.Api/GitFyle.Core.Api.csproj b/GitFyle.Core.Api/GitFyle.Core.Api.csproj index f5f67120..bc498564 100644 --- a/GitFyle.Core.Api/GitFyle.Core.Api.csproj +++ b/GitFyle.Core.Api/GitFyle.Core.Api.csproj @@ -1,5 +1,4 @@  - net8.0 disable @@ -11,39 +10,48 @@ - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + - - - - - + + + + + + + + + - - - + + + Always + + + Always + + - - - Always - - - Always - - + + + + + + + + From 7d4c952432136d9bebeacb0f578628c055c85299 Mon Sep 17 00:00:00 2001 From: Greg Hays Date: Wed, 28 May 2025 11:26:38 -0700 Subject: [PATCH 3/5] CODE RUB: Remove Dups Csproj --- GitFyle.Core.Api/GitFyle.Core.Api.csproj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/GitFyle.Core.Api/GitFyle.Core.Api.csproj b/GitFyle.Core.Api/GitFyle.Core.Api.csproj index bc498564..8d02db61 100644 --- a/GitFyle.Core.Api/GitFyle.Core.Api.csproj +++ b/GitFyle.Core.Api/GitFyle.Core.Api.csproj @@ -48,10 +48,4 @@ - - - - - - From b684bd045dde7c4a3c2a6244a1e6c86c9f55a413 Mon Sep 17 00:00:00 2001 From: Greg Hays Date: Wed, 28 May 2025 11:47:24 -0700 Subject: [PATCH 4/5] CODE RUB: API Csproj CleanUp --- GitFyle.Core.Api/GitFyle.Core.Api.csproj | 80 +++++++++++------------- 1 file changed, 37 insertions(+), 43 deletions(-) diff --git a/GitFyle.Core.Api/GitFyle.Core.Api.csproj b/GitFyle.Core.Api/GitFyle.Core.Api.csproj index 8d02db61..5ece0456 100644 --- a/GitFyle.Core.Api/GitFyle.Core.Api.csproj +++ b/GitFyle.Core.Api/GitFyle.Core.Api.csproj @@ -1,51 +1,45 @@  - - net8.0 - disable - disable - CS1998 - - - - + + net8.0 + disable + disable + CS1998 + - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + - - - - - + + + + + - - - + + + - - - Always - - - Always - - + + + Always + + + Always + + - - - From 874cd13ffec72b1d6b7b6549af934ccdff7dfb52 Mon Sep 17 00:00:00 2001 From: Greg Hays Date: Wed, 28 May 2025 12:03:54 -0700 Subject: [PATCH 5/5] CODE RUB: Fix Indentation Comment --- GitFyle.Core.Api/Controllers/ContributionTypesController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GitFyle.Core.Api/Controllers/ContributionTypesController.cs b/GitFyle.Core.Api/Controllers/ContributionTypesController.cs index f3ef3988..055d731b 100644 --- a/GitFyle.Core.Api/Controllers/ContributionTypesController.cs +++ b/GitFyle.Core.Api/Controllers/ContributionTypesController.cs @@ -143,8 +143,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); }