fix(backup): inventory in schedule's task param

Author: fiftin

api/projects/schedules.go

@@ -43,7 +43,7 @@ func GetSchedule(w http.ResponseWriter, r *http.Request) {
 func GetProjectSchedules(w http.ResponseWriter, r *http.Request) {
 	project := helpers.GetFromContext(r, "project").(db.Project)
 
-	tplSchedules, err := helpers.Store(r).GetProjectSchedules(project.ID)
+	tplSchedules, err := helpers.Store(r).GetProjectSchedules(project.ID, false)
 	if err != nil {
 		helpers.WriteError(w, err)
 		return

db/Store.go

@@ -391,7 +391,7 @@ type AnsibleTaskRepository interface {
 // ScheduleManager handles schedule-related operations
 type ScheduleManager interface {
 	GetSchedules() ([]Schedule, error)
-	GetProjectSchedules(projectID int) ([]ScheduleWithTpl, error)
+	GetProjectSchedules(projectID int, includeTaskParams bool) ([]ScheduleWithTpl, error)
 	GetTemplateSchedules(projectID int, templateID int, onlyCommitCheckers bool) ([]Schedule, error)
 	CreateSchedule(schedule Schedule) (Schedule, error)
 	UpdateSchedule(schedule Schedule) error

db/TaskParams.go

@@ -15,7 +15,7 @@ type TaskParams struct {
 	Version *string `db:"version" json:"version,omitempty"`
 
 	InventoryID   *int    `db:"inventory_id" json:"inventory_id,omitempty" backup:"-"`
-	InventoryName *string `db:"-" json:"-" backup:"inventory_name,omitempty"`
+	InventoryName *string `db:"-" json:"-" backup:"inventory_name"`
 
 	Params MapStringAnyField `db:"params" json:"params,omitempty"`
 }

db/bolt/schedule.go

@@ -34,7 +34,7 @@ func (d *BoltDb) getProjectSchedules(projectID int, filter func(referringObj db.
 	return
 }
 
-func (d *BoltDb) GetProjectSchedules(projectID int) (schedules []db.ScheduleWithTpl, err error) {
+func (d *BoltDb) GetProjectSchedules(projectID int, includeTaskParams bool) (schedules []db.ScheduleWithTpl, err error) {
 	schedules = []db.ScheduleWithTpl{}
 
 	orig, err := d.getProjectSchedules(projectID, func(s db.Schedule) bool {

db/sql/schedule.go

@@ -144,12 +144,28 @@ func (d *SqlDb) GetSchedules() (schedules []db.Schedule, err error) {
 	return
 }
 
-func (d *SqlDb) GetProjectSchedules(projectID int) (schedules []db.ScheduleWithTpl, err error) {
+func (d *SqlDb) GetProjectSchedules(projectID int, includeTaskParams bool) (schedules []db.ScheduleWithTpl, err error) {
 	_, err = d.selectAll(&schedules,
 		"SELECT ps.*, pt.name as tpl_name FROM project__schedule ps "+
 			"JOIN project__template pt ON pt.id = ps.template_id "+
 			"WHERE ps.repository_id IS NULL AND ps.project_id=?",
 		projectID)
+
+	if includeTaskParams {
+		for i := range schedules {
+			if schedules[i].TaskParamsID == nil {
+				continue
+			}
+
+			var taskParams db.TaskParams
+			err = d.getObject(projectID, db.TaskParamsProps, *schedules[i].TaskParamsID, &taskParams)
+			if err != nil {
+				return nil, err
+			}
+			schedules[i].TaskParams = &taskParams
+		}
+	}
+
 	return
 }
 

services/project/backup.go

@@ -164,12 +164,15 @@ func (b *BackupDB) load(projectID int, store db.Store) (err error) {
 		return
 	}
 
-	schedules, err := store.GetSchedules()
+	schedules, err := store.GetProjectSchedules(projectID, true)
 	if err != nil {
 		return
 	}
 
-	b.schedules = getSchedulesByProject(projectID, schedules)
+	for _, s := range schedules {
+		b.schedules = append(b.schedules, s.Schedule)
+	}
+	//b.schedules = getSchedulesByProject(projectID, schedules)
 
 	b.meta, err = store.GetProject(projectID)
 	if err != nil {
@@ -224,6 +227,10 @@ func (b *BackupDB) format() (*BackupFormat, error) {
 			o,
 			*tplName,
 		}
+
+		if o.TaskParams != nil && o.TaskParams.InventoryID != nil {
+			schedules[i].TaskParams.InventoryName, _ = findNameByID[db.Inventory](*o.TaskParams.InventoryID, b.inventories)
+		}
 	}
 
 	keys := make([]BackupAccessKey, len(b.keys))

services/project/restore.go

@@ -76,12 +76,19 @@ func (e BackupSchedule) Restore(store db.Store, b *BackupDB) error {
 	}
 	v.TemplateID = tpl.ID
 
-	newView, err := store.CreateSchedule(v)
+	if v.TaskParams != nil {
+		inv := findEntityByName[db.Inventory](e.TaskParams.InventoryName, b.inventories)
+		if inv != nil {
+			v.TaskParams.InventoryID = &inv.ID
+		}
+	}
+
+	newSchedule, err := store.CreateSchedule(v)
 	if err != nil {
 		return err
 	}
 
-	b.schedules = append(b.schedules, newView)
+	b.schedules = append(b.schedules, newSchedule)
 	return nil
 }
 

services/schedules/SchedulePool.go

@@ -103,10 +103,7 @@ func (r ScheduleRunner) Run() {
 		return
 	}
 
-	schedule.TaskParams.CreateTask()
-
 	task := schedule.TaskParams.CreateTask()
-
 	task.TemplateID = schedule.TemplateID
 	task.ScheduleID = &schedule.ID