feat: key archiving

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

@@ -78,13 +78,17 @@ class NamespaceController(
   fun getUsedNamespaces(): CollectionModel<UsedNamespaceModel> {
     val namespaces =
       namespaceService
-        .getAllInProject(projectHolder.project.id)
+        .getAllWithActiveKeysInProject(projectHolder.project.id)
         .map { it.id as Long? to it.name as String? }
         .toMutableList()
     val isDefaultUsed = namespaceService.isDefaultUsed(projectHolder.project.id)
     if (isDefaultUsed) {
       namespaces.add(0, null to null)
     }
+    val defaultNamespace = projectHolder.projectEntity.defaultNamespace
+    if (defaultNamespace != null && namespaces.none { it.first == defaultNamespace.id }) {
+      namespaces.add(defaultNamespace.id as Long? to defaultNamespace.name as String?)
+    }
     return usedNamespaceModelAssembler.toCollectionModel(namespaces)
   }
 

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

@@ -7,8 +7,10 @@ import io.tolgee.batch.data.BatchJobType
 import io.tolgee.batch.request.ClearTranslationsRequest
 import io.tolgee.batch.request.CopyTranslationRequest
 import io.tolgee.batch.request.DeleteKeysRequest
+import io.tolgee.batch.request.HardDeleteKeysRequest
 import io.tolgee.batch.request.MachineTranslationRequest
 import io.tolgee.batch.request.PreTranslationByTmRequest
+import io.tolgee.batch.request.RestoreKeysRequest
 import io.tolgee.batch.request.SetKeysNamespaceRequest
 import io.tolgee.batch.request.SetTranslationsStateStateRequest
 import io.tolgee.batch.request.TagKeysRequest
@@ -256,6 +258,42 @@ class StartBatchJobController(
       ).model
   }
 
+  @PostMapping(value = ["/restore-keys"])
+  @Operation(summary = "Restore soft-deleted keys")
+  @RequiresProjectPermissions([Scope.KEYS_CREATE])
+  @AllowApiAccess
+  fun restoreKeys(
+    @Valid @RequestBody
+    data: RestoreKeysRequest,
+  ): BatchJobModel {
+    securityService.checkSoftDeletedKeyIdsExistAndIsFromProject(data.keyIds, projectHolder.project.id)
+    return batchJobService
+      .startJob(
+        data,
+        projectHolder.projectEntity,
+        authenticationFacade.authenticatedUserEntity,
+        BatchJobType.RESTORE_KEYS,
+      ).model
+  }
+
+  @PostMapping(value = ["/hard-delete-keys"])
+  @Operation(summary = "Permanently delete soft-deleted keys")
+  @RequiresProjectPermissions([Scope.KEYS_DELETE])
+  @AllowApiAccess
+  fun hardDeleteKeys(
+    @Valid @RequestBody
+    data: HardDeleteKeysRequest,
+  ): BatchJobModel {
+    securityService.checkSoftDeletedKeyIdsExistAndIsFromProject(data.keyIds, projectHolder.project.id)
+    return batchJobService
+      .startJob(
+        data,
+        projectHolder.projectEntity,
+        authenticationFacade.authenticatedUserEntity,
+        BatchJobType.HARD_DELETE_KEYS,
+      ).model
+  }
+
   val BatchJob.model
     get() = batchJobModelAssembler.toModel(batchJobService.getView(this))
 

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

@@ -184,7 +184,7 @@ class KeyController(
   @DeleteMapping(value = ["/{ids:[0-9,]+}"])
   @Transactional
   @Operation(summary = "Delete one or multiple keys")
-  @RequestActivity(ActivityType.KEY_DELETE)
+  @RequestActivity(ActivityType.KEY_SOFT_DELETE)
   @RequiresProjectPermissions([Scope.KEYS_DELETE])
   @AllowApiAccess
   @OpenApiOrderExtension(5)
@@ -197,7 +197,7 @@ class KeyController(
         checkBranchPermission()
       }
     }
-    keyService.deleteMultiple(ids)
+    keyService.softDeleteMultiple(ids)
   }
 
   @PutMapping(value = ["/{id}/complex-update"])
@@ -226,7 +226,7 @@ class KeyController(
       "Delete one or multiple keys by their IDs in request body. Useful for larger requests" +
         " esxceeding allowed URL length.",
   )
