EPMRPP-87271 updated commons dao (fix filtering by date) (#1855)

* EPMRPP-87271 updated commons dao (fix filtering by date)
reportportal · Nov 13, 2023 · 485e2a2 · 485e2a2
1 parent 4bd4dcd
commit 485e2a2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -84,9 +84,9 @@ dependencies {
         compile 'com.epam.reportportal:plugin-api'
     } else {
         compile 'com.github.reportportal:commons-events:e337f8b7be'
-        compile 'com.github.reportportal:commons-dao:d8b020fe'
+        compile 'com.github.reportportal:commons-dao:6627cb0'
         compile 'com.github.reportportal:commons-rules:8a83e18'
-        compile 'com.github.reportportal:commons-model:bf40974'
+        compile 'com.github.reportportal:commons-model:508b9ef'
         compile 'com.github.reportportal:commons:ce2166b'
         compile 'com.github.reportportal:commons-fonts:d6e62dd'
         compile 'com.github.reportportal:plugin-api:bc96df2'
@@ -152,6 +152,12 @@ dependencies {
     // Metrics
     compile 'io.micrometer:micrometer-registry-prometheus:1.7.10'
 
+    // add lombok support
+    compileOnly "org.projectlombok:lombok:${lombokVersion}"
+    annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+    testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
+    testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+
     //  Tests
     testCompile 'org.springframework.boot:spring-boot-starter-test'
     testCompile 'org.flywaydb.flyway-test-extensions:flyway-spring-test:7.0.0'

diff --git a/gradle.properties b/gradle.properties
@@ -12,3 +12,4 @@ dockerJavaOptsDev=-DLOG_FILE=app.log \
                   -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
 dockerServerUrl=unix:///var/run/docker.sock
 org.gradle.jvmargs=-Xmx2048m
+lombokVersion=1.18.30
diff --git a/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ActivityEventConverter.java b/src/main/java/com/epam/ta/reportportal/ws/converter/converters/ActivityEventConverter.java
@@ -19,6 +19,7 @@
 import com.epam.ta.reportportal.commons.EntityUtils;
 import com.epam.ta.reportportal.entity.activity.Activity;
 import com.epam.ta.reportportal.ws.model.ActivityEventResource;
+import java.util.Objects;
 import java.util.function.Function;
 
 /**
@@ -43,6 +44,7 @@ private ActivityEventConverter() {
           .projectName(activity.getProjectName())
           .subjectName(activity.getSubjectName())
           .subjectType(activity.getSubjectType().getValue())
+          .subjectId(Objects.toString(activity.getSubjectId(), null))
           .details(activity.getDetails())
           .build();