refac: removed ugly multi-line method chaining

This commit is contained in:
fsylvain committed 2026-10-10 20:49:05 +02:00
1 parent e8dff6bb5f
commit ce9c876db6
6 files changed
+72 -67

No files matched your search

@@ -36,10 +36,12 @@ func (v *VariantFileRepository) Find(variantName string, sourceName string) (dom
func (v *VariantFileRepository) Save(file domain.VariantFile) (domain.VariantFile, error) {
model := mappers.VariantFileToModel(file)
model.ID = 0
err := v.db.Clauses(clause.OnConflict{
upsert := clause.OnConflict{
Columns: []clause.Column{{Name: "variant_name"}, {Name: "source_name"}},
DoUpdates: clause.AssignmentColumns([]string{"cached_name", "content_type", "size", "fingerprint"}),
}).Create(&model).Error
}
query := v.db.Clauses(upsert)
err := query.Create(&model).Error
if err != nil {
return domain.VariantFile{}, err
}
@@ -77,10 +79,10 @@ func (v *VariantFileRepository) TotalsBySource() (map[string]domain.VariantFileT
Files int
Bytes int64
}
err := v.db.Model(&entity.ImageVariantFile{}).
Select("source_name, COUNT(*) AS files, COALESCE(SUM(size), 0) AS bytes").
Group("source_name").
Scan(&rows).Error
query := v.db.Model(&entity.ImageVariantFile{})
query = query.Select("source_name, COUNT(*) AS files, COALESCE(SUM(size), 0) AS bytes")
query = query.Group("source_name")
err := query.Scan(&rows).Error
if err != nil {
return nil, err
}
@@ -104,10 +106,10 @@ func (v *VariantFileRepository) UnusedTotals(filter domain.UnusedFilter) (domain
Files int
Bytes int64
}
err := v.db.Model(&entity.ImageVariantFile{}).
Select("COUNT(*) AS files, COALESCE(SUM(size), 0) AS bytes").
Where(unusedCondition, filter.VariantNames, filter.Cutoff.UTC()).
Scan(&row).Error
query := v.db.Model(&entity.ImageVariantFile{})
query = query.Select("COUNT(*) AS files, COALESCE(SUM(size), 0) AS bytes")
query = query.Where(unusedCondition, filter.VariantNames, filter.Cutoff.UTC())
err := query.Scan(&row).Error
if err != nil {
return domain.VariantFileTotals{}, err
}
@@ -120,12 +122,12 @@ func (v *VariantFileRepository) TopSources(limit int) ([]domain.SourceTotals, er
Files int
Bytes int64
}
err := v.db.Model(&entity.ImageVariantFile{}).
Select("source_name, COUNT(*) AS files, COALESCE(SUM(size), 0) AS bytes").
Group("source_name").
Order(topSourcesOrder).
Limit(limit).
Scan(&rows).Error
query := v.db.Model(&entity.ImageVariantFile{})
query = query.Select("source_name, COUNT(*) AS files, COALESCE(SUM(size), 0) AS bytes")
query = query.Group("source_name")
query = query.Order(topSourcesOrder)
query = query.Limit(limit)
err := query.Scan(&rows).Error
if err != nil {
return nil, err
}
@@ -167,10 +169,10 @@ func (v *VariantFileRepository) Totals() (map[string]domain.VariantFileTotals, e
Files int
Bytes int64
}
err := v.db.Model(&entity.ImageVariantFile{}).
Select("variant_name, COUNT(*) AS files, COALESCE(SUM(size), 0) AS bytes").
Group("variant_name").
Scan(&rows).Error
query := v.db.Model(&entity.ImageVariantFile{})
query = query.Select("variant_name, COUNT(*) AS files, COALESCE(SUM(size), 0) AS bytes")
query = query.Group("variant_name")
err := query.Scan(&rows).Error
if err != nil {
return nil, err
}