marcel/familienarchiv
1
0
Fork 0
Code Issues 105 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor(ocr): return TrainingInfoResponse directly from getTrainingInfo endpoint

Browse Source 
Remove the intermediate Map<String,Object> and return the typed record directly
so OpenAPI codegen produces a concrete TypeScript type. Fixes lastRun serializing
as {} (empty object) instead of null when no training run exists.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Marcel
2026-04-17 21:18:27 +02:00
committed by marcel
parent 4ddb095cb1
commit b23118268b
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
backend/src/main/java/org/raddatz/familienarchiv/controller/OcrController.java
View File

@@ -27,7 +27,6 @@ import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBo
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@@ -131,19 +130,8 @@ public class OcrController {
@GetMapping("/api/ocr/training-info") @GetMapping("/api/ocr/training-info")
@RequirePermission(Permission.ADMIN) @RequirePermission(Permission.ADMIN)
public Map<String, Object> getTrainingInfo() { public OcrTrainingService.TrainingInfoResponse getTrainingInfo() {
OcrTrainingService.TrainingInfoResponse info = ocrTrainingService.getTrainingInfo(); return ocrTrainingService.getTrainingInfo();
Map<String, Object> result = new HashMap<>();
result.put("availableBlocks", info.availableBlocks());
result.put("totalOcrBlocks", info.totalOcrBlocks());
result.put("availableDocuments", info.availableDocuments());
result.put("availableSegBlocks", info.availableSegBlocks());
result.put("ocrServiceAvailable", info.ocrServiceAvailable());
result.put("lastRun", info.lastRun() != null ? info.lastRun() : Map.of());
result.put("runs", info.runs());
result.put("personNames", info.personNames());
return result;
} }
private UUID resolveUserId(Authentication authentication) { private UUID resolveUserId(Authentication authentication) {

12
backend/src/test/java/org/raddatz/familienarchiv/controller/OcrControllerTest.java
View File

@@ -264,6 +264,18 @@ class OcrControllerTest {
.andExpect(jsonPath("$.personNames." + personId).value("Max Mustermann")); .andExpect(jsonPath("$.personNames." + personId).value("Max Mustermann"));
} }
@Test
@WithMockUser(authorities = "ADMIN")
void getTrainingInfo_serializes_null_lastRun_as_json_null() throws Exception {
OcrTrainingService.TrainingInfoResponse info =
new OcrTrainingService.TrainingInfoResponse(0, 0, 0, 0, false, null, List.of(), Map.of());
when(ocrTrainingService.getTrainingInfo()).thenReturn(info);
mockMvc.perform(get("/api/ocr/training-info"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.lastRun").doesNotExist());
}
@Test @Test
@WithMockUser(authorities = "READ_ALL") @WithMockUser(authorities = "READ_ALL")
void getDocumentOcrStatus_returnsNone_whenNoOcrJobExists() throws Exception { void getDocumentOcrStatus_returnsNone_whenNoOcrJobExists() throws Exception {