feat: Activity grouping

backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/ProjectActivityController.kt

@@ -9,9 +9,14 @@ import io.swagger.v3.oas.annotations.Parameter
 import io.swagger.v3.oas.annotations.media.ExampleObject
 import io.swagger.v3.oas.annotations.tags.Tag
 import io.tolgee.activity.ActivityService
+import io.tolgee.activity.groups.ActivityGroupService
 import io.tolgee.configuration.tolgee.TolgeeProperties
 import io.tolgee.constants.Feature
+import io.tolgee.dtos.queryResults.ActivityGroupView
+import io.tolgee.dtos.request.ActivityGroupFilters
 import io.tolgee.exceptions.NotFoundException
+import io.tolgee.hateoas.activity.ActivityGroupModel
+import io.tolgee.hateoas.activity.ActivityGroupModelAssembler
 import io.tolgee.hateoas.activity.ModifiedEntityModel
 import io.tolgee.hateoas.activity.ModifiedEntityModelAssembler
 import io.tolgee.hateoas.activity.ProjectActivityModel
@@ -28,6 +33,7 @@ import io.tolgee.service.project.ProjectFeatureGuard
 import org.springdoc.core.annotations.ParameterObject
 import org.springframework.data.domain.Pageable
 import org.springframework.data.web.PagedResourcesAssembler
+import org.springframework.hateoas.MediaTypes
 import org.springframework.hateoas.PagedModel
 import org.springframework.web.bind.annotation.CrossOrigin
 import org.springframework.web.bind.annotation.GetMapping
@@ -49,6 +55,9 @@ class ProjectActivityController(
   private val modificationResourcesAssembler: PagedResourcesAssembler<ModifiedEntityView>,
   private val projectActivityModelAssembler: ProjectActivityModelAssembler,
   private val modifiedEntityModelAssembler: ModifiedEntityModelAssembler,
+  private val activityGroupService: ActivityGroupService,
+  private val groupPagedResourcesAssembler: PagedResourcesAssembler<ActivityGroupView>,
+  private val groupModelAssembler: ActivityGroupModelAssembler,
   private val branchService: BranchService,
   private val projectFeatureGuard: ProjectFeatureGuard,
   private val rateLimitService: RateLimitService,
@@ -123,4 +132,31 @@ class ProjectActivityController(
       )
     return modificationResourcesAssembler.toModel(page, modifiedEntityModelAssembler)
   }
+
+  @Operation(
+    summary = "Get project activity groups",
+    description = "This endpoints returns the activity grouped by time windows so it's easier to read on the frontend.",
+  )
+  @GetMapping("/groups", produces = [MediaTypes.HAL_JSON_VALUE])
+  @RequiresProjectPermissions([Scope.ACTIVITY_VIEW])
+  @AllowApiAccess
+  fun getActivityGroups(
+    @ParameterObject pageable: Pageable,
+    @ParameterObject activityGroupFilters: ActivityGroupFilters,
+    @RequestParam(required = false) branch: String? = null,
+  ): PagedModel<ActivityGroupModel> {
+    projectFeatureGuard.checkIfUsed(Feature.BRANCHING, branch)
+    val activeBranch = branchService.getActiveNonDefaultBranch(projectHolder.project.id, branch)
+    val defaultBranchId =
+      if (activeBranch == null) branchService.getDefaultBranch(projectHolder.project.id)?.id else null
+    val views =
+      activityGroupService.getProjectActivityGroups(
+        projectId = projectHolder.project.id,
+        pageable,
+        activityGroupFilters,
+        branchId = activeBranch?.id,
+        defaultBranchId = defaultBranchId,
+      )
+    return groupPagedResourcesAssembler.toModel(views, groupModelAssembler)
+  }
 }

backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/ProjectActivityGroupItemsController.kt

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2020. Tolgee
+ */
+
+package io.tolgee.api.v2.controllers
+
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.tolgee.activity.groups.ActivityGroupService
+import io.tolgee.activity.groups.viewProviders.createKey.CreateKeyGroupItemModel
+import io.tolgee.activity.groups.viewProviders.createKey.CreateKeyGroupModelProvider
+import io.tolgee.activity.groups.viewProviders.generic.GenericGroupItemModel
+import io.tolgee.activity.groups.viewProviders.generic.GenericGroupModelProvider
+import io.tolgee.model.enums.Scope
+import io.tolgee.security.ProjectHolder
+import io.tolgee.security.authentication.AllowApiAccess
+import io.tolgee.security.authorization.RequiresProjectPermissions
+import org.springdoc.core.annotations.ParameterObject
+import org.springframework.data.domain.Pageable
+import org.springframework.hateoas.MediaTypes
+import org.springframework.hateoas.PagedModel
+import org.springframework.hateoas.PagedModel.PageMetadata
+import org.springframework.web.bind.annotation.CrossOrigin
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+@Suppress("MVCPathVariableInspection")
+@RestController
+@CrossOrigin(origins = ["*"])
+@RequestMapping(value = ["/v2/projects/{projectId}/activity/group-items", "/v2/projects/activity/group-items"])
+@Tag(name = "Activity Groups")
+class ProjectActivityGroupItemsController(
+  private val createKeyGroupModelProvider: CreateKeyGroupModelProvider,
+  private val genericGroupModelProvider: GenericGroupModelProvider,
+  private val activityGroupService: ActivityGroupService,
+  private val projectHolder: ProjectHolder,
+) {
+  @Operation(
+    summary = "Get CREATE_KEY group items",
+  )
+  @GetMapping("/create-key/{groupId}", produces = [MediaTypes.HAL_JSON_VALUE])
+  @RequiresProjectPermissions([Scope.ACTIVITY_VIEW])
+  @AllowApiAccess
+  fun getCreateKeyItems(
+    @ParameterObject pageable: Pageable,
+    @PathVariable groupId: Long,
+  ): PagedModel<CreateKeyGroupItemModel> {
+    val data = createKeyGroupModelProvider.provideItems(groupId, pageable)
+    return PagedModel.of(
+      data.content,
+      PageMetadata(data.pageable.pageSize.toLong(), data.pageable.pageNumber.toLong(), data.totalElements),
+    )
+  }
+
+  @Operation(
+    summary = "Get group items",
+    description = "Returns the modified entities of the group as generic items (any group type).",
+  )
+  @GetMapping("/generic/{groupId}", produces = [MediaTypes.HAL_JSON_VALUE])
+  @RequiresProjectPermissions([Scope.ACTIVITY_VIEW])
+  @AllowApiAccess
+  fun getGenericItems(
+    @ParameterObject pageable: Pageable,
+    @PathVariable groupId: Long,
+  ): PagedModel<GenericGroupItemModel> {
+    val group = activityGroupService.getGroupInProject(groupId, projectHolder.project.id)
+    val data = genericGroupModelProvider.provideItems(group.type, groupId, pageable)
+    return PagedModel.of(
+      data.content,
+      PageMetadata(data.pageable.pageSize.toLong(), data.pageable.pageNumber.toLong(), data.totalElements),
+    )
+  }
+}

backend/api/src/main/kotlin/io/tolgee/hateoas/activity/ActivityGroupModel.kt

@@ -0,0 +1,23 @@
+package io.tolgee.hateoas.activity
+
+import io.tolgee.activity.data.ActivityOrigin
+import io.tolgee.activity.data.ActivityType
+import io.tolgee.activity.groups.ActivityGroupType
+import io.tolgee.hateoas.userAccount.SimpleUserAccountModel
+import org.springframework.hateoas.RepresentationModel
+import org.springframework.hateoas.server.core.Relation
+import java.io.Serializable
+
+@Suppress("unused")
+@Relation(collectionRelation = "groups", itemRelation = "group")
+class ActivityGroupModel(
+  val id: Long,
+  val timestamp: Long,
+  val type: ActivityGroupType,
+  val author: SimpleUserAccountModel?,
+  val data: Any?,
+  var mentionedLanguageIds: List<Long>,
+  val sourceActivityTypes: List<ActivityType>,
+  val origins: List<ActivityOrigin>,
+) : RepresentationModel<ActivityGroupModel>(),
+  Serializable

backend/api/src/main/kotlin/io/tolgee/hateoas/activity/ActivityGroupModelAssembler.kt

@@ -0,0 +1,35 @@
+package io.tolgee.hateoas.activity
+
+import io.tolgee.activity.data.ActivityOrigin
+import io.tolgee.activity.data.ActivityType
+import io.tolgee.dtos.queryResults.ActivityGroupView
+import io.tolgee.hateoas.userAccount.SimpleUserAccountModelAssembler
+import org.springframework.hateoas.server.RepresentationModelAssembler
+import org.springframework.stereotype.Component
+
+@Component
+class ActivityGroupModelAssembler(
+  private val simpleUserAccountModelAssembler: SimpleUserAccountModelAssembler,
+) : RepresentationModelAssembler<ActivityGroupView, ActivityGroupModel> {
+  override fun toModel(view: ActivityGroupView): ActivityGroupModel {
+    return ActivityGroupModel(
+      id = view.id,
+      timestamp = view.timestamp.time,
+      type = view.type,
+      author =
+        simpleUserAccountModelAssembler.toModel(
+          view.author,
+        ),
+      data = view.data,
+      mentionedLanguageIds = view.mentionedLanguageIds,
+      sourceActivityTypes =
+        view.sourceActivityTypes.mapNotNull { type ->
+          ActivityType.entries.find { it.name == type }
+        },
+      origins =
+        view.origins.mapNotNull { origin ->
+          ActivityOrigin.entries.find { it.name == origin }
+        },
+    )
+  }
+}

backend/api/src/main/kotlin/io/tolgee/hateoas/key/KeyModel.kt

@@ -1,6 +1,7 @@
 package io.tolgee.hateoas.key
 
 import io.swagger.v3.oas.annotations.media.Schema
+import io.tolgee.api.IKeyModel
 import org.springframework.hateoas.RepresentationModel
 import org.springframework.hateoas.server.core.Relation
 import java.io.Serializable
@@ -9,21 +10,22 @@ import java.io.Serializable
 @Relation(collectionRelation = "keys", itemRelation = "key")
 open class KeyModel(
   @Schema(description = "Id of key record")
-  val id: Long,
+  override val id: Long,
   @Schema(description = "Name of key", example = "this_is_super_key")
-  val name: String,
+  override val name: String,
   @Schema(description = "Namespace of key", example = "homepage")
-  val namespace: String?,
+  override val namespace: String?,
   @Schema(
     description = "Description of key",
     example = "This key is used on homepage. It's a label of sign up button.",
   )
-  val description: String?,
+  override val description: String?,
   @Schema(description = "Custom values of the key")
-  val custom: Map<String, Any?>?,
+  override val custom: Map<String, Any?>?,
   @Schema(description = "Maximum character limit for translations of this key")
   val maxCharLimit: Int?,
   @Schema(description = "Branch of key", example = "dev")
   val branch: String?,
 ) : RepresentationModel<KeyModel>(),
-  Serializable
+  Serializable,
+  IKeyModel

backend/api/src/main/kotlin/io/tolgee/hateoas/key/KeyWithDataModel.kt

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema
 import io.tolgee.api.v2.hateoas.invitation.TagModel
 import io.tolgee.hateoas.screenshot.ScreenshotModel
 import io.tolgee.hateoas.translations.TranslationModel
+import io.tolgee.sharedDocs.Key
 import org.springframework.hateoas.RepresentationModel
 import org.springframework.hateoas.server.core.Relation
 import java.io.Serializable
@@ -31,9 +32,9 @@ open class KeyWithDataModel(
   val tags: Set<TagModel>,
   @Schema(description = "Screenshots of the key")
   val screenshots: List<ScreenshotModel>,
-  @Schema(description = "If key is pluralized. If it will be reflected in the editor")
+  @Schema(description = Key.IS_PLURAL_FIELD)
   val isPlural: Boolean,
-  @Schema(description = "The argument name for the plural")
+  @Schema(description = Key.PLURAL_ARG_NAME_FIELD)
   val pluralArgName: String?,
   @Schema(description = "Custom values of the key")
   val custom: Map<String, Any?>,

backend/api/src/main/kotlin/io/tolgee/hateoas/language/LanguageModel.kt

@@ -1,21 +1,23 @@
 package io.tolgee.hateoas.language
 
 import io.swagger.v3.oas.annotations.media.Schema
+import io.tolgee.api.ILanguageModel
 import org.springframework.hateoas.RepresentationModel
 import org.springframework.hateoas.server.core.Relation
 
 @Suppress("unused")
 @Relation(collectionRelation = "languages", itemRelation = "language")
 open class LanguageModel(
-  val id: Long,
+  override val id: Long,
   @Schema(example = "Czech", description = "Language name in english")
-  val name: String,
+  override val name: String,
   @Schema(example = "cs-CZ", description = "Language tag according to BCP 47 definition")
-  var tag: String,
+  override var tag: String,
   @Schema(example = "čeština", description = "Language name in this language")
-  var originalName: String? = null,
+  override var originalName: String?,
   @Schema(example = "\uD83C\uDDE8\uD83C\uDDFF", description = "Language flag emoji as UTF-8 emoji")
-  var flagEmoji: String? = null,
+  override var flagEmoji: String?,
   @Schema(example = "false", description = "Whether is base language of project")
   var base: Boolean,
-) : RepresentationModel<LanguageModel>()
+) : RepresentationModel<LanguageModel>(),
+  ILanguageModel

backend/api/src/main/kotlin/io/tolgee/hateoas/userAccount/SimpleUserAccountModelAssembler.kt

@@ -1,5 +1,6 @@
 package io.tolgee.hateoas.userAccount
 
+import io.tolgee.api.SimpleUserAccount
 import io.tolgee.api.v2.controllers.V2UserController
 import io.tolgee.dtos.cacheable.UserAccountDto
 import io.tolgee.model.UserAccount
@@ -26,6 +27,18 @@ class SimpleUserAccountModelAssembler(
     )
   }
 
+  fun toModel(entity: SimpleUserAccount): SimpleUserAccountModel {
+    val avatar = avatarService.getAvatarLinks(entity.avatarHash)
+
+    return SimpleUserAccountModel(
+      id = entity.id,
+      username = entity.username,
+      name = entity.name,
+      avatar = avatar,
+      deleted = entity.deleted,
+    )
+  }
+
   fun toModel(dto: UserAccountDto): SimpleUserAccountModel {
     val avatar = avatarService.getAvatarLinks(dto.avatarHash)
 

backend/app/build.gradle

@@ -122,13 +122,15 @@ dependencies {
     testImplementation('io.netty:netty-codec-http:4.2.5.Final')
     testImplementation('io.netty:netty-codec-http2:4.2.5.Final')
     testImplementation('io.netty:netty-handler:4.2.5.Final')
+    testImplementation libs.springJooq
     ktlint(project(":ktlint"))
 
 
     /**
      * MISC
      */
     implementation libs.commonsCodec
+    implementation libs.commonsText
     implementation libs.commonsLang
     implementation libs.amazonS3
     implementation libs.amazonSTS

backend/app/src/main/kotlin/io/tolgee/configuration/openApi/OpenApiGroupBuilder.kt

@@ -3,6 +3,8 @@ package io.tolgee.configuration.openApi
 import io.swagger.v3.oas.models.Operation
 import io.swagger.v3.oas.models.PathItem
 import io.swagger.v3.oas.models.Paths
+import io.tolgee.configuration.openApi.activity.ActivityGroupModelEnhancer
+import io.tolgee.configuration.openApi.activity.ProjectActivityModelEnhancer
 import io.tolgee.openApiDocs.OpenApiCloudExtension
 import io.tolgee.openApiDocs.OpenApiEeExtension
 import io.tolgee.openApiDocs.OpenApiOrderExtension
@@ -39,13 +41,22 @@ class OpenApiGroupBuilder(
 
     addExtensions()
 
+    updateActivitySchema()
+
     cleanUnusedModels()
 
     sortOutput()
 
     return@lazy builder.build()
   }
 
+  private fun updateActivitySchema() {
+    builder.addOpenApiCustomizer {
+      ProjectActivityModelEnhancer(it).enhance()
+      ActivityGroupModelEnhancer(it).enhance()
+    }
+  }
+
   private fun sortOutput() {
     builder.addOpenApiCustomizer { openAPI ->
       openAPI.paths =