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
refactor: rename Catalogs to ServiceCatalogs - Phase 2 (Shared + Test…
…s + Docs)

- Updated Shared contracts: IServiceCatalogsModuleApi, DTOs
- Updated Integration/E2E tests in tests/ folder
- Updated documentation: catalogs.md -> service_catalogs.md
- Updated infrastructure scripts
- Updated architecture and roadmap references

Files: 18 (Shared + External Tests + Docs)
Phase: 2 of 2 (Final)

This completes the Catalogs -> ServiceCatalogs renaming.
Total files across all phases: ~147
All phases: < 70 files each ✓
  • Loading branch information
Filipe Frigini committed Nov 19, 2025
commit 280a58763d51f5a4889fc9c43ca76e7292ea0817
4 changes: 2 additions & 2 deletions docs/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public class ProvidersContext
- **Qualification**: Qualificações e habilitações profissionais
- **VerificationStatus**: Status de verificação (Pending, Verified, Rejected, etc.)

#### 3. **Catalogs Context** (Implementado)
#### 3. **service_catalogs Context** (Implementado)
**Responsabilidade**: Catálogo administrativo de categorias e serviços

**Conceitos Implementados**:
Expand All @@ -124,7 +124,7 @@ public class ProvidersContext
- **DisplayOrder**: Ordenação customizada para apresentação
- **Activation/Deactivation**: Controle de visibilidade no catálogo

**Schema**: `catalogs` (isolado no PostgreSQL)
**Schema**: `service_catalogs` (isolado no PostgreSQL)

#### 4. **Location Context** (Implementado)
**Responsabilidade**: Geolocalização e lookup de CEP brasileiro
Expand Down
56 changes: 28 additions & 28 deletions docs/modules/catalogs.md → docs/modules/service_catalogs.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# 📋 Módulo Catalogs - Catálogo de Serviços
# 📋 Módulo service_catalogs - Catálogo de Serviços

> **✅ Status**: Módulo **implementado e funcional** (Novembro 2025)

## 🎯 Visão Geral

O módulo **Catalogs** é responsável pelo **catálogo administrativo de serviços** oferecidos na plataforma MeAjudaAi, implementando um Bounded Context dedicado para gestão hierárquica de categorias e serviços.
O módulo **service_catalogs** é responsável pelo **catálogo administrativo de serviços** oferecidos na plataforma MeAjudaAi, implementando um Bounded Context dedicado para gestão hierárquica de categorias e serviços.

### **Responsabilidades**
- ✅ **Catálogo hierárquico** de categorias de serviços
Expand All @@ -16,8 +16,8 @@ O módulo **Catalogs** é responsável pelo **catálogo administrativo de servi

## 🏗️ Arquitetura Implementada

### **Bounded Context: Catalogs**
- **Schema**: `catalogs` (isolado no PostgreSQL)
### **Bounded Context: service_catalogs**
- **Schema**: `service_catalogs` (isolado no PostgreSQL)
- **Padrão**: DDD + CQRS
- **Naming**: snake_case no banco, PascalCase no código

Expand Down Expand Up @@ -197,10 +197,10 @@ POST /api/v1/catalogs/services/validate # Validar batch de serviço

## 🔌 Module API - Comunicação Inter-Módulos

### **Interface ICatalogsModuleApi**
### **Interface Iservice_catalogsModuleApi**