-  @RequestActivity(ActivityType.KEY_DELETE)
+  @RequestActivity(ActivityType.KEY_SOFT_DELETE)
   @RequiresProjectPermissions([Scope.KEYS_DELETE])
   @AllowApiAccess
   fun delete(

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

@@ -0,0 +1,127 @@
+package io.tolgee.api.v2.controllers.keys
+
+import io.swagger.v3.oas.annotations.Operation
+import io.tolgee.activity.RequestActivity
+import io.tolgee.activity.data.ActivityType
+import io.tolgee.api.v2.controllers.IController
+import io.tolgee.dtos.queryResults.KeyView
+import io.tolgee.dtos.request.translation.TranslationFilters
+import io.tolgee.hateoas.key.KeyModel
+import io.tolgee.hateoas.key.KeyModelAssembler
+import io.tolgee.hateoas.key.trash.TrashedKeyWithTranslationsModel
+import io.tolgee.hateoas.key.trash.TrashedKeyWithTranslationsModelAssembler
+import io.tolgee.hateoas.userAccount.SimpleUserAccountModel
+import io.tolgee.hateoas.userAccount.SimpleUserAccountModelAssembler
+import io.tolgee.model.enums.Scope
+import io.tolgee.model.views.KeyWithTranslationsView
+import io.tolgee.security.ProjectHolder
+import io.tolgee.security.authentication.AllowApiAccess
+import io.tolgee.security.authentication.AuthenticationFacade
+import io.tolgee.security.authorization.RequiresProjectPermissions
+import io.tolgee.service.key.KeyService
+import io.tolgee.service.key.KeyTrashService
+import org.springdoc.core.annotations.ParameterObject
+import org.springframework.data.domain.Pageable
+import org.springframework.data.web.PagedResourcesAssembler
+import org.springframework.data.web.SortDefault
+import org.springframework.hateoas.CollectionModel
+import org.springframework.hateoas.PagedModel
+import org.springframework.transaction.annotation.Transactional
+import org.springframework.web.bind.annotation.CrossOrigin
+import org.springframework.web.bind.annotation.DeleteMapping
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.ModelAttribute
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PutMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.RestController
+
+@Suppress("MVCPathVariableInspection")
+@RestController
+@CrossOrigin(origins = ["*"])
+@RequestMapping(
+  value = [
+    "/v2/projects/{projectId:[0-9]+}/keys/trash",
+    "/v2/projects/keys/trash",
+  ],
+)
+@KeysDocsTag
+class KeyTrashController(
+  private val keyService: KeyService,
+  private val keyTrashService: KeyTrashService,
+  private val projectHolder: ProjectHolder,
+  private val keyModelAssembler: KeyModelAssembler,
+  private val authenticationFacade: AuthenticationFacade,
+  private val trashedKeyWithTranslationsModelAssembler: TrashedKeyWithTranslationsModelAssembler,
+  private val simpleUserAccountModelAssembler: SimpleUserAccountModelAssembler,
+  @Suppress("SpringJavaInjectionPointsAutowiringInspection")
+  private val pagedResourcesAssembler: PagedResourcesAssembler<KeyWithTranslationsView>,
+) : IController {
+  @GetMapping("")
+  @Operation(summary = "List trashed keys")
+  @RequiresProjectPermissions([Scope.KEYS_VIEW])
+  @AllowApiAccess
+  fun list(
+    @ParameterObject
+    @SortDefault("deletedAt")
+    pageable: Pageable,
+    @ParameterObject
+    @ModelAttribute
+    params: TranslationFilters,
+  ): PagedModel<TrashedKeyWithTranslationsModel> {
+    val data =
+      keyTrashService.getTrashedKeysWithTranslations(
+        projectId = projectHolder.project.id,
+        userId = authenticationFacade.authenticatedUser.id,
+        pageable = pageable,
+        params = params,
+      )
+    return pagedResourcesAssembler.toModel(data, trashedKeyWithTranslationsModelAssembler)
+  }
+
+  @GetMapping("/deleters")
+  @Operation(summary = "List users who deleted keys")
+  @RequiresProjectPermissions([Scope.KEYS_VIEW])
+  @AllowApiAccess
+  fun listDeleters(
+    @RequestParam(required = false) branch: String?,
+  ): CollectionModel<SimpleUserAccountModel> {
+    val users = keyService.findDistinctDeleters(projectHolder.project.id, branch)
+    return simpleUserAccountModelAssembler.toCollectionModel(users)
+  }
+
+  @PutMapping("/{keyId}/restore")
+  @Transactional
+  @Operation(summary = "Restore a trashed key")
+  @RequestActivity(ActivityType.KEY_RESTORE)
+  @RequiresProjectPermissions([Scope.KEYS_CREATE])
+  @AllowApiAccess
+  fun restore(
+    @PathVariable keyId: Long,
+  ): KeyModel {
+    val key = keyService.restoreKey(projectHolder.project.id, keyId)
+    val view =
+      KeyView(
+        key.id,
+        key.name,
+        key.namespace?.name,
+        key.keyMeta?.description,
+        key.keyMeta?.custom,
+        key.branch?.name,
+      )
+    return keyModelAssembler.toModel(view)
+  }
+
+  @DeleteMapping("/{keyId}")
+  @Transactional
+  @Operation(summary = "Permanently delete a trashed key")
+  @RequestActivity(ActivityType.KEY_HARD_DELETE)
+  @RequiresProjectPermissions([Scope.KEYS_DELETE])
+  @AllowApiAccess
+  fun permanentlyDelete(
+    @PathVariable keyId: Long,
+  ) {
+    keyService.hardDeleteSingleTrashedKey(projectHolder.project.id, keyId)
+  }
+}

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

@@ -0,0 +1,26 @@
+package io.tolgee.hateoas.key.trash
+
+import io.swagger.v3.oas.annotations.media.Schema
+import io.tolgee.hateoas.userAccount.SimpleUserAccountModel
+import org.springframework.hateoas.RepresentationModel
+import org.springframework.hateoas.server.core.Relation
+import java.io.Serializable
+import java.util.Date
+
+@Suppress("unused")
+@Relation(collectionRelation = "keys", itemRelation = "key")
+class TrashedKeyModel(
+  @Schema(description = "Id of key record")
+  val id: Long,
+  @Schema(description = "Name of key", example = "this_is_super_key")
+  val name: String,
+  @Schema(description = "Namespace of key", example = "homepage")
+  val namespace: String?,
+  @Schema(description = "When the key was deleted")
+  val deletedAt: Date,
+  @Schema(description = "When the key will be permanently deleted")
+  val permanentDeleteAt: Date,
+  @Schema(description = "User who deleted the key")
+  val deletedBy: SimpleUserAccountModel?,
+) : RepresentationModel<TrashedKeyModel>(),
+  Serializable

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

@@ -0,0 +1,44 @@
+package io.tolgee.hateoas.key.trash
+
+import io.tolgee.api.v2.controllers.keys.KeyTrashController
+import io.tolgee.hateoas.userAccount.SimpleUserAccountModel
+import io.tolgee.service.AvatarService
+import io.tolgee.service.key.KeySearchResultView
+import io.tolgee.service.key.KeyTrashPurgeScheduler
+import io.tolgee.util.addDays
+import org.springframework.hateoas.server.mvc.RepresentationModelAssemblerSupport
+import org.springframework.stereotype.Component
+
+@Component
+class TrashedKeyModelAssembler(
+  private val avatarService: AvatarService,
+) : RepresentationModelAssemblerSupport<KeySearchResultView, TrashedKeyModel>(
+    KeyTrashController::class.java,
+    TrashedKeyModel::class.java,
+  ) {
+  override fun toModel(entity: KeySearchResultView): TrashedKeyModel {
+    val deletedAt =
+      entity.deletedAt
+        ?: throw IllegalStateException("Cannot assemble TrashedKeyModel: deletedAt is null for key ${entity.id}")
+    return TrashedKeyModel(
+      id = entity.id,
+      name = entity.name,
+      namespace = entity.namespace,
+      deletedAt = deletedAt,
+      permanentDeleteAt = deletedAt.addDays(KeyTrashPurgeScheduler.RETENTION_DAYS),
+      deletedBy = buildDeletedByModel(entity),
+    )
+  }
+
+  private fun buildDeletedByModel(entity: KeySearchResultView): SimpleUserAccountModel? {
+    return entity.deletedByUserId?.let { userId ->
+      SimpleUserAccountModel(
+        id = userId,
+        username = entity.deletedByUserUsername ?: "",
+        name = entity.deletedByUserName,
+        avatar = avatarService.getAvatarLinks(entity.deletedByUserAvatarHash),
+        deleted = entity.deletedByUserDeleted ?: false,
+      )
+    }
+  }
+}

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

@@ -0,0 +1,39 @@
+package io.tolgee.hateoas.key.trash
+
+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.TranslationViewModel
+import io.tolgee.hateoas.userAccount.SimpleUserAccountModel
+import org.springframework.hateoas.RepresentationModel
+import org.springframework.hateoas.server.core.Relation
+import java.io.Serializable
+import java.util.Date
+
+@Suppress("unused")
+@Relation(collectionRelation = "keys", itemRelation = "key")
+class TrashedKeyWithTranslationsModel(
+  @Schema(description = "Id of key record")
+  val id: Long,
+  @Schema(description = "Name of key", example = "this_is_super_key")
+  val name: String,
+  @Schema(description = "Namespace of key", example = "homepage")
+  val namespace: String?,
+  @Schema(description = "When the key was deleted")
+  val deletedAt: Date,
+  @Schema(description = "When the key will be permanently deleted")
+  val permanentDeleteAt: Date,
+  @Schema(description = "Description of the key")
+  val description: String?,
+  @Schema(description = "Tags of key")
+  val tags: List<TagModel>,
+  @Schema(description = "Translations object keyed by language tag")
+  val translations: Map<String, TranslationViewModel>,
+  @Schema(description = "Screenshots of the key")
+  val screenshots: List<ScreenshotModel>,
+  @Schema(description = "Whether the key is plural")
+  val isPlural: Boolean,
+  @Schema(description = "User who deleted the key")
+  val deletedBy: SimpleUserAccountModel?,
+) : RepresentationModel<TrashedKeyWithTranslationsModel>(),
+  Serializable