diff --git a/ted/model.go b/ted/model.go index 2bfd7cc..27822f9 100644 --- a/ted/model.go +++ b/ted/model.go @@ -1825,19 +1825,23 @@ func (cn ContractNotice) GetProcedureCode() string { return "" } -// GetProcurementTitle returns the procurement project title +// GetProcurementTitle returns the notice-level procurement project title func (cn ContractNotice) GetProcurementTitle() string { - if cn.firstLot() != nil && - cn.firstLot().ProcurementProject != nil { + if cn.ProcurementProject != nil && strings.TrimSpace(cn.ProcurementProject.Name) != "" { + return cn.ProcurementProject.Name + } + if cn.firstLot() != nil && cn.firstLot().ProcurementProject != nil { return cn.firstLot().ProcurementProject.Name } return "" } -// GetProcurementDescription returns the procurement project description +// GetProcurementDescription returns the notice-level procurement project description func (cn ContractNotice) GetProcurementDescription() string { - if cn.firstLot() != nil && - cn.firstLot().ProcurementProject != nil { + if cn.ProcurementProject != nil && strings.TrimSpace(cn.ProcurementProject.Description) != "" { + return cn.ProcurementProject.Description + } + if cn.firstLot() != nil && cn.firstLot().ProcurementProject != nil { return cn.firstLot().ProcurementProject.Description } return ""