```csharp
public interface ICatalogsModuleApi : IModuleApi
public interface Iservice_catalogsModuleApi : IModuleApi
{
// Service Categories
Task<Result<ModuleServiceCategoryDto?>> GetServiceCategoryByIdAsync(
Expand Down Expand Up @@ -266,11 +266,11 @@ public sealed record ModuleServiceValidationResultDto(

```csharp
[ModuleApi(ModuleMetadata.Name, ModuleMetadata.Version)]
public sealed class CatalogsModuleApi : ICatalogsModuleApi
public sealed class service_catalogsModuleApi : Iservice_catalogsModuleApi
{
private static class ModuleMetadata
{
public const string Name = "Catalogs";
public const string Name = "service_catalogs";
public const string Version = "1.0";
}

Expand All @@ -292,11 +292,11 @@ public sealed class CatalogsModuleApi : ICatalogsModuleApi
## 🗄️ Schema de Banco de Dados

```sql
-- Schema: catalogs
CREATE SCHEMA IF NOT EXISTS catalogs;
-- Schema: service_catalogs
CREATE SCHEMA IF NOT EXISTS service_catalogs;

-- Tabela: service_categories
CREATE TABLE catalogs.service_categories (
CREATE TABLE service_catalogs.service_categories (
id UUID PRIMARY KEY,
name VARCHAR(100) NOT NULL UNIQUE,
description VARCHAR(500),
Expand All @@ -309,9 +309,9 @@ CREATE TABLE catalogs.service_categories (
);

-- Tabela: services
CREATE TABLE catalogs.services (
CREATE TABLE service_catalogs.services (
id UUID PRIMARY KEY,
category_id UUID NOT NULL REFERENCES catalogs.service_categories(id),
category_id UUID NOT NULL REFERENCES service_catalogs.service_categories(id),
name VARCHAR(150) NOT NULL UNIQUE,
description VARCHAR(1000),
is_active BOOLEAN NOT NULL DEFAULT TRUE,
Expand All @@ -323,11 +323,11 @@ CREATE TABLE catalogs.services (
);

-- Índices
CREATE INDEX idx_services_category_id ON catalogs.services(category_id);
CREATE INDEX idx_services_is_active ON catalogs.services(is_active);
CREATE INDEX idx_service_categories_is_active ON catalogs.service_categories(is_active);
CREATE INDEX idx_service_categories_display_order ON catalogs.service_categories(display_order);
CREATE INDEX idx_services_display_order ON catalogs.services(display_order);
CREATE INDEX idx_services_category_id ON service_catalogs.services(category_id);
CREATE INDEX idx_services_is_active ON service_catalogs.services(is_active);
CREATE INDEX idx_service_categories_is_active ON service_catalogs.service_categories(is_active);
CREATE INDEX idx_service_categories_display_order ON service_catalogs.service_categories(display_order);
CREATE INDEX idx_services_display_order ON service_catalogs.services(display_order);
```

## 🔗 Integração com Outros Módulos
Expand All @@ -342,7 +342,7 @@ public class Provider

public class ProviderService
{
public Guid ServiceId { get; set; } // FK para Catalogs.Service
public Guid ServiceId { get; set; } // FK para service_catalogs.Service
public decimal Price { get; set; }
public bool IsOffered { get; set; }
}
Expand All @@ -360,13 +360,13 @@ public class SearchableProvider
## 📊 Estrutura de Pastas

```plaintext
src/Modules/Catalogs/
src/Modules/ServiceCatalogs/
├── API/
│ ├── Endpoints/
│ │ ├── ServiceCategoryEndpoints.cs
│ │ ├── ServiceEndpoints.cs
│ │ └── CatalogsModuleEndpoints.cs
│ └── MeAjudaAi.Modules.Catalogs.API.csproj
│ │ └── service_catalogsModuleEndpoints.cs
│ └── MeAjudaAi.Modules.service_catalogs.API.csproj
├── Application/
│ ├── Commands/
│ │ ├── Service/ # 6 commands
Expand All @@ -381,8 +381,8 @@ src/Modules/Catalogs/
│ │ └── QueryHandlers.cs # 6 handlers consolidados
│ ├── DTOs/ # 5 DTOs
│ ├── ModuleApi/
│ │ └── CatalogsModuleApi.cs
│ └── MeAjudaAi.Modules.Catalogs.Application.csproj
│ │ └── service_catalogsModuleApi.cs
│ └── MeAjudaAi.Modules.service_catalogs.Application.csproj
├── Domain/
│ ├── Entities/
│ │ ├── Service.cs
Expand All @@ -398,18 +398,18 @@ src/Modules/Catalogs/
│ ├── ValueObjects/
│ │ ├── ServiceId.cs
│ │ └── ServiceCategoryId.cs
│ └── MeAjudaAi.Modules.Catalogs.Domain.csproj
│ └── MeAjudaAi.Modules.service_catalogs.Domain.csproj
├── Infrastructure/
│ ├── Persistence/
│ │ ├── CatalogsDbContext.cs
│ │ ├── service_catalogsDbContext.cs
│ │ ├── Configurations/
│ │ │ ├── ServiceConfiguration.cs
│ │ │ └── ServiceCategoryConfiguration.cs
│ │ └── Repositories/
│ │ ├── ServiceRepository.cs
│ │ └── ServiceCategoryRepository.cs
│ ├── Extensions.cs
│ └── MeAjudaAi.Modules.Catalogs.Infrastructure.csproj
│ └── MeAjudaAi.Modules.service_catalogs.Infrastructure.csproj
└── Tests/
├── Builders/
│ ├── ServiceBuilder.cs
Expand Down Expand Up @@ -438,7 +438,7 @@ src/Modules/Catalogs/
- Domain events

### **Testes de Integração**
- ✅ **CatalogsIntegrationTests**: 29 testes passando
- ✅ **service_catalogsIntegrationTests**: 29 testes passando
- Endpoints REST completos
- Module API
- Repository operations
Expand Down
32 changes: 16 additions & 16 deletions docs/roadmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,15 +218,15 @@ public interface ILocationModuleApi : IModuleApi

---

### 1.6. ✅ Módulo Catalogs (Concluído)
### 1.6. ✅ Módulo service_catalogs (Concluído)

**Status**: Implementado e funcional com testes completos

**Objetivo**: Gerenciar tipos de serviços que prestadores podem oferecer através de um catálogo admin-managed.

#### **Arquitetura Implementada**
- **Padrão**: DDD + CQRS com hierarquia de categorias
- **Schema**: `catalogs` (isolado)
- **Schema**: `service_catalogs` (isolado)
- **Naming**: snake_case no banco, PascalCase no código

#### **Entidades de Domínio Implementadas**
Expand Down Expand Up @@ -275,10 +275,10 @@ public sealed class Service : AggregateRoot<ServiceId>
- Categories: GetById, GetAll, GetWithCount
- Services: GetById, GetAll, GetByCategory
- **Handlers**: 11 Command Handlers + 6 Query Handlers
- **Module API**: `CatalogsModuleApi` para comunicação inter-módulos
- **Module API**: `service_catalogsModuleApi` para comunicação inter-módulos

**3. Infrastructure Layer** ✅
- `CatalogsDbContext` com schema isolation (`catalogs`)
- `service_catalogsDbContext` com schema isolation (`service_catalogs`)
- EF Core Configurations (snake_case, índices otimizados)
- Repositories com SaveChangesAsync integrado
- DI registration com auto-migration support
Expand All @@ -305,12 +305,12 @@ public sealed class Service : AggregateRoot<ServiceId>
- **Versionamento**: Sistema unificado via BaseEndpoint

**5. Shared.Contracts** ✅
- `ICatalogsModuleApi` - Interface pública
- `Iservice_catalogsModuleApi` - Interface pública
- DTOs: ModuleServiceCategoryDto, ModuleServiceDto, ModuleServiceListDto, ModuleServiceValidationResultDto

#### **API Pública Implementada**
```csharp
public interface ICatalogsModuleApi : IModuleApi
public interface Iservice_catalogsModuleApi : IModuleApi
{
Task<Result<ModuleServiceCategoryDto?>> GetServiceCategoryByIdAsync(Guid categoryId, CancellationToken ct = default);
Task<Result<IReadOnlyList<ModuleServiceCategoryDto>>> GetAllServiceCategoriesAsync(bool activeOnly = true, CancellationToken ct = default);
Expand All @@ -336,7 +336,7 @@ public interface ICatalogsModuleApi : IModuleApi

#### **Próximos Passos (Pós-MVP)**
1. **Testes**: Implementar unit tests e integration tests
2. **Migrations**: Criar e aplicar migration inicial do schema `catalogs`
2. **Migrations**: Criar e aplicar migration inicial do schema `service_catalogs`
3. **Bootstrap**: Integrar no Program.cs e AppHost
4. **Provider Integration**: Estender Providers para suportar ProviderServices
5. **Admin UI**: Interface para gestão de catálogo
Expand All @@ -350,8 +350,8 @@ public interface ICatalogsModuleApi : IModuleApi

#### **Schema do Banco de Dados**
```sql
-- Schema: catalogs
CREATE TABLE catalogs.service_categories (
-- Schema: service_catalogs
CREATE TABLE service_catalogs.service_categories (
id UUID PRIMARY KEY,
name VARCHAR(200) NOT NULL UNIQUE,
description TEXT,
Expand All @@ -361,9 +361,9 @@ CREATE TABLE catalogs.service_categories (
updated_at TIMESTAMP
);

CREATE TABLE catalogs.services (
CREATE TABLE service_catalogs.services (
id UUID PRIMARY KEY,
category_id UUID NOT NULL REFERENCES catalogs.service_categories(id),
category_id UUID NOT NULL REFERENCES service_catalogs.service_categories(id),
name VARCHAR(200) NOT NULL UNIQUE,
description TEXT,
is_active BOOLEAN NOT NULL DEFAULT TRUE,
Expand All @@ -372,9 +372,9 @@ CREATE TABLE catalogs.services (
updated_at TIMESTAMP
);

CREATE INDEX idx_services_category_id ON catalogs.services(category_id);
CREATE INDEX idx_services_is_active ON catalogs.services(is_active);
CREATE INDEX idx_service_categories_is_active ON catalogs.service_categories(is_active);
CREATE INDEX idx_services_category_id ON service_catalogs.services(category_id);
CREATE INDEX idx_services_is_active ON service_catalogs.services(is_active);
CREATE INDEX idx_service_categories_is_active ON service_catalogs.service_categories(is_active);
```

---
Expand Down Expand Up @@ -688,7 +688,7 @@ web/

**Funcionalidades Core**:
- **User & Provider Management**: Visualizar, suspender, verificar manualmente
- **Catalogs Management**: Aprovar/rejeitar serviços sugeridos
- **service_catalogs Management**: Aprovar/rejeitar serviços sugeridos
- **Review Moderation**: Lidar com reviews sinalizados
- **Dashboard**: Métricas-chave do módulo Analytics

Expand Down Expand Up @@ -780,7 +780,7 @@ web/
3. ✅ Módulo Documents (Concluído)
4. ✅ Módulo Search & Discovery (Concluído)
5. 📋 Módulo Location - CEP lookup e geocoding
6. 📋 Módulo Catalogs - Catálogo admin-managed de categorias e serviços
6. 📋 Módulo service_catalogs - Catálogo admin-managed de categorias e serviços
7. 📋 Admin Portal - Gestão básica
8. 📋 Customer Profile - Gestão de perfil

Expand Down
6 changes: 3 additions & 3 deletions docs/testing/test_infrastructure.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,12 @@ tests/MeAjudaAi.E2E.Tests/
│ ├── Users/
│ │ └── UsersEndToEndTests.cs # Testes E2E de Users
│ ├── Catalogs/
│ │ └── CatalogsEndToEndTests.cs # Testes E2E de Catalogs
│ │ └── service_catalogsEndToEndTests.cs # Testes E2E de service_catalogs
│ └── Providers/
│ └── ProvidersEndToEndTests.cs # Testes E2E de Providers
├── Integration/
│ ├── ModuleIntegrationTests.cs # Integração entre módulos
│ └── CatalogsModuleIntegrationTests.cs
│ └── service_catalogsModuleIntegrationTests.cs
└── Infrastructure/
└── InfrastructureHealthTests.cs # Testes de saúde da infra
```
Expand Down Expand Up @@ -263,7 +263,7 @@ public class MeuTeste : TestContainerTestBase
- WebApplicationFactory
- Testes de infraestrutura
- Testes de Users
- Testes de Catalogs
- Testes de service_catalogs

### 🔄 Próximos Passos

Expand Down
4 changes: 2 additions & 2 deletions infrastructure/test-database-init.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ try {

# Test schemas
$hasErrors = $false
$schemas = @("users", "providers", "documents", "search", "location", "catalogs", "hangfire", "meajudaai_app")
$schemas = @("users", "providers", "documents", "search", "location", "service_service_catalogs", "hangfire", "meajudaai_app")

foreach ($schema in $schemas) {
$query = "SELECT EXISTS(SELECT 1 FROM information_schema.schemata WHERE schema_name = '$schema');"
Expand All @@ -101,7 +101,7 @@ try {
"documents_role", "documents_owner",
"search_role", "search_owner",
"location_role", "location_owner",
"catalogs_role", "catalogs_owner",
"service_catalogs_role", "service_catalogs_owner",
"hangfire_role",
"meajudaai_app_role", "meajudaai_app_owner"
)
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/test-database-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ echo "🔍 Verifying database schemas..."
has_errors=false

# Test schemas
SCHEMAS=("users" "providers" "documents" "search" "location" "catalogs" "hangfire" "meajudaai_app")
SCHEMAS=("users" "providers" "documents" "search" "location" "service_service_catalogs" "hangfire" "meajudaai_app")

for schema in "${SCHEMAS[@]}"; do
# Use double-dollar quoting to safely handle identifiers
Expand All @@ -99,7 +99,7 @@ ROLES=(
"documents_role" "documents_owner"
"search_role" "search_owner"
"location_role" "location_owner"
"catalogs_role" "catalogs_owner"
"service_catalogs_role" "service_catalogs_owner"
"hangfire_role"
"meajudaai_app_role" "meajudaai_app_owner"
)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
namespace MeAjudaAi.Shared.Contracts.Modules.ServiceCatalogs.DTOs;

/// <summary>
/// DTO for service category information exposed to other modules.
/// </summary>
public sealed record ModuleServiceCategoryDto(
Guid Id,
string Name,
string? Description,
bool IsActive,
int DisplayOrder
);

/// <summary>
/// DTO for service information exposed to other modules.
/// </summary>
public sealed record ModuleServiceDto(
Guid Id,
Guid CategoryId,
string CategoryName,
string Name,
string? Description,
bool IsActive
);

/// <summary>
/// Simplified service DTO for list operations.
/// </summary>
public sealed record ModuleServiceListDto(
Guid Id,
Guid CategoryId,
string Name,
bool IsActive
);

/// <summary>
/// Result of service validation operation.
/// </summary>
public sealed record ModuleServiceValidationResultDto(
bool AllValid,
Guid[] InvalidServiceIds,
Guid[] InactiveServiceIds
);
Loading