From f1efecefeeee14f26c43c9697465664793ddeea1 Mon Sep 17 00:00:00 2001 From: Atefeh Mohseni Ejiyeh Date: Fri, 4 Oct 2024 22:02:41 +0000 Subject: [PATCH] fix: [CODE-2474]: handle import-progress API response for importing repos via the migrator (#2772) --- app/services/importer/repository.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/services/importer/repository.go b/app/services/importer/repository.go index 5496aa3d6..0e370c7a9 100644 --- a/app/services/importer/repository.go +++ b/app/services/importer/repository.go @@ -390,6 +390,15 @@ func (r *Repository) GetProgress(ctx context.Context, repo *types.Repository) (j return job.FailProgress(), nil } + // if repo is importing through the migrator cli there is no job created for it, return state=progress + if repo.State == enum.RepoStateMigrateDataImport || + repo.State == enum.RepoStateMigrateGitPush { + return job.Progress{ + State: job.JobStateRunning, + Progress: job.ProgressMin, + }, nil + } + // otherwise there either was no import, or it completed a long time ago (job cleaned up by now) return job.Progress{}, ErrNotFound }