-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* AAE-28084 remove blank line * AAE-28084 add date time formats * AAE-28084 add equality to range filters * AAE-28084 fix swagger * AAE-29492 add date filters with tests * AAE-29492 rename controller method * AAE-29492 fix date formatter in test * AAE-29492 add license headers * AAE-29492 sonarcloud issues
- Loading branch information
Showing
12 changed files
with
373 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
...es-audit-api/src/main/java/org/activiti/cloud/services/audit/api/search/SearchParams.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /* | ||
| * Copyright 2017-2020 Alfresco Software, Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.activiti.cloud.services.audit.api.search; | ||
|
|
||
| import java.util.Date; | ||
|
|
||
| public record SearchParams(String search, Date eventTimeFrom, Date eventTimeTo) {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
...udit-rest/src/test/java/org/activiti/cloud/services/audit/jpa/AuditTestConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /* | ||
| * Copyright 2017-2020 Alfresco Software, Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.activiti.cloud.services.audit.jpa; | ||
|
|
||
| import org.activiti.cloud.services.audit.jpa.util.TestConverter; | ||
| import org.springframework.context.annotation.Bean; | ||
|
|
||
| public class AuditTestConfiguration { | ||
|
|
||
| @Bean | ||
| public TestConverter getTestConverter() { | ||
| return new TestConverter(); | ||
| } | ||
| } |
134 changes: 134 additions & 0 deletions
134
...est/java/org/activiti/cloud/services/audit/jpa/controller/AuditEventsControllerImpIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| /* | ||
| * Copyright 2017-2020 Alfresco Software, Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.activiti.cloud.services.audit.jpa.controller; | ||
|
|
||
| import static io.restassured.module.mockmvc.RestAssuredMockMvc.given; | ||
| import static io.restassured.module.mockmvc.RestAssuredMockMvc.webAppContextSetup; | ||
| import static org.hamcrest.Matchers.contains; | ||
| import static org.hamcrest.Matchers.hasSize; | ||
|
|
||
| import java.time.Instant; | ||
| import java.time.ZoneOffset; | ||
| import java.time.format.DateTimeFormatter; | ||
| import java.util.List; | ||
| import org.activiti.api.runtime.shared.security.SecurityManager; | ||
| import org.activiti.cloud.alfresco.config.AlfrescoWebAutoConfiguration; | ||
| import org.activiti.cloud.services.audit.jpa.AuditTestConfiguration; | ||
| import org.activiti.cloud.services.audit.jpa.events.ActivityCompletedAuditEventEntity; | ||
| import org.activiti.cloud.services.audit.jpa.events.ActivityStartedAuditEventEntity; | ||
| import org.activiti.cloud.services.audit.jpa.events.AuditEventEntity; | ||
| import org.activiti.cloud.services.audit.jpa.events.ProcessStartedAuditEventEntity; | ||
| import org.activiti.cloud.services.audit.jpa.repository.EventsRepository; | ||
| import org.activiti.cloud.services.audit.jpa.util.TestConverter; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.boot.test.context.SpringBootTest; | ||
| import org.springframework.boot.test.mock.mockito.MockBean; | ||
| import org.springframework.context.annotation.Import; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.security.core.userdetails.UserDetailsService; | ||
| import org.springframework.web.context.WebApplicationContext; | ||
|
|
||
| @SpringBootTest(properties = { "spring.main.banner-mode=off" }) | ||
| @Import({ AlfrescoWebAutoConfiguration.class, AuditTestConfiguration.class }) | ||
| class AuditEventsControllerImpIT { | ||
|
|
||
| @Autowired | ||
| private EventsRepository<AuditEventEntity> eventsRepository; | ||
|
|
||
| @Autowired | ||
| private WebApplicationContext context; | ||
|
|
||
| @MockBean | ||
| private UserDetailsService userDetailsService; | ||
|
|
||
| @MockBean | ||
| private SecurityManager securityManager; | ||
|
|
||
| private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter | ||
| .ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") | ||
| .withZone(ZoneOffset.UTC); | ||
|
|
||
| private static final String ENTRIES_ROOT = "_embedded.events"; | ||
| private static final String EVENTS_ID_ROOT = ENTRIES_ROOT + ".id"; | ||
|
|
||
| @BeforeEach | ||
| void setUp() { | ||
| webAppContextSetup(context); | ||
| } | ||
|
|
||
| @AfterEach | ||
| void cleanUp() { | ||
| eventsRepository.deleteAll(); | ||
| } | ||
|
|
||
| @Test | ||
| void should_returnAuditEvents_filteredByEventTimeFrom() { | ||
| AuditEventEntity audit1 = new ProcessStartedAuditEventEntity(); | ||
| audit1.setTimestamp(1000L); | ||
| audit1.setEventType(TestConverter.EVENT_TYPE); | ||
|
|
||
| AuditEventEntity audit2 = new ActivityStartedAuditEventEntity(); | ||
| audit2.setTimestamp(2000L); | ||
| audit2.setEventType(TestConverter.EVENT_TYPE); | ||
|
|
||
| AuditEventEntity audit3 = new ActivityCompletedAuditEventEntity(); | ||
| audit3.setTimestamp(3000L); | ||
| audit3.setEventType(TestConverter.EVENT_TYPE); | ||
|
|
||
| eventsRepository.saveAll(List.of(audit1, audit2, audit3)); | ||
|
|
||
| given() | ||
| .contentType(MediaType.APPLICATION_JSON_VALUE) | ||
| .param("eventTimeFrom", dateTimeFormatter.format(Instant.ofEpochMilli(2000L).atZone(ZoneOffset.UTC))) | ||
| .when() | ||
| .get("/v1/events") | ||
| .then() | ||
| .statusCode(200) | ||
| .body(ENTRIES_ROOT, hasSize(2)) | ||
| .body(EVENTS_ID_ROOT, contains(audit2.getId().toString(), audit3.getId().toString())); | ||
| eventsRepository.deleteAll(); | ||
| } | ||
|
|
||
| @Test | ||
| void should_returnAuditEvents_filteredByEventTimeTo() { | ||
| AuditEventEntity audit1 = new ProcessStartedAuditEventEntity(); | ||
| audit1.setTimestamp(1000L); | ||
| audit1.setEventType(TestConverter.EVENT_TYPE); | ||
|
|
||
| AuditEventEntity audit2 = new ActivityStartedAuditEventEntity(); | ||
| audit2.setTimestamp(2000L); | ||
| audit2.setEventType(TestConverter.EVENT_TYPE); | ||
|
|
||
| AuditEventEntity audit3 = new ActivityCompletedAuditEventEntity(); | ||
| audit3.setTimestamp(3000L); | ||
| audit3.setEventType(TestConverter.EVENT_TYPE); | ||
|
|
||
| eventsRepository.saveAll(List.of(audit1, audit2, audit3)); | ||
|
|
||
| given() | ||
| .contentType(MediaType.APPLICATION_JSON_VALUE) | ||
| .param("eventTimeTo", dateTimeFormatter.format(Instant.ofEpochMilli(2000L).atZone(ZoneOffset.UTC))) | ||
| .when() | ||
| .get("/v1/events") | ||
| .then() | ||
| .statusCode(200) | ||
| .body(ENTRIES_ROOT, hasSize(2)) | ||
| .body(EVENTS_ID_ROOT, contains(audit1.getId().toString(), audit2.getId().toString())); | ||
| } | ||
| } |
Oops, something went wrong.