Implements the four audit recommendations from §6.1 of docs/audit-fristenrechner-completeness-2026-04-30.md plus a holiday- adjustment cap fix surfaced by PR-2's smoke test. (1) UPC_INF CCR-conditional rejoinder Public Fristenrechner now flips inf.reply (RoP.029.b → RoP.029.a) and inf.rejoin (1mo / RoP.029.c → 2mo / RoP.029.d) when the user ticks "Mit Widerklage auf Nichtigkeit." Implemented via a new `condition_flag` column on paliad.deadline_rules: when the rule names a flag and the API request's flags array contains it, the calculator substitutes alt_duration_value/unit and alt_rule_code. Independent of the existing `condition_rule_id` mechanism (which references a real rule in the same proceeding tree — only useful for matter-attached trees that already seed the CCR rule). (2) UPC_APP / internal APP grounds anchoring `app.grounds` is now anchored on the trigger date (the appealed decision) with a 4-month duration, not chained 2mo after `app.notice`. Per RoP 220.1 the legal rule is "4 months from notification of the decision," independent of when the notice itself was filed. The chain only happened to give the right answer when both legs landed on a working day; under holiday rollover (e.g. notice deadline pushed to Monday) the grounds deadline drifted off the 4mo legal target. (3) EP_GRANT publish anchor on priority date New `anchor_alt` column on paliad.deadline_rules. ep_grant.publish carries `anchor_alt='priority_date'`. The Fristenrechner UI surfaces an optional "Prioritätstag" input (visible only when EP_GRANT is selected) that, when populated, anchors the publish-A1 calculation on the priority date instead of the filing. Falls back to filing date when the priority field is empty (the case for purely-EP applications with no foreign priority claim). (4) Rule-code format normalisation Migration 029 normalises 'RoP 23' → 'RoP.023', 'RoP 29b' / 'RoP.029b' → 'RoP.029.b', 'RoP 220.1' → 'RoP.220.1', etc. across deadline_rules. Matches the canonical youpc format already used by the PR-1 imported event-deadline rule codes. (+) AdjustForNonWorkingDays cap bumped 30 → 60 Surfaced by the PR-2 smoke test: SoD on 2026-04-30 (3mo from trigger) landed on Sat 2026-08-29 instead of Mon 2026-08-31. The 30-iteration safety bound on AdjustForNonWorkingDays cannot walk past the 33-day UPC summer vacation plus flanking weekends. Bumped to 60. Pure-Go one-liner, locked by a follow-up production smoke (real paliad.holidays seed has the UPC vacation). Schema (migration 029): two new nullable text columns on paliad.deadline_rules — `condition_flag` and `anchor_alt`. Both ignored by every existing rule; only the rows updated above carry values. Models: DeadlineRule gains ConditionFlag + AnchorAlt (nilable strings). Service: FristenrechnerService.Calculate now takes a CalcOptions struct (PriorityDateStr, Flags). API handler accepts optional priorityDate and flags fields on POST /api/tools/fristenrechner. Frontend: TSX surfaces the priority-date row + CCR checkbox conditionally on selectedType (only EP_GRANT / UPC_INF respectively). Client TS reads them and threads through the API call. New i18n keys for both DE+EN. Migration 029 dry-run validated on prod Supabase (BEGIN/ROLLBACK): schema + UPDATEs apply cleanly, rule states match expected post-fix shape. Tests + go build/vet + bun build all clean.
168 lines
5.6 KiB
Go
168 lines
5.6 KiB
Go
package services
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/google/uuid"
|
|
"github.com/jmoiron/sqlx"
|
|
|
|
"mgit.msbls.de/m/patholo/internal/models"
|
|
)
|
|
|
|
// DeadlineRuleService reads paliad.deadline_rules + paliad.proceeding_types.
|
|
// Rules are static reference data; no visibility check needed.
|
|
type DeadlineRuleService struct {
|
|
db *sqlx.DB
|
|
}
|
|
|
|
// NewDeadlineRuleService wires the service to the pool.
|
|
func NewDeadlineRuleService(db *sqlx.DB) *DeadlineRuleService {
|
|
return &DeadlineRuleService{db: db}
|
|
}
|
|
|
|
const ruleColumns = `id, proceeding_type_id, parent_id, code, name, name_en,
|
|
description, primary_party, event_type, is_mandatory, duration_value,
|
|
duration_unit, timing, rule_code, deadline_notes, sequence_order,
|
|
condition_rule_id, condition_flag, alt_duration_value, alt_duration_unit, alt_rule_code,
|
|
anchor_alt, is_spawn, spawn_label, is_active, created_at, updated_at`
|
|
|
|
const proceedingTypeColumns = `id, code, name, name_en, description, jurisdiction,
|
|
category, default_color, sort_order, is_active`
|
|
|
|
// List returns active rules, optionally filtered by proceeding type.
|
|
func (s *DeadlineRuleService) List(ctx context.Context, proceedingTypeID *int) ([]models.DeadlineRule, error) {
|
|
var rules []models.DeadlineRule
|
|
var err error
|
|
|
|
if proceedingTypeID != nil {
|
|
err = s.db.SelectContext(ctx, &rules,
|
|
`SELECT `+ruleColumns+`
|
|
FROM paliad.deadline_rules
|
|
WHERE proceeding_type_id = $1 AND is_active = true
|
|
ORDER BY sequence_order`, *proceedingTypeID)
|
|
} else {
|
|
err = s.db.SelectContext(ctx, &rules,
|
|
`SELECT `+ruleColumns+`
|
|
FROM paliad.deadline_rules
|
|
WHERE is_active = true
|
|
ORDER BY proceeding_type_id, sequence_order`)
|
|
}
|
|
if err != nil {
|
|
return nil, fmt.Errorf("list deadline rules: %w", err)
|
|
}
|
|
return rules, nil
|
|
}
|
|
|
|
// RuleTreeNode pairs a rule with its child rules in a parent_id hierarchy.
|
|
type RuleTreeNode struct {
|
|
models.DeadlineRule
|
|
Children []RuleTreeNode `json:"children,omitempty"`
|
|
}
|
|
|
|
// GetRuleTree returns rules for a proceeding type as a tree (same proceeding type only).
|
|
func (s *DeadlineRuleService) GetRuleTree(ctx context.Context, proceedingTypeCode string) ([]RuleTreeNode, error) {
|
|
var pt models.ProceedingType
|
|
if err := s.db.GetContext(ctx, &pt,
|
|
`SELECT `+proceedingTypeColumns+`
|
|
FROM paliad.proceeding_types
|
|
WHERE code = $1 AND is_active = true`, proceedingTypeCode); err != nil {
|
|
return nil, fmt.Errorf("resolve proceeding type %q: %w", proceedingTypeCode, err)
|
|
}
|
|
|
|
var rules []models.DeadlineRule
|
|
if err := s.db.SelectContext(ctx, &rules,
|
|
`SELECT `+ruleColumns+`
|
|
FROM paliad.deadline_rules
|
|
WHERE proceeding_type_id = $1 AND is_active = true
|
|
ORDER BY sequence_order`, pt.ID); err != nil {
|
|
return nil, fmt.Errorf("list rules for %q: %w", proceedingTypeCode, err)
|
|
}
|
|
return buildTree(rules), nil
|
|
}
|
|
|
|
// GetFullTimeline returns all rules in the tree starting at the given proceeding
|
|
// type, following parent_id even across proceeding types (for cross-type spawns
|
|
// like "Appeal" hanging off an INF Decision).
|
|
func (s *DeadlineRuleService) GetFullTimeline(ctx context.Context, proceedingTypeCode string) ([]models.DeadlineRule, *models.ProceedingType, error) {
|
|
var pt models.ProceedingType
|
|
if err := s.db.GetContext(ctx, &pt,
|
|
`SELECT `+proceedingTypeColumns+`
|
|
FROM paliad.proceeding_types
|
|
WHERE code = $1 AND is_active = true`, proceedingTypeCode); err != nil {
|
|
return nil, nil, fmt.Errorf("resolve proceeding type %q: %w", proceedingTypeCode, err)
|
|
}
|
|
|
|
var rules []models.DeadlineRule
|
|
err := s.db.SelectContext(ctx, &rules, `
|
|
WITH RECURSIVE tree AS (
|
|
SELECT * FROM paliad.deadline_rules
|
|
WHERE proceeding_type_id = $1 AND parent_id IS NULL AND is_active = true
|
|
UNION ALL
|
|
SELECT dr.* FROM paliad.deadline_rules dr
|
|
JOIN tree t ON dr.parent_id = t.id
|
|
WHERE dr.is_active = true
|
|
)
|
|
SELECT `+ruleColumns+` FROM tree ORDER BY sequence_order`, pt.ID)
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("fetch timeline for %q: %w", proceedingTypeCode, err)
|
|
}
|
|
return rules, &pt, nil
|
|
}
|
|
|
|
// GetByIDs fetches a set of rules by UUID.
|
|
func (s *DeadlineRuleService) GetByIDs(ctx context.Context, ids []uuid.UUID) ([]models.DeadlineRule, error) {
|
|
if len(ids) == 0 {
|
|
return nil, nil
|
|
}
|
|
query, args, err := sqlx.In(
|
|
`SELECT `+ruleColumns+`
|
|
FROM paliad.deadline_rules
|
|
WHERE id IN (?) AND is_active = true
|
|
ORDER BY sequence_order`, ids)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("build IN query: %w", err)
|
|
}
|
|
query = s.db.Rebind(query)
|
|
|
|
var rules []models.DeadlineRule
|
|
if err := s.db.SelectContext(ctx, &rules, query, args...); err != nil {
|
|
return nil, fmt.Errorf("fetch rules by IDs: %w", err)
|
|
}
|
|
return rules, nil
|
|
}
|
|
|
|
// ListProceedingTypes returns active proceeding types ordered by sort_order.
|
|
func (s *DeadlineRuleService) ListProceedingTypes(ctx context.Context) ([]models.ProceedingType, error) {
|
|
var types []models.ProceedingType
|
|
if err := s.db.SelectContext(ctx, &types,
|
|
`SELECT `+proceedingTypeColumns+`
|
|
FROM paliad.proceeding_types
|
|
WHERE is_active = true
|
|
ORDER BY sort_order`); err != nil {
|
|
return nil, fmt.Errorf("list proceeding types: %w", err)
|
|
}
|
|
return types, nil
|
|
}
|
|
|
|
// buildTree converts a flat rule slice into a parent_id-rooted tree.
|
|
func buildTree(rules []models.DeadlineRule) []RuleTreeNode {
|
|
nodeMap := make(map[uuid.UUID]*RuleTreeNode, len(rules))
|
|
var roots []RuleTreeNode
|
|
|
|
for _, r := range rules {
|
|
nodeMap[r.ID] = &RuleTreeNode{DeadlineRule: r}
|
|
}
|
|
for _, r := range rules {
|
|
node := nodeMap[r.ID]
|
|
if r.ParentID != nil {
|
|
if parent, ok := nodeMap[*r.ParentID]; ok {
|
|
parent.Children = append(parent.Children, *node)
|
|
continue
|
|
}
|
|
}
|
|
roots = append(roots, *node)
|
|
}
|
|
return roots
|
|
}
|