已删除项目继续从管理员列表和详情中隐藏。
删除后,同一 GitHub 来源可通过“新建迁移”重新拉取,生成新的项目、任务和仓库。 旧任务的“重试迁移”保持原有校验。
This commit is contained in:
+125
@@ -924,6 +924,131 @@ class AdminWorkflowTest {
|
||||
assertThat(published.has("externalRepositoryId")).isFalse();
|
||||
}
|
||||
|
||||
private JsonNode previewImport() throws Exception {
|
||||
return request(signed(body(post("/admin-api/project-imports/preview"),
|
||||
Map.of("repositoryUrl", "https://github.com/example/robot"))), 200).path("data");
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@ValueSource(strings = {"SUCCEEDED", "REVIEW", "FAILED", "QUEUED"})
|
||||
void deletedImportsStayHiddenAndCanBeMigratedIntoANewProject(String originalStatus) throws Exception {
|
||||
JsonNode first = createImport();
|
||||
String oldCode = first.path("projectCode").asText();
|
||||
String oldTaskCode = first.path("taskCode").asText();
|
||||
gitea.migrationTimeout = "REVIEW".equals(originalStatus);
|
||||
gitea.migrationRejected = "FAILED".equals(originalStatus);
|
||||
if (!"QUEUED".equals(originalStatus)) imports.run(oldTaskCode);
|
||||
request(signed(delete("/admin-api/projects/" + oldCode)), 200);
|
||||
request(signed(get("/admin-api/projects/" + oldCode)), 404);
|
||||
assertThat(request(signed(get("/admin-api/projects")), 200)
|
||||
.path("data").path("total").asLong()).isZero();
|
||||
assertThat(previewImport().path("existingProjectCode").isNull()).isTrue();
|
||||
JsonNode oldTask = request(signed(get("/admin-api/project-imports/" + oldTaskCode)), 200).path("data");
|
||||
assertThat(oldTask.path("status").asText()).isEqualTo(originalStatus);
|
||||
assertThat(oldTask.path("canRetry").asBoolean()).isFalse();
|
||||
request(signed(post("/admin-api/project-imports/" + oldTaskCode + "/retry")), 409);
|
||||
|
||||
int previousMigrations = gitea.migrations;
|
||||
gitea.migrationTimeout = false;
|
||||
gitea.migrationRejected = false;
|
||||
JsonNode second = createImport();
|
||||
String newCode = second.path("projectCode").asText();
|
||||
String newTaskCode = second.path("taskCode").asText();
|
||||
assertThat(newCode).isNotEqualTo(oldCode);
|
||||
assertThat(newTaskCode).isNotEqualTo(oldTaskCode);
|
||||
assertThat(previewImport().path("existingProjectCode").asText()).isEqualTo(newCode);
|
||||
assertThat(request(signed(body(post("/admin-api/project-imports"),
|
||||
Map.of("repositoryUrl", "https://github.com/example/robot", "project", metadata()))), 409)
|
||||
.path("data").path("projectCode").asText()).isEqualTo(newCode);
|
||||
imports.run(newTaskCode);
|
||||
assertThat(request(signed(get("/admin-api/project-imports/" + newTaskCode)), 200)
|
||||
.path("data").path("status").asText()).isEqualTo("SUCCEEDED");
|
||||
assertThat(request(signed(get("/admin-api/project-imports/" + oldTaskCode)), 200).path("data"))
|
||||
.isEqualTo(oldTask);
|
||||
assertThat(gitea.migrations).isEqualTo(previousMigrations + 1);
|
||||
assertThat(gitea.deletions).isZero();
|
||||
assertThat(jdbc.queryForObject("SELECT deleted FROM project WHERE project_code=?", Boolean.class, oldCode))
|
||||
.isTrue();
|
||||
JsonNode listed = request(signed(get("/admin-api/projects")), 200).path("data");
|
||||
assertThat(listed.path("total").asLong()).isEqualTo(1);
|
||||
assertThat(listed.path("items").get(0).path("project").path("projectCode").asText()).isEqualTo(newCode);
|
||||
JsonNode detail = request(signed(get("/admin-api/projects/" + newCode)), 200).path("data");
|
||||
assertThat(detail.path("project").path("sourceRepositoryUrl").asText())
|
||||
.isEqualTo("https://github.com/example/robot");
|
||||
assertThat(detail.path("project").has("id")).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void multipleDeleteAndReimportCyclesKeepSeparateHistoryAndRepositories() throws Exception {
|
||||
Set<String> projectCodes = new HashSet<>();
|
||||
for (int index = 0; index < 3; index++) {
|
||||
JsonNode task = createImport();
|
||||
String code = task.path("projectCode").asText();
|
||||
assertThat(projectCodes.add(code)).isTrue();
|
||||
imports.run(task.path("taskCode").asText());
|
||||
assertThat(previewImport().path("existingProjectCode").asText()).isEqualTo(code);
|
||||
if (index < 2) request(signed(delete("/admin-api/projects/" + code)), 200);
|
||||
}
|
||||
assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project_import_task WHERE source_repository_id=?",
|
||||
Long.class, SOURCES.get())).isEqualTo(3);
|
||||
assertThat(gitea.migrations).isEqualTo(3);
|
||||
assertThat(gitea.deletions).isZero();
|
||||
}
|
||||
|
||||
@Test
|
||||
void reimportUrdfSignaturesUseNewProjectPathsAndRejectTheDeletedProjectsBatch() throws Exception {
|
||||
enableOss();
|
||||
JsonNode firstSignature = importUrdfSignature();
|
||||
storeUrdfFiles(firstSignature);
|
||||
JsonNode first = request(signed(body(post("/admin-api/project-imports"), importWithUrdf(firstSignature))), 202)
|
||||
.path("data");
|
||||
String oldCode = first.path("projectCode").asText();
|
||||
imports.run(first.path("taskCode").asText());
|
||||
String oldPrefix = jdbc.queryForObject("SELECT urdf_prefix FROM project WHERE project_code=?", String.class, oldCode);
|
||||
request(signed(delete("/admin-api/projects/" + oldCode)), 200);
|
||||
|
||||
JsonNode nextSignature = importUrdfSignature();
|
||||
assertThat(nextSignature.path("files").get(0).path("objectKey").asText())
|
||||
.doesNotContain("/urdf/" + oldCode + "/");
|
||||
request(signed(body(post("/admin-api/project-imports"), importWithUrdf(firstSignature))), 400);
|
||||
storeUrdfFiles(nextSignature);
|
||||
JsonNode second = request(signed(body(post("/admin-api/project-imports"), importWithUrdf(nextSignature))), 202)
|
||||
.path("data");
|
||||
String newCode = second.path("projectCode").asText();
|
||||
assertThat(nextSignature.path("files").get(0).path("objectKey").asText()).contains("/urdf/" + newCode + "/");
|
||||
imports.run(second.path("taskCode").asText());
|
||||
assertThat(request(signed(get("/admin-api/projects/" + newCode)), 200)
|
||||
.path("data").path("project").path("urdfMainUrl").asText()).contains("/urdf/" + newCode + "/");
|
||||
assertThat(jdbc.queryForObject("SELECT urdf_prefix FROM project WHERE project_code=?", String.class, oldCode))
|
||||
.isEqualTo(oldPrefix);
|
||||
}
|
||||
|
||||
@Test
|
||||
void concurrentReimportsOfADeletedSourceCreateOnlyOneActiveProject() throws Exception {
|
||||
JsonNode oldTask = createImport();
|
||||
request(signed(delete("/admin-api/projects/" + oldTask.path("projectCode").asText())), 200);
|
||||
java.util.concurrent.CountDownLatch start = new java.util.concurrent.CountDownLatch(1);
|
||||
try (java.util.concurrent.ExecutorService executor = java.util.concurrent.Executors.newFixedThreadPool(2)) {
|
||||
List<java.util.concurrent.Future<Integer>> results = new ArrayList<>();
|
||||
for (int index = 0; index < 2; index++) {
|
||||
results.add(executor.submit(() -> {
|
||||
start.await();
|
||||
return mvc.perform(signed(body(post("/admin-api/project-imports"),
|
||||
Map.of("repositoryUrl", "https://github.com/example/robot", "project", metadata()))))
|
||||
.andReturn().getResponse().getStatus();
|
||||
}));
|
||||
}
|
||||
start.countDown();
|
||||
List<Integer> statuses = new ArrayList<>();
|
||||
for (java.util.concurrent.Future<Integer> result : results)
|
||||
statuses.add(result.get(10, java.util.concurrent.TimeUnit.SECONDS));
|
||||
assertThat(statuses).containsExactlyInAnyOrder(202, 409);
|
||||
}
|
||||
assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project WHERE deleted=0", Long.class)).isEqualTo(1);
|
||||
assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project_import_task WHERE source_repository_id=?",
|
||||
Long.class, SOURCES.get())).isEqualTo(2);
|
||||
}
|
||||
|
||||
@Test
|
||||
void uncertainMigrationIsNotRepeatedAfterRestartRecovery() throws Exception {
|
||||
JsonNode task = createImport();
|
||||
|
||||
Reference in New Issue
Block a user