Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a6df0f2
refactor: rename Catalogs to ServiceCatalogs - Phase 1a (Domain + Inf…
Nov 19, 2025
811e957
refactor: rename Catalogs to ServiceCatalogs - Phase 1b (Application …
Nov 19, 2025
b07d182
refactor: rename Catalogs to ServiceCatalogs - Phase 1c (Module Tests)
Nov 19, 2025
280a587
refactor: rename Catalogs to ServiceCatalogs - Phase 2 (Shared + Test…
Nov 19, 2025
df566da
merge: integrate Locations rename from master into Catalogs branch
Nov 19, 2025
0f6ad4f
merge: integrate latest changes from master (SearchProviders rename) …
Nov 19, 2025
32d206f
fix: update solution file to reflect Search → SearchProviders rename
Nov 19, 2025
8aed422
Merge branch 'master' into rename-domain-catalogs
Nov 19, 2025
d48f6a9
feat: add ServiceCatalogs module tests to solution (Phase 1c)
Nov 19, 2025
37e7204
feat: complete ServiceCatalogs module rename with Phase 2 integration
Nov 19, 2025
7a67606
fix: apply documentation and code quality improvements
Nov 19, 2025
ac7f9a5
fix: complete ServiceCatalogs module renaming consistency
Nov 19, 2025
2e74c66
refactor: update test class names and comments for ServiceCatalogs co…
Nov 19, 2025
7c64028
refactor: improve test code quality and maintainability
Nov 19, 2025
f3e6d4d
fix: complete naming consistency and strengthen test assertions
Nov 19, 2025
53c05c8
feat: register ServiceCatalogs module in ApiService
Nov 19, 2025
4f2cd6f
refactor: complete old Catalogs module removal and fix ROADMAP class …
Nov 19, 2025
aea3282
fix: correct ServiceCatalogs schema to snake_case and update ROADMAP …
Nov 19, 2025
72c518d
fix: standardize ServiceCatalogs schema to snake_case across all migr…
Nov 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge: integrate latest changes from master (SearchProviders rename) …
…and apply code review fixes
  • Loading branch information
Filipe Frigini committed Nov 19, 2025
commit 0f6ad4f7e2c132053223b4978695fe89cf38c7c4
40 changes: 35 additions & 5 deletions MeAjudaAi.sln
Original file line number Diff line number Diff line change
Expand Up @@ -127,23 +127,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Search", "Search", "{6FF68F
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "API", "API", "{977BE21B-C0F0-4625-9C9D-8A5A6D8C2D49}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeAjudaAi.Modules.SearchProviders.API", "src\Modules\SearchProviders\API\MeAjudaAi.Modules.SearchProviders.API.csproj", "{68F39D90-3AF5-9037-B03D-B08B48E4A9A8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeAjudaAi.Modules.Search.API", "src\Modules\Search\API\MeAjudaAi.Modules.Search.API.csproj", "{68F39D90-3AF5-9037-B03D-B08B48E4A9A8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{6F70C0C2-B928-4F73-9D70-038F3E625A95}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeAjudaAi.Modules.SearchProviders.Application", "src\Modules\SearchProviders\Application\MeAjudaAi.Modules.SearchProviders.Application.csproj", "{0A5B25B9-7991-B208-5D91-476CF0A14A1B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeAjudaAi.Modules.Search.Application", "src\Modules\Search\Application\MeAjudaAi.Modules.Search.Application.csproj", "{0A5B25B9-7991-B208-5D91-476CF0A14A1B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Domain", "Domain", "{855F30AA-D1A2-4A1F-BB2B-68DE6D78AFEF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeAjudaAi.Modules.SearchProviders.Domain", "src\Modules\SearchProviders\Domain\MeAjudaAi.Modules.SearchProviders.Domain.csproj", "{C5E6E9C4-A027-5880-D304-BE3FC5E9B964}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeAjudaAi.Modules.Search.Domain", "src\Modules\Search\Domain\MeAjudaAi.Modules.Search.Domain.csproj", "{C5E6E9C4-A027-5880-D304-BE3FC5E9B964}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastructure", "{9BC7D786-47F5-44BB-88A1-DDEB0022FF23}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeAjudaAi.Modules.SearchProviders.Infrastructure", "src\Modules\SearchProviders\Infrastructure\MeAjudaAi.Modules.SearchProviders.Infrastructure.csproj", "{0A64D976-2B75-C6F2-9C87-3A780C963FA3}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeAjudaAi.Modules.Search.Infrastructure", "src\Modules\Search\Infrastructure\MeAjudaAi.Modules.Search.Infrastructure.csproj", "{0A64D976-2B75-C6F2-9C87-3A780C963FA3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{4726175B-331E-49FA-A49A-EE5AC30B495A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeAjudaAi.Modules.SearchProviders.Tests", "src\Modules\SearchProviders\Tests\MeAjudaAi.Modules.SearchProviders.Tests.csproj", "{C7F6B6F4-4F9C-C844-500C-87E3802A6C4B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeAjudaAi.Modules.Search.Tests", "src\Modules\Search\Tests\MeAjudaAi.Modules.Search.Tests.csproj", "{C7F6B6F4-4F9C-C844-500C-87E3802A6C4B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Catalogs", "Catalogs", "{8B551008-B254-EBAF-1B6D-AB7C420234EA}"
EndProject
Expand Down Expand Up @@ -609,6 +609,30 @@ Global
{3B6D6C13-1E04-47B9-B44E-36D25DF913C7}.Release|x64.Build.0 = Release|Any CPU
{3B6D6C13-1E04-47B9-B44E-36D25DF913C7}.Release|x86.ActiveCfg = Release|Any CPU
{3B6D6C13-1E04-47B9-B44E-36D25DF913C7}.Release|x86.Build.0 = Release|Any CPU
{30A2D3C4-AF98-40A1-AA90-ED7C5FE090F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{30A2D3C4-AF98-40A1-AA90-ED7C5FE090F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{30A2D3C4-AF98-40A1-AA90-ED7C5FE090F8}.Debug|x64.ActiveCfg = Debug|Any CPU
{30A2D3C4-AF98-40A1-AA90-ED7C5FE090F8}.Debug|x64.Build.0 = Debug|Any CPU
{30A2D3C4-AF98-40A1-AA90-ED7C5FE090F8}.Debug|x86.ActiveCfg = Debug|Any CPU
{30A2D3C4-AF98-40A1-AA90-ED7C5FE090F8}.Debug|x86.Build.0 = Debug|Any CPU
{30A2D3C4-AF98-40A1-AA90-ED7C5FE090F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{30A2D3C4-AF98-40A1-AA90-ED7C5FE090F8}.Release|Any CPU.Build.0 = Release|Any CPU
{30A2D3C4-AF98-40A1-AA90-ED7C5FE090F8}.Release|x64.ActiveCfg = Release|Any CPU
{30A2D3C4-AF98-40A1-AA90-ED7C5FE090F8}.Release|x64.Build.0 = Release|Any CPU
{30A2D3C4-AF98-40A1-AA90-ED7C5FE090F8}.Release|x86.ActiveCfg = Release|Any CPU
{30A2D3C4-AF98-40A1-AA90-ED7C5FE090F8}.Release|x86.Build.0 = Release|Any CPU
{2C85E336-66A2-4B4F-845A-DBA2A6520162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2C85E336-66A2-4B4F-845A-DBA2A6520162}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C85E336-66A2-4B4F-845A-DBA2A6520162}.Debug|x64.ActiveCfg = Debug|Any CPU
{2C85E336-66A2-4B4F-845A-DBA2A6520162}.Debug|x64.Build.0 = Debug|Any CPU
{2C85E336-66A2-4B4F-845A-DBA2A6520162}.Debug|x86.ActiveCfg = Debug|Any CPU
{2C85E336-66A2-4B4F-845A-DBA2A6520162}.Debug|x86.Build.0 = Debug|Any CPU
{2C85E336-66A2-4B4F-845A-DBA2A6520162}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C85E336-66A2-4B4F-845A-DBA2A6520162}.Release|Any CPU.Build.0 = Release|Any CPU
{2C85E336-66A2-4B4F-845A-DBA2A6520162}.Release|x64.ActiveCfg = Release|Any CPU
{2C85E336-66A2-4B4F-845A-DBA2A6520162}.Release|x64.Build.0 = Release|Any CPU
{2C85E336-66A2-4B4F-845A-DBA2A6520162}.Release|x86.ActiveCfg = Release|Any CPU
{2C85E336-66A2-4B4F-845A-DBA2A6520162}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -683,8 +707,14 @@ Global
{8B551008-B254-EBAF-1B6D-AB7C420234EA} = {D55DFAF4-45A1-4C45-AA54-8CE46F0AFB1F}
{B346CC0B-427A-E442-6F5D-8AAE1AB081D6} = {8B551008-B254-EBAF-1B6D-AB7C420234EA}
{DC1D1ACD-A21E-4BA0-A22D-77450234BD2A} = {B346CC0B-427A-E442-6F5D-8AAE1AB081D6}
{1510B873-F5F8-8A20-05CA-B70BA1F93C8F} = {8B551008-B254-EBAF-1B6D-AB7C420234EA}
{44577491-2FC0-4F52-AF5C-2BC9B323CDB7} = {1510B873-F5F8-8A20-05CA-B70BA1F93C8F}
{8D23D6D3-2B2E-7F09-866F-FA51CC0FC081} = {8B551008-B254-EBAF-1B6D-AB7C420234EA}
{3B6D6C13-1E04-47B9-B44E-36D25DF913C7} = {8D23D6D3-2B2E-7F09-866F-FA51CC0FC081}
{A63FE417-CEAA-2A64-637A-6EABC61CE16D} = {8B551008-B254-EBAF-1B6D-AB7C420234EA}
{30A2D3C4-AF98-40A1-AA90-ED7C5FE090F8} = {A63FE417-CEAA-2A64-637A-6EABC61CE16D}
{BDD25844-1435-F5BA-1F9B-EFB3B12C916F} = {8B551008-B254-EBAF-1B6D-AB7C420234EA}
{2C85E336-66A2-4B4F-845A-DBA2A6520162} = {BDD25844-1435-F5BA-1F9B-EFB3B12C916F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {391B5342-8EC5-4DF0-BCDA-6D73F87E8751}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ namespace MeAjudaAi.Modules.ServiceCatalogs.Domain.Exceptions;
/// </summary>
public sealed class CatalogDomainException : Exception
{
public CatalogDomainException() { }

public CatalogDomainException(string message) : base(message) { }

public CatalogDomainException(string message, Exception innerException)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace MeAjudaAi.Modules.ServiceCatalogs.Domain.ValueObjects;
/// <summary>
/// Identificador fortemente tipado para o agregado Service.
/// </summary>
public class ServiceId : ValueObject
public sealed class ServiceId : ValueObject
{
public Guid Value { get; }

Expand Down
3 changes: 2 additions & 1 deletion src/Modules/ServiceCatalogs/Infrastructure/Extensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ public static IServiceCollection AddServiceCatalogsInfrastructure(
var isTestEnvironment = environment?.EnvironmentName == "Testing";

// Use shared connection string resolution logic (same precedence as DapperConnection)
var connectionString = configuration.GetConnectionString("DefaultConnection")
var connectionString = configuration["Postgres:ConnectionString"]
?? configuration.GetConnectionString("DefaultConnection")
?? configuration.GetConnectionString("ServiceCatalogs")
?? configuration.GetConnectionString("meajudaai-db");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,14 @@ public sealed class ServiceRepository(ServiceCatalogsDbContext context) : IServi

public async Task<IReadOnlyList<Service>> GetByIdsAsync(IEnumerable<ServiceId> ids, CancellationToken cancellationToken = default)
{
// Guard against null or empty to prevent NullReferenceException
if (ids == null)
return Array.Empty<Service>();

var idList = ids.ToList();
if (idList.Count == 0)
return Array.Empty<Service>();

return await context.Services
.AsNoTracking()
.Include(s => s.Category)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Design;
using Npgsql.EntityFrameworkCore.PostgreSQL;

namespace MeAjudaAi.Modules.ServiceCatalogs.Infrastructure.Persistence;

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.