Refactor TED Repository and Introduce TED Mapping Functionality

- Updated the tender repository to create a unique index on tender_id, enhancing database query performance.
- Introduced new TED mapping functions to convert parsed TED documents into tender entities, improving integration with the tender management system.
- Added error handling for contract notice processing in the TED scraper, ensuring robust logging and error management.
- Removed deprecated eform structures to streamline the codebase and focus on essential components.
This commit is contained in:
n.nakhostin
2025-10-04 12:34:37 +03:30
parent 366f7290a7
commit 0dd877a46d
32 changed files with 2386 additions and 1817 deletions
+73 -3
View File
@@ -275,6 +275,18 @@ func (s *TEDScraper) tarGzFileProcessor(ctx context.Context, reader io.Reader, o
return result, nil
}
func (s *TEDScraper) findTenderByContractNoticeID(ctx context.Context, contractNoticeID string) (*tender.Tender, error) {
existingTender, err := s.tenderRepo.GetByContractNoticeID(ctx, contractNoticeID)
if err != nil {
if err.Error() == "document not found" {
return nil, nil
}
return nil, err
}
return existingTender, nil
}
func (s *TEDScraper) processXMLContent(ctx context.Context, content []byte, fileName string, result *FileProcessingResult) error {
s.logger.Debug("Processing XML content", map[string]interface{}{
"file_name": fileName,
@@ -283,7 +295,7 @@ func (s *TEDScraper) processXMLContent(ctx context.Context, content []byte, file
})
// Parse XML using the flexible TED parser that detects notice type
notice, id, noticeType, err := s.xmlParser.Parse(content)
notice, id, noticeType, err := s.xmlParser.ParseXML(content)
if err != nil {
s.logger.Error("XML parsing failed", map[string]interface{}{
"file_name": fileName,
@@ -293,13 +305,71 @@ func (s *TEDScraper) processXMLContent(ctx context.Context, content []byte, file
return fmt.Errorf("failed to parse XML: %w", err)
}
_ = notice
// Map to tender entity
t := s.mapToTenderFromParsedDoc(notice, "", fileName)
existingTender, err := s.findTenderByContractNoticeID(ctx, t.ContractNoticeID)
if err != nil {
s.logger.Warn("Error checking for existing tender", map[string]interface{}{
"contract_notice_id": t.ContractNoticeID,
"error": err.Error(),
})
}
if err == nil && existingTender != nil {
// Update existing tender
s.logger.Info("Found existing tender, updating", map[string]interface{}{
"existing_tender_id": existingTender.ID.Hex(),
"contract_notice_id": t.ContractNoticeID,
})
t.ID = existingTender.ID
t.UpdatedAt = time.Now().Unix()
err = s.tenderRepo.Update(ctx, t)
if err != nil {
s.logger.Error("Failed to update existing tender", map[string]interface{}{
"tender_id": t.ID.Hex(),
"error": err.Error(),
})
return fmt.Errorf("failed to update existing tender: %w", err)
}
s.logger.Info("Successfully updated tender", map[string]interface{}{
"tender_id": t.ID.Hex(),
})
} else {
// Create new tender
s.logger.Info("Creating new tender", map[string]interface{}{
"contract_notice_id": t.ContractNoticeID,
"tender_id": t.TenderID,
})
t.CreatedAt = time.Now().Unix()
t.UpdatedAt = t.CreatedAt
err = s.tenderRepo.Create(ctx, t)
if err != nil {
s.logger.Error("Failed to create new tender", map[string]interface{}{
"contract_notice_id": t.ContractNoticeID,
"tender_id": t.TenderID,
"error": err.Error(),
})
return fmt.Errorf("failed to create tender: %w", err)
}
s.logger.Info("Successfully created new tender", map[string]interface{}{
"tender_id": t.TenderID,
"contract_notice_id": t.ContractNoticeID,
})
}
// Log detailed parsed information based on notice type
s.logger.Info("Successfully parsed notice", map[string]interface{}{
"notice_id": id,
"notice_type": noticeType,
"file_name": fileName,
"tender_id": t.TenderID,
"tender_url": t.TenderURL,
})
result.SuccessCount++
@@ -318,7 +388,7 @@ func (s *TEDScraper) Run(ctx context.Context) error {
s.logger.Error("Failed to get OJS", map[string]interface{}{
"error": err.Error(),
})
return err
return nil
}
// download daily package