Skip to content

Fix reports with too many IPs #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlteredCoder merged 2 commits into from
Dec 4, 2025
Merged

Fix reports with too many IPs #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a231fb4
Fix reports with too many IPs
AlteredCoder Dec 4, 2025
3ea844d
remove log debug
AlteredCoder Dec 4, 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
36 changes: 32 additions & 4 deletions pkg/database/report.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,19 @@ func (r *ReportClient) GetExpiredIPsFromReport(reportID uint) ([]*IP, error) {

func (r *ReportClient) FindById(reportID uint) (*Report, error) {
var report Report
result := r.db.Preload("IPs").Preload("StatsReport").First(&report, reportID)
result := r.db.Preload("StatsReport").First(&report, reportID)
if result.Error != nil {
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
return nil, nil
}
return nil, result.Error
}

err := r.db.Model(&report).Association("IPs").Find(&report.IPs)
if err != nil {
return nil, err
}

return &report, nil
}

Expand All @@ -85,13 +90,19 @@ func (r *ReportClient) FindByHash(filepath string) (*Report, error) {
return nil, err
}

result := r.db.Preload("IPs").Preload("StatsReport").Where("file_hash = ?", hash).First(&report)
result := r.db.Preload("StatsReport").Where("file_hash = ?", hash).First(&report)
if result.Error != nil {
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
return nil, nil
}
return nil, result.Error
}

err = r.db.Model(&report).Association("IPs").Find(&report.IPs)
if err != nil {
return nil, err
}

return &report, nil
}

Expand Down Expand Up @@ -131,10 +142,21 @@ func (r *ReportClient) Find(reportID string) (*Report, error) {

func (r *ReportClient) FindAll() ([]*Report, error) {
reports := []*Report{}
result := r.db.Preload("IPs").Preload("StatsReport").Find(&reports)

// First, get all reports with StatsReport only
result := r.db.Preload("StatsReport").Find(&reports)
if result.Error != nil {
return nil, result.Error
}

// Then load IPs using Association API for each report (GORM handles batching internally)
for _, report := range reports {
err := r.db.Model(report).Association("IPs").Find(&report.IPs)
if err != nil {
return nil, err
}
}

return reports, nil
}

Expand All @@ -158,7 +180,7 @@ func (r *ReportClient) DeleteExpiredSince(expirationDate time.Time) error {

func (r *ReportClient) FilePathExist(filePath string) (*Report, bool, error) {
var reports []Report
result := r.db.Model(&Report{}).Preload("IPs").Where("file_path = ?", filePath).Find(&reports)
result := r.db.Model(&Report{}).Where("file_path = ?", filePath).Find(&reports)
if result.Error != nil {
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
return nil, false, nil
Expand All @@ -168,5 +190,11 @@ func (r *ReportClient) FilePathExist(filePath string) (*Report, bool, error) {
if len(reports) == 0 {
return nil, false, nil
}

err := r.db.Model(&reports[0]).Association("IPs").Find(&reports[0].IPs)
if err != nil {
return nil, false, err
}

return &reports[0], true, nil
}