Activity feed implementation

config/checkstyle/checkstyle.xml

@@ -181,11 +181,6 @@
             <message key="name.invalidPattern"
                      value="Type name ''{0}'' must match pattern ''{1}''."/>
         </module>
-        <module name="MemberName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Member name ''{0}'' must match pattern ''{1}''."/>
-        </module>
         <module name="ParameterName">
             <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
             <message key="name.invalidPattern"
@@ -255,14 +250,6 @@
             <property name="lineWrappingIndentation" value="4"/>
             <property name="arrayInitIndent" value="4"/>
         </module>
-        <module name="AbbreviationAsWordInName">
-            <property name="ignoreFinal" value="false"/>
-            <property name="allowedAbbreviationLength" value="5"/>
-            <property name="tokens"
-                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
-                    PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
-                    RECORD_COMPONENT_DEF"/>
-        </module>
         <!--    <module name="NoWhitespaceBeforeCaseDefaultColon"/>--> <!-- java-->
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>

gradle/libs.versions.toml

@@ -38,6 +38,7 @@ spring-security = { module = 'org.springframework.boot:spring-boot-starter-secur
 spring-thymeleaf = { module = 'org.springframework.boot:spring-boot-starter-thymeleaf' }
 spring-oauth2-client = { module = 'org.springframework.boot:spring-boot-starter-oauth2-client' }
 spring-oauth2-rs = { module = 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' }
+spring-aop = { module = 'org.springframework.boot:spring-boot-starter-aop' }
 spring-session = { module = 'org.springframework.session:spring-session-core' }
 spring-ldap = { module = 'org.springframework.boot:spring-boot-starter-data-ldap' }
 spring-security-ldap = { module = 'org.springframework.security:spring-security-ldap' }
@@ -96,7 +97,8 @@ spring = [
     'spring-ldap',
     'spring-security-ldap',
     'spring-r2dbc',
-    'reactor-extra'
+    'reactor-extra',
+    'spring-aop'
 ]
 spring-redis-session = [
     'spring-data-session-redis',

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/config/ODDPlatformConfiguration.java

@@ -4,12 +4,14 @@
 import org.opendatadiscovery.oddplatform.notification.NotificationsProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
 @EnableTransactionManagement
 @EnableWebFluxSecurity
+@EnableAspectJAutoProxy
 @EnableConfigurationProperties({MetricExporterProperties.class, NotificationsProperties.class})
 public class ODDPlatformConfiguration {
 }

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/controller/ActivityController.java

@@ -0,0 +1,58 @@
+package org.opendatadiscovery.oddplatform.controller;
+
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.opendatadiscovery.oddplatform.api.contract.api.ActivityApi;
+import org.opendatadiscovery.oddplatform.api.contract.model.Activity;
+import org.opendatadiscovery.oddplatform.api.contract.model.ActivityCountInfo;
+import org.opendatadiscovery.oddplatform.api.contract.model.ActivityEventType;
+import org.opendatadiscovery.oddplatform.api.contract.model.ActivityType;
+import org.opendatadiscovery.oddplatform.service.activity.ActivityService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@RestController
+@RequiredArgsConstructor
+public class ActivityController implements ActivityApi {
+    private final ActivityService activityService;
+
+    @Override
+    public Mono<ResponseEntity<Flux<Activity>>> getActivity(final LocalDate beginDate,
+                                                            final LocalDate endDate,
+                                                            final Integer size,
+                                                            final Long datasourceId,
+                                                            final Long namespaceId,
+                                                            final List<Long> tagIds,
+                                                            final List<Long> ownerIds,
+                                                            final List<Long> userIds,
+                                                            final ActivityType type,
+                                                            final ActivityEventType eventType,
+                                                            final Long lasEventId,
+                                                            final OffsetDateTime lastEventDateTime,
+                                                            final ServerWebExchange exchange) {
+        return Mono.just(
+                activityService.getActivityList(beginDate, endDate, size, datasourceId, namespaceId, tagIds, ownerIds,
+                    userIds, type, eventType, lasEventId, lastEventDateTime))
+            .map(ResponseEntity::ok);
+    }
+
+    @Override
+    public Mono<ResponseEntity<ActivityCountInfo>> getActivityCounts(final LocalDate beginDate,
+                                                                     final LocalDate endDate,
+                                                                     final Long datasourceId,
+                                                                     final Long namespaceId,
+                                                                     final List<Long> tagIds,
+                                                                     final List<Long> ownerIds,
+                                                                     final List<Long> userIds,
+                                                                     final ActivityEventType eventType,
+                                                                     final ServerWebExchange exchange) {
+        return activityService.getActivityCounts(beginDate, endDate, datasourceId, namespaceId,
+                tagIds, ownerIds, userIds, eventType)
+            .map(ResponseEntity::ok);
+    }
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/controller/DataEntityController.java

@@ -1,8 +1,13 @@
 package org.opendatadiscovery.oddplatform.controller;
 
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.List;
 import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.opendatadiscovery.oddplatform.api.contract.api.DataEntityApi;
+import org.opendatadiscovery.oddplatform.api.contract.model.Activity;
+import org.opendatadiscovery.oddplatform.api.contract.model.ActivityEventType;
 import org.opendatadiscovery.oddplatform.api.contract.model.AlertList;
 import org.opendatadiscovery.oddplatform.api.contract.model.DataEntity;
 import org.opendatadiscovery.oddplatform.api.contract.model.DataEntityClassAndTypeDictionary;
@@ -33,6 +38,7 @@
 import org.opendatadiscovery.oddplatform.service.DataEntityService;
 import org.opendatadiscovery.oddplatform.service.LineageService;
 import org.opendatadiscovery.oddplatform.service.OwnershipService;
+import org.opendatadiscovery.oddplatform.service.activity.ActivityService;
 import org.opendatadiscovery.oddplatform.service.term.TermService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
@@ -51,17 +57,20 @@ public class DataEntityController
     private final AlertService alertService;
     private final TermService termService;
     private final LineageService lineageService;
+    private final ActivityService activityService;
 
     public DataEntityController(final DataEntityService entityService,
                                 final OwnershipService ownershipService,
                                 final AlertService alertService,
                                 final TermService termService,
-                                final LineageService lineageService) {
+                                final LineageService lineageService,
+                                final ActivityService activityService) {
         super(entityService);
         this.ownershipService = ownershipService;
         this.alertService = alertService;
         this.termService = termService;
         this.lineageService = lineageService;
+        this.activityService = activityService;
     }
 
     @Override
@@ -329,4 +338,20 @@ public Mono<ResponseEntity<Void>> deleteDataEntityFromDataEntityGroup(final Long
             .ignoreElements()
             .thenReturn(ResponseEntity.noContent().build());
     }
+
+    @Override
+    public Mono<ResponseEntity<Flux<Activity>>> getDataEntityActivity(final Long dataEntityId,
+                                                                      final LocalDate beginDate,
+                                                                      final LocalDate endDate,
+                                                                      final Integer size,
+                                                                      final List<Long> userIds,
+                                                                      final ActivityEventType eventType,
+                                                                      final Long lastEventId,
+                                                                      final OffsetDateTime lastEventDateTime,
+                                                                      final ServerWebExchange exchange) {
+        return Mono.just(
+            activityService.getDataEntityActivityList(beginDate, endDate, size, dataEntityId, userIds, eventType,
+                lastEventId, lastEventDateTime)
+        ).map(ResponseEntity::ok);
+    }
 }

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/controller/OwnerController.java

@@ -1,5 +1,6 @@
 package org.opendatadiscovery.oddplatform.controller;
 
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.opendatadiscovery.oddplatform.api.contract.api.OwnerApi;
 import org.opendatadiscovery.oddplatform.api.contract.model.Owner;
@@ -29,8 +30,9 @@ public Mono<ResponseEntity<Owner>> createOwner(final Mono<OwnerFormData> ownerFo
     public Mono<ResponseEntity<OwnerList>> getOwnerList(final Integer page,
                                                         final Integer size,
                                                         final String query,
+                                                        final List<Long> ids,
                                                         final ServerWebExchange exchange) {
-        return ownerService.list(page, size, query)
+        return ownerService.list(page, size, query, ids)
             .map(ResponseEntity::ok);
     }
 

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/controller/TagController.java

@@ -1,5 +1,6 @@
 package org.opendatadiscovery.oddplatform.controller;
 
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.opendatadiscovery.oddplatform.api.contract.api.TagApi;
 import org.opendatadiscovery.oddplatform.api.contract.model.Tag;
@@ -36,8 +37,9 @@ public Mono<ResponseEntity<Void>> deleteTag(final Long tagId, final ServerWebExc
     public Mono<ResponseEntity<TagsResponse>> getPopularTagList(final Integer page,
                                                                 final Integer size,
                                                                 final String query,
+                                                                final List<Long> ids,
                                                                 final ServerWebExchange exchange) {
-        return tagService.listMostPopular(query, page, size)
+        return tagService.listMostPopular(query, ids, page, size)
             .map(ResponseEntity::ok);
     }
 

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/ActivityContextInfo.java

@@ -0,0 +1,11 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class ActivityContextInfo {
+    private final Long dataEntityId;
+    private final String oldState;
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/ActivityCreateEvent.java

@@ -0,0 +1,14 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class ActivityCreateEvent {
+    private long dataEntityId;
+    private ActivityEventTypeDto eventType;
+    private String oldState;
+    private String newState;
+    private boolean systemEvent;
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/ActivityDto.java

@@ -0,0 +1,8 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+import org.opendatadiscovery.oddplatform.model.tables.pojos.ActivityPojo;
+import org.opendatadiscovery.oddplatform.model.tables.pojos.DataEntityPojo;
+import org.opendatadiscovery.oddplatform.model.tables.pojos.OwnerPojo;
+
+public record ActivityDto(ActivityPojo activity, OwnerPojo user, DataEntityPojo dataEntity) {
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/ActivityEventTypeDto.java

@@ -0,0 +1,26 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+public enum ActivityEventTypeDto {
+    OWNERSHIP_CREATED,
+    OWNERSHIP_UPDATED,
+    OWNERSHIP_DELETED,
+    TAGS_ASSOCIATION_UPDATED,
+    DATA_ENTITY_CREATED,
+    DATA_ENTITY_OVERVIEW_UPDATED,
+    DATA_ENTITY_METADATA_UPDATED,
+    DATA_ENTITY_SCHEMA_UPDATED,
+    DATA_ENTITY_RELATION_UPDATED,
+    TERM_ASSIGNED,
+    TERM_ASSIGNMENT_DELETED,
+    DESCRIPTION_UPDATED,
+    BUSINESS_NAME_UPDATED,
+    CUSTOM_METADATA_CREATED,
+    CUSTOM_METADATA_UPDATED,
+    CUSTOM_METADATA_DELETED,
+    DATASET_FIELD_VALUES_UPDATED,
+    DATASET_FIELD_DESCRIPTION_UPDATED,
+    DATASET_FIELD_LABELS_UPDATED,
+    CUSTOM_GROUP_CREATED,
+    CUSTOM_GROUP_UPDATED,
+    CUSTOM_GROUP_DELETED;
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/BusinessNameActivityStateDto.java

@@ -0,0 +1,6 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public record BusinessNameActivityStateDto(@JsonProperty("internal_name") String internalName) {
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/CustomGroupActivityStateDto.java

@@ -0,0 +1,11 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+public record CustomGroupActivityStateDto(Long id, String name,
+                                          @JsonProperty("entity_classes") List<Integer> entityClasses,
+                                          @JsonProperty("type_id") Integer typeId,
+                                          @JsonProperty("namespace_name") String namespaceName,
+                                          List<CustomGroupEntityActivityStateDto> entities) {
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/CustomGroupEntityActivityStateDto.java

@@ -0,0 +1,10 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+public record CustomGroupEntityActivityStateDto(Long id,
+                                                @JsonProperty("internal_name") String internalName,
+                                                @JsonProperty("external_name") String externalName,
+                                                @JsonProperty("entity_classes") List<Integer> entityClasses) {
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/DataEntityCreatedActivityStateDto.java

@@ -0,0 +1,11 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+public record DataEntityCreatedActivityStateDto(Long id,
+                                                @JsonProperty("external_name") String externalName,
+                                                String oddrn,
+                                                List<Integer> classes,
+                                                @JsonProperty("type_id") Integer typeId) {
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/DatasetFieldEnumValuesActivityStateDto.java

@@ -0,0 +1,4 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+public record DatasetFieldEnumValuesActivityStateDto(Long id, String name) {
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/DatasetFieldInformationActivityStateDto.java

@@ -0,0 +1,8 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+import java.util.List;
+import org.jooq.JSONB;
+
+public record DatasetFieldInformationActivityStateDto(Long id, String name, JSONB type, String description,
+                                                      List<DatasetFieldLabelActivityStateDto> labels) {
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/DatasetFieldLabelActivityStateDto.java

@@ -0,0 +1,4 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+public record DatasetFieldLabelActivityStateDto(Long id, String name) {
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/DatasetFieldValuesActivityStateDto.java

@@ -0,0 +1,13 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import org.jooq.JSONB;
+
+public record DatasetFieldValuesActivityStateDto(
+    Long id,
+    String name,
+    JSONB type,
+    String description,
+    @JsonProperty("enum_values") List<DatasetFieldEnumValuesActivityStateDto> enumValues) {
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/DescriptionActivityStateDto.java

@@ -0,0 +1,4 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+public record DescriptionActivityStateDto(String description) {
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/OwnershipActivityStateDto.java

@@ -0,0 +1,7 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public record OwnershipActivityStateDto(@JsonProperty("owner_name") String ownerName,
+                                        @JsonProperty("role_name") String roleName) {
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/TagActivityStateDto.java

@@ -0,0 +1,4 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+public record TagActivityStateDto(Long id, String name, Boolean important) {
+}

odd-platform-api/src/main/java/org/opendatadiscovery/oddplatform/dto/activity/TermActivityStateDto.java

@@ -0,0 +1,6 @@
+package org.opendatadiscovery.oddplatform.dto.activity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public record TermActivityStateDto(@JsonProperty("term_id") Long termId, String term, String namespace) {
+}