Refactor habit entries: remove soft delete and add smart pagination

Remove soft delete from HabitEntry:
- Eliminate DeletedAt field from entity and database
- Change UnmarkHabit from soft delete to hard delete
- Simplify all queries removing deleted_at checks
- Update migration to remove deleted_at column

Add date filtering and smart pagination to GetHabitEntries:
- Support optional from/to date parameters
- Implement intelligent pagination rules:
  * No date range: pagination required
  * Date range > 1 year: pagination required
  * Date range ≤ 1 year: pagination optional
- Pagination defaults (page=1, limit=50) only when required
- Return metadata with total count, page, and limit

Technical improvements:
- Cleaner codebase without soft delete complexity
- Better performance (no filtering in queries)
- More intuitive API with flexible pagination
- Comprehensive test coverage for validation rules
This commit is contained in:
2025-11-26 16:33:40 +01:00
parent 74cd2ec84d
commit 9f673bfca3
10 changed files with 309 additions and 129 deletions
@@ -4,6 +4,7 @@ import (
"context"
"time"
"apocapoc-api/internal/domain/entities"
"apocapoc-api/internal/domain/repositories"
"apocapoc-api/internal/shared/errors"
)
@@ -19,6 +20,17 @@ type HabitEntryDTO struct {
type GetHabitEntriesQuery struct {
HabitID string
UserID string
From *time.Time
To *time.Time
Page int
Limit int
}
type GetHabitEntriesResult struct {
Entries []HabitEntryDTO
Total int
Page int
Limit int
}
type GetHabitEntriesHandler struct {
@@ -36,8 +48,7 @@ func NewGetHabitEntriesHandler(
}
}
func (h *GetHabitEntriesHandler) Handle(ctx context.Context, query GetHabitEntriesQuery) ([]HabitEntryDTO, error) {
// Verify habit exists and user owns it
func (h *GetHabitEntriesHandler) Handle(ctx context.Context, query GetHabitEntriesQuery) (*GetHabitEntriesResult, error) {
habit, err := h.habitRepo.FindByID(ctx, query.HabitID)
if err != nil {
return nil, err
@@ -47,19 +58,58 @@ func (h *GetHabitEntriesHandler) Handle(ctx context.Context, query GetHabitEntri
return nil, errors.ErrUnauthorized
}
// Get all entries for the habit
entries, err := h.entryRepo.FindByHabitID(ctx, query.HabitID)
var dateRangeDays int
if query.From != nil && query.To != nil {
dateRangeDays = int(query.To.Sub(*query.From).Hours() / 24)
}
requiresPagination := false
if query.From == nil || query.To == nil {
requiresPagination = true
} else if dateRangeDays > 365 {
requiresPagination = true
}
if requiresPagination && query.Limit == 0 {
return nil, errors.ErrInvalidInput
}
var entries []*entities.HabitEntry
if query.From != nil && query.To != nil {
entries, err = h.entryRepo.FindByHabitIDAndDateRange(ctx, query.HabitID, *query.From, *query.To)
} else if query.From != nil {
entries, err = h.entryRepo.FindByHabitIDAndDateRange(ctx, query.HabitID, *query.From, time.Now())
} else if query.To != nil {
entries, err = h.entryRepo.FindByHabitIDAndDateRange(ctx, query.HabitID, time.Time{}, *query.To)
} else {
entries, err = h.entryRepo.FindByHabitID(ctx, query.HabitID)
}
if err != nil {
return nil, err
}
total := len(entries)
if query.Limit > 0 {
offset := (query.Page - 1) * query.Limit
if offset < 0 {
offset = 0
}
end := offset + query.Limit
if offset < len(entries) {
if end > len(entries) {
end = len(entries)
}
entries = entries[offset:end]
} else {
entries = []*entities.HabitEntry{}
}
}
var result []HabitEntryDTO
for _, entry := range entries {
// Filter out deleted entries
if entry.DeletedAt != nil {
continue
}
result = append(result, HabitEntryDTO{
ID: entry.ID,
HabitID: entry.HabitID,
@@ -69,5 +119,10 @@ func (h *GetHabitEntriesHandler) Handle(ctx context.Context, query GetHabitEntri
})
}
return result, nil
return &GetHabitEntriesResult{
Entries: result,
Total: total,
Page: query.Page,
Limit: query.Limit,
}, nil
}