Merge pull request #36 from OpenElementsLabs/feat/106-spring-services-0.16-upgrade

Upgrade to spring-services 0.16.0 (#33)

Author: hendrikebbers

backend/pom.xml

@@ -102,7 +102,7 @@
         <dependency>
             <groupId>com.open-elements</groupId>
             <artifactId>spring-services</artifactId>
-            <version>0.15.0</version>
+            <version>0.16.0</version>
         </dependency>
 
         <!-- HEIC decoding via libheif. Multi-Release JAR — activates under JDK 21+. -->

backend/src/main/java/com/openelements/crm/company/CompanyDto.java

@@ -1,5 +1,6 @@
 package com.openelements.crm.company;
 
+import com.openelements.spring.base.data.NameSupplier;
 import com.openelements.spring.base.data.WithId;
 import io.swagger.v3.oas.annotations.media.Schema;
 
@@ -33,4 +34,14 @@ public record CompanyDto(
     @Schema(description = "Last update timestamp", requiredMode = Schema.RequiredMode.REQUIRED) Instant updatedAt
 ) implements WithId {
 
+    /**
+     * Display name used by the spring-services audit log ({@code @NameSupplier}).
+     * Returns the company name, or an empty string if absent.
+     *
+     * @return the audit-log display name
+     */
+    @NameSupplier
+    public String displayName() {
+        return name == null ? "" : name;
+    }
 }

backend/src/main/java/com/openelements/crm/company/CompanyService.java

@@ -257,6 +257,13 @@ private void recordCommentAudit(final UUID companyId, final AuditAction action)
         final AuditLogEntity entry = new AuditLogEntity();
         entry.setEntityType(COMMENT_ENTITY_TYPE);
         entry.setEntityId(companyId);
+        // spring-services 0.16 makes AuditLogEntity.name NOT NULL. This is a
+        // hand-rolled audit row (not the library's @NameSupplier path), so set
+        // a meaningful name ourselves: the owning company's name.
+        entry.setName(companyRepository.findById(companyId)
+            .map(CompanyEntity::getName)
+            .filter(n -> n != null && !n.isBlank())
+            .orElse("UNKNOWN"));
         entry.setAction(action);
         entry.setUser(userService.getCurrentUserEntity());
         auditLogRepository.save(entry);

backend/src/main/java/com/openelements/crm/contact/ContactController.java

@@ -189,7 +189,7 @@ public void delete(@Parameter(description = "The contact ID") @PathVariable fina
     @ApiResponse(responseCode = "400", description = "Invalid file format or size")
     @ApiResponse(responseCode = "404", description = "Contact not found")
     public void uploadPhoto(@Parameter(description = "The contact ID") @PathVariable final UUID id,
-                            @Parameter(description = "The photo image file (JPEG, PNG, WebP, or HEIC; max 2 MB)") @RequestParam("file") final MultipartFile file) {
+                            @Parameter(description = "The photo image file (JPEG, PNG, WebP, or HEIC; max 20 MB)") @RequestParam("file") final MultipartFile file) {
         try {
             contactService.uploadPhoto(id, file.getBytes(), file.getContentType());
         } catch (final java.io.IOException e) {

backend/src/main/java/com/openelements/crm/contact/ContactDto.java

@@ -1,5 +1,6 @@
 package com.openelements.crm.contact;
 
+import com.openelements.spring.base.data.NameSupplier;
 import com.openelements.spring.base.data.WithId;
 import io.swagger.v3.oas.annotations.media.Schema;
 
@@ -33,4 +34,17 @@ public record ContactDto(
     @Schema(description = "Last update timestamp", requiredMode = Schema.RequiredMode.REQUIRED) Instant updatedAt
 ) implements WithId {
 
+    /**
+     * Display name used by the spring-services audit log ({@code @NameSupplier}).
+     * Returns {@code "firstName lastName"} (trimmed); the title is intentionally
+     * not included.
+     *
+     * @return the audit-log display name
+     */
+    @NameSupplier
+    public String displayName() {
+        final String f = firstName == null ? "" : firstName;
+        final String l = lastName == null ? "" : lastName;
+        return (f + " " + l).trim();
+    }
 }