feat: added optimisticLock

src/main/java/org/tkit/onecx/announcement/rs/internal/controller/AnnouncementControllerInternal.java

@@ -4,6 +4,7 @@
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.persistence.OptimisticLockException;
 import jakarta.validation.ConstraintViolationException;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.Response;
@@ -89,4 +90,9 @@ public RestResponse<ProblemDetailResponseDTO> constraint(ConstraintViolationExce
         return mapper.constraint(ex);
     }
 
+    @ServerExceptionMapper
+    public RestResponse<ProblemDetailResponseDTO> optimisticLockException(OptimisticLockException ex) {
+        return mapper.optimisticLock(ex);
+    }
+
 }

src/main/java/org/tkit/onecx/announcement/rs/internal/mapper/AnnouncementMapper.java

@@ -4,6 +4,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import jakarta.persistence.OptimisticLockException;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
 import jakarta.validation.Path;
@@ -16,6 +17,7 @@
 import org.tkit.onecx.announcement.domain.criteria.AnnouncementSearchCriteria;
 import org.tkit.onecx.announcement.domain.models.Announcement;
 import org.tkit.quarkus.jpa.daos.PageResult;
+import org.tkit.quarkus.log.cdi.LogService;
 import org.tkit.quarkus.rs.mappers.OffsetDateTimeMapper;
 
 import gen.org.tkit.onecx.announcement.rs.internal.model.*;
@@ -54,7 +56,6 @@ default AnnouncementAppsDTO map(List<String> appIds) {
     @Mapping(target = "creationUser", ignore = true)
     @Mapping(target = "modificationUser", ignore = true)
     @Mapping(target = "controlTraceabilityManual", ignore = true)
-    @Mapping(target = "modificationCount", ignore = true)
     @Mapping(target = "persisted", ignore = true)
     @Mapping(target = "tenantId", ignore = true)
     void update(@MappingTarget Announcement announcement, UpdateAnnouncementRequestDTO dto);
@@ -74,6 +75,12 @@ default RestResponse<ProblemDetailResponseDTO> constraint(ConstraintViolationExc
         return RestResponse.status(Response.Status.BAD_REQUEST, dto);
     }
 
+    @LogService(log = false)
+    default RestResponse<ProblemDetailResponseDTO> optimisticLock(OptimisticLockException ex) {
+        var dto = exception(ErrorKeys.OPTIMISTIC_LOCK.name(), ex.getMessage());
+        return RestResponse.status(Response.Status.BAD_REQUEST, dto);
+    }
+
     default List<ProblemDetailParamDTO> map(Map<String, Object> params) {
         if (params == null) {
             return List.of();
@@ -100,6 +107,7 @@ default String mapPath(Path path) {
     }
 
     enum ErrorKeys {
-        CONSTRAINT_VIOLATIONS
+        CONSTRAINT_VIOLATIONS,
+        OPTIMISTIC_LOCK
     }
 }

src/main/openapi/announcement-openapi-internal.yaml

@@ -211,7 +211,11 @@ components:
       required:
         - title
         - startDate
+        - modificationCount
       properties:
+        modificationCount:
+          format: int32
+          type: integer
         title:
           type: string
         content:

src/test/java/org/tkit/onecx/announcement/rs/internal/AnnouncementControllerInternalTest.java

@@ -171,6 +171,7 @@ void updateAnnouncementTest() {
 
         updateDto.setTitle("test01");
         updateDto.setStartDate(OffsetDateTime.parse("2000-03-10T12:15:50-04:00"));
+        updateDto.setModificationCount(0);
 
         given()
                 .contentType(APPLICATION_JSON)
@@ -196,6 +197,14 @@ void updateAnnouncementTest() {
                 .extract()
                 .body().as(AnnouncementDTO.class);
 
+        // update theme with wrong modificationCount
+        given()
+                .contentType(APPLICATION_JSON)
+                .body(updateDto)
+                .when()
+                .put("a1")
+                .then().statusCode(BAD_REQUEST.getStatusCode());
+
         assertThat(dto).isNotNull();
         assertThat(dto.getTitle()).isEqualTo(updateDto.getTitle());
         assertThat(dto.getStartDate()).isEqualTo(updateDto.getStartDate());