GetFileDeals should return deals for each file range (#423)

First step to address
filecoin-project/motion#228
This changes GetFileDealsHandler to return list of deals for each
FileRange.

Author: xinaxu

api/api_test.go

@@ -128,7 +128,7 @@ func (nopCloser) Close() error { return nil }
 func setupMockFile() file.Handler {
 	m := new(file.MockFile)
 	m.On("GetFileDealsHandler", mock.Anything, mock.Anything, uint64(1)).
-		Return([]model.Deal{{}}, nil)
+		Return([]file.DealsForFileRange{{}}, nil)
 	m.On("GetFileHandler", mock.Anything, mock.Anything, uint64(1)).
 		Return(&model.File{}, nil)
 	m.On("PrepareToPackFileHandler", mock.Anything, mock.Anything, uint64(1)).

client/swagger/http/file/get_file_deals_responses.go

@@ -8,6 +8,11 @@ import (
 	"gorm.io/gorm"
 )
 
+type DealsForFileRange struct {
+	FileRange model.FileRange
+	Deals     []model.Deal
+}
+
 // GetFileDealsHandler retrieves the deals associated with a given file ID.
 //
 // The method operates by querying the database using the provided file ID. It starts by selecting
@@ -20,26 +25,38 @@ import (
 //   - id: The ID of the file for which deals need to be retrieved.
 //
 // Returns:
-//   - A slice of model.Deal containing the deals associated with the provided file ID.
+//   - A slice of DealsForFileRange containing the deals associated with the provided file ID for each FileRange.
 //   - An error if any issues occur during the database operation.
 func (DefaultHandler) GetFileDealsHandler(
 	ctx context.Context,
 	db *gorm.DB,
 	id uint64,
-) ([]model.Deal, error) {
+) ([]DealsForFileRange, error) {
 	db = db.WithContext(ctx)
+	var result []DealsForFileRange
+
+	var file model.File
+	err := db.Preload("FileRanges").First(&file, id).Error
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to get file with id %d", id)
+	}
 
-	var deals []model.Deal
-	query := db.Where("deals.id IN (?)", db.Table("deals").
-		Joins("JOIN cars ON deals.piece_cid = cars.piece_cid").
-		Joins("JOIN file_ranges ON cars.job_id = file_ranges.job_id").
-		Where("file_ranges.file_id = ?", id).
-		Distinct("deals.id"))
-	if err := query.Find(&deals).Error; err != nil {
-		return nil, errors.WithStack(err)
+	for _, fileRange := range file.FileRanges {
+		var deals []model.Deal
+		err = db.Model(&model.Deal{}).Where("id in (?)",
+			db.Model(&model.Deal{}).Select("deals.id").
+				Joins("JOIN cars on deals.piece_cid = cars.piece_cid").
+				Where("cars.job_id = ?", fileRange.JobID)).Find(&deals).Error
+		if err != nil {
+			return nil, errors.Wrapf(err, "failed to get deals for file range with id %d", fileRange.ID)
+		}
+		result = append(result, DealsForFileRange{
+			FileRange: fileRange,
+			Deals:     deals,
+		})
 	}
 
-	return deals, nil
+	return result, nil
 }
 
 // @ID GetFileDeals
@@ -48,7 +65,7 @@ func (DefaultHandler) GetFileDealsHandler(
 // @Accept json
 // @Produce json
 // @Param id path int true "File ID"
-// @Success 200 {array} model.Deal
+// @Success 200 {array} DealsForFileRange
 // @Failure 500 {object} api.HTTPError
 // @Router /file/{id}/deals [get]
 func _() {}