Skip to content

Commit

Permalink
Merge pull request #151 from actiontech/fix-task
Browse files Browse the repository at this point in the history
fix: add exporting status for task
  • Loading branch information
LordofAvernus authored Jan 26, 2024
2 parents 3d23541 + 7e9bb86 commit 7eee833
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
1 change: 1 addition & 0 deletions internal/dms/biz/data_export_task.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,5 @@ type DataExportTaskRepo interface {
SaveDataExportTask(ctx context.Context, dataExportDataExportTasks []*DataExportTask) error
GetDataExportTaskByIds(ctx context.Context, ids []string) (dataExportDataExportTasks []*DataExportTask, err error)
ListDataExportTaskRecord(ctx context.Context, opt *ListDataExportTaskRecordOption) (dataExportTaskRecords []*DataExportTaskRecord, total int64, err error)
BatchUpdateDataExportTaskStatusByIds(ctx context.Context, ids []string, status DataExportTaskStatus) (err error)
}
14 changes: 12 additions & 2 deletions internal/dms/storage/data_export_task.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func NewDataExportTaskRepo(log utilLog.Logger, s *Storage) *DataExportTaskRepo {
return &DataExportTaskRepo{Storage: s, log: utilLog.NewHelper(log, utilLog.WithMessageKey("storage.dataExportTask"))}
}

func (d DataExportTaskRepo) SaveDataExportTask(ctx context.Context, dataExportDataExportTasks []*biz.DataExportTask) error {
func (d *DataExportTaskRepo) SaveDataExportTask(ctx context.Context, dataExportDataExportTasks []*biz.DataExportTask) error {
models := make([]*model.DataExportTask, 0)
for _, dataExportDataExportTask := range dataExportDataExportTasks {
models = append(models, convertBizDataExportTask(dataExportDataExportTask))
Expand All @@ -39,7 +39,7 @@ func (d DataExportTaskRepo) SaveDataExportTask(ctx context.Context, dataExportDa

return nil
}
func (d DataExportTaskRepo) GetDataExportTaskByIds(ctx context.Context, ids []string) (dataExportDataExportTasks []*biz.DataExportTask, err error) {
func (d *DataExportTaskRepo) GetDataExportTaskByIds(ctx context.Context, ids []string) (dataExportDataExportTasks []*biz.DataExportTask, err error) {
tasks := make([]*model.DataExportTask, 0)
if err := transaction(d.log, ctx, d.db, func(tx *gorm.DB) error {
if err := tx.Preload("DataExportTaskRecords").Find(&tasks, "uid in (?)", ids).Error; err != nil {
Expand Down Expand Up @@ -96,3 +96,13 @@ func (d *DataExportTaskRepo) ListDataExportTaskRecord(ctx context.Context, opt *
}
return exportTaskRecords, total, nil
}

func (d *DataExportTaskRepo) BatchUpdateDataExportTaskStatusByIds(ctx context.Context, ids []string, status biz.DataExportTaskStatus) error {
return transaction(d.log, ctx, d.db, func(tx *gorm.DB) error {
if err := tx.WithContext(ctx).Model(&model.DataExportTask{}).Where("uid in (?)", ids).Update("export_status", status).Error; err != nil {
return fmt.Errorf("failed to update data export task status: %v", err)
}

return nil
})
}

0 comments on commit 7eee833

Please sign in to comment.