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

fix(#248): add @Schema(REQUIRED) to TagTreeNodeDTO, improve mergeTags log, add comments
Some checks failed
CI / Unit & Component Tests (pull_request) Failing after 2m42s
Details
CI / Backend Unit Tests (pull_request) Failing after 2m44s
Details
CI / Unit & Component Tests (push) Failing after 2m35s
Details
CI / Backend Unit Tests (push) Failing after 2m44s
Details

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Marcel
2026-04-17 01:01:09 +02:00
parent ba8758c085
commit e6497ebff4
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/org/raddatz/familienarchiv/controller/DocumentController.java
View File

@@ -210,6 +210,8 @@ public class DocumentController {
if (!"ASC".equalsIgnoreCase(dir) && !"DESC".equalsIgnoreCase(dir)) { if (!"ASC".equalsIgnoreCase(dir) && !"DESC".equalsIgnoreCase(dir)) {
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "dir must be ASC or DESC"); throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "dir must be ASC or DESC");
} }
// tagOp is a raw String at the HTTP boundary; any value other than "OR" (case-insensitive)
// defaults to AND, which matches the frontend default and keeps old clients working.
TagOperator operator = "OR".equalsIgnoreCase(tagOp) ? TagOperator.OR : TagOperator.AND; TagOperator operator = "OR".equalsIgnoreCase(tagOp) ? TagOperator.OR : TagOperator.AND;
return ResponseEntity.ok(documentService.searchDocuments(q, from, to, senderId, receiverId, tags, tagQ, status, sort, dir, operator)); return ResponseEntity.ok(documentService.searchDocuments(q, from, to, senderId, receiverId, tags, tagQ, status, sort, dir, operator));
} }

6
backend/src/main/java/org/raddatz/familienarchiv/dto/TagTreeNodeDTO.java
View File

@@ -6,9 +6,9 @@ import java.util.UUID;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
public record TagTreeNodeDTO( public record TagTreeNodeDTO(
UUID id, @Schema(requiredMode = Schema.RequiredMode.REQUIRED) UUID id,
String name, @Schema(requiredMode = Schema.RequiredMode.REQUIRED) String name,
String color, String color,
int documentCount, @Schema(requiredMode = Schema.RequiredMode.REQUIRED) int documentCount,
List<TagTreeNodeDTO> children, List<TagTreeNodeDTO> children,
@Schema(description = "Parent tag ID, null for root tags") UUID parentId) {} @Schema(description = "Parent tag ID, null for root tags") UUID parentId) {}

6
backend/src/main/java/org/raddatz/familienarchiv/service/TagService.java
View File

@@ -79,10 +79,10 @@ public class TagService {
@Transactional @Transactional
public Tag mergeTags(UUID sourceId, UUID targetId) { public Tag mergeTags(UUID sourceId, UUID targetId) {
log.info("Merging tag {} into {}", sourceId, targetId);
validateNotSelf(sourceId, targetId); validateNotSelf(sourceId, targetId);
getById(sourceId); Tag source = getById(sourceId);
Tag target = getById(targetId); Tag target = getById(targetId);
log.info("Merging tag '{}' ({}) into '{}' ({})", source.getName(), sourceId, target.getName(), targetId);
validateNotDescendant(sourceId, targetId); validateNotDescendant(sourceId, targetId);
transferDocuments(sourceId, targetId); transferDocuments(sourceId, targetId);
tagRepository.reparentChildren(sourceId, targetId); tagRepository.reparentChildren(sourceId, targetId);
@@ -145,6 +145,8 @@ public class TagService {
/** /**
* Returns all tags assembled into a tree with document counts per node. * Returns all tags assembled into a tree with document counts per node.
* Uses a single aggregate query to avoid N+1 behaviour. * Uses a single aggregate query to avoid N+1 behaviour.
* NOTE: document counts are global per tag, not scoped to any search filter.
* The tree endpoint is only used for the admin sidebar, so this is intentional.
*/ */
public List<TagTreeNodeDTO> getTagTree() { public List<TagTreeNodeDTO> getTagTree() {
List<Tag> all = tagRepository.findAll(); List<Tag> all = tagRepository.findAll();