feat: restore dry run

dbaas/dbaas-aggregator/src/main/java/com/netcracker/cloud/dbaas/controller/error/OperationAlreadyRunningExceptionMapper.java

@@ -0,0 +1,22 @@
+package com.netcracker.cloud.dbaas.controller.error;
+
+import com.netcracker.cloud.dbaas.exceptions.OperationAlreadyRunningException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
+
+import static com.netcracker.cloud.dbaas.controller.error.Utils.buildDefaultResponse;
+
+@Provider
+public class OperationAlreadyRunningExceptionMapper implements ExceptionMapper<OperationAlreadyRunningException> {
+
+    @Context
+    UriInfo uriInfo;
+
+    @Override
+    public Response toResponse(OperationAlreadyRunningException e) {
+        return buildDefaultResponse(uriInfo, e, Response.Status.CONFLICT);
+    }
+}

dbaas/dbaas-aggregator/src/main/java/com/netcracker/cloud/dbaas/controller/v3/DatabaseBackupV2Controller.java

@@ -63,7 +63,7 @@ public DatabaseBackupV2Controller(DbBackupV2Service dbBackupV2Service) {
                     content = @Content(schema = @Schema(implementation = TmfErrorResponse.class))),
             @APIResponse(responseCode = "409", description = "The request could not be completed due to a conflict with the current state of the resource",
                     content = @Content(schema = @Schema(implementation = TmfErrorResponse.class))),
-            @APIResponse(responseCode = "422", description = "The request was accepted, but the server could`t process due to incompatible resource",
+            @APIResponse(responseCode = "422", description = "The request was accepted, but the server couldn't process due to incompatible resource",
                     content = @Content(schema = @Schema(implementation = TmfErrorResponse.class))),
             @APIResponse(responseCode = "500", description = "An unexpected error occurred on the server",
                     content = @Content(schema = @Schema(implementation = TmfErrorResponse.class))),
@@ -159,7 +159,7 @@ public Response getBackupStatus(@Parameter(description = "Unique identifier of t
             @APIResponse(responseCode = "403", description = "The request was valid, but the server is refusing action"),
             @APIResponse(responseCode = "404", description = "The requested resource could not be found",
                     content = @Content(schema = @Schema(implementation = TmfErrorResponse.class))),
-            @APIResponse(responseCode = "422", description = "The request was accepted, but the server could`t process due to incompatible resource",
+            @APIResponse(responseCode = "422", description = "The request was accepted, but the server couldn't process due to incompatible resource",
                     content = @Content(schema = @Schema(implementation = TmfErrorResponse.class))),
             @APIResponse(responseCode = "500", description = "An unexpected error occurred on the server",
                     content = @Content(schema = @Schema(implementation = TmfErrorResponse.class)))
@@ -230,7 +230,7 @@ public Response uploadMetadata(
                     content = @Content(schema = @Schema(implementation = TmfErrorResponse.class))),
             @APIResponse(responseCode = "409", description = "The request could not be completed due to a conflict with the current state of the resource",
                     content = @Content(schema = @Schema(implementation = TmfErrorResponse.class))),
-            @APIResponse(responseCode = "422", description = "The request was accepted, but the server could`t process due to incompatible resource",
+            @APIResponse(responseCode = "422", description = "The request was accepted, but the server couldn't process due to incompatible resource",
                     content = @Content(schema = @Schema(implementation = TmfErrorResponse.class))),
             @APIResponse(responseCode = "500", description = "An unexpected error occurred on the server",
                     content = @Content(schema = @Schema(implementation = TmfErrorResponse.class))),
@@ -241,7 +241,7 @@ public Response uploadMetadata(
     @POST
     public Response restoreBackup(@Parameter(description = "Unique identifier of the backup", required = true)
                                   @PathParam("backupName") @NotBlank String backupName,
-                                  @RequestBody(description = "Restore request", required = true)
+                                  @RequestBody(description = "Restore request")
                                   @Valid RestoreRequest restoreRequest,
                                   @QueryParam("dryRun") @DefaultValue("false") boolean dryRun) {
         RestoreResponse response = dbBackupV2Service.restore(backupName, restoreRequest, dryRun);
@@ -308,14 +308,16 @@ public Response getRestoreStatus(@Parameter(description = "Unique identifier of
 
     @Operation(summary = "Retry restore", description = "Retry a failed restore operation")
     @APIResponses({
-            @APIResponse(responseCode = "200", description = "Restore operation retried successfully",
-                    content = @Content(schema = @Schema(implementation = RestoreResponse.class))),
             @APIResponse(responseCode = "202", description = "Restore retry accepted and is being processed",
                     content = @Content(schema = @Schema(implementation = RestoreResponse.class))),
             @APIResponse(responseCode = "401", description = "Authentication is required and has failed or has not been provided"),
             @APIResponse(responseCode = "403", description = "The request was valid, but the server is refusing action"),
             @APIResponse(responseCode = "404", description = "The requested resource could not be found",
                     content = @Content(schema = @Schema(implementation = TmfErrorResponse.class))),
+            @APIResponse(responseCode = "409", description = "The request could not be completed due to a conflict with the current state of the resource",
+                    content = @Content(schema = @Schema(implementation = TmfErrorResponse.class))),
+            @APIResponse(responseCode = "422", description = "The request was accepted, but the server couldn't process due to incompatible resource",
+                    content = @Content(schema = @Schema(implementation = TmfErrorResponse.class))),
             @APIResponse(responseCode = "500", description = "An unexpected error occurred on the server",
                     content = @Content(schema = @Schema(implementation = TmfErrorResponse.class)))
     })
@@ -324,7 +326,6 @@ public Response getRestoreStatus(@Parameter(description = "Unique identifier of
     public Response retryRestore(@Parameter(description = "Unique identifier of the restore operation", required = true)
                                  @PathParam("restoreName")
                                  String restoreName) {
-        dbBackupV2Service.retryRestore(restoreName);
-        return Response.ok().build();
+        return Response.accepted(dbBackupV2Service.retryRestore(restoreName)).build();
     }
 }

dbaas/dbaas-aggregator/src/main/java/com/netcracker/cloud/dbaas/converter/ClassifierConverter.java

@@ -3,8 +3,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import jakarta.persistence.AttributeConverter;
+
 import java.io.IOException;
 import java.util.SortedMap;
 
@@ -24,7 +24,8 @@ public String convertToDatabaseColumn(SortedMap<Object, Object> attribute) {
     @Override
     public SortedMap<Object, Object> convertToEntityAttribute(String dbData) {
         try {
-            return objectMapper.readValue(dbData, new TypeReference<SortedMap<Object, Object>>() {});
+            return objectMapper.readValue(dbData, new TypeReference<SortedMap<Object, Object>>() {
+            });
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

dbaas/dbaas-aggregator/src/main/java/com/netcracker/cloud/dbaas/dao/jpa/DatabaseRegistryDbaasRepositoryImpl.java

@@ -1,5 +1,6 @@
 package com.netcracker.cloud.dbaas.dao.jpa;
 
+import com.netcracker.cloud.dbaas.dto.backupV2.Filter;
 import com.netcracker.cloud.dbaas.entity.pg.Database;
 import com.netcracker.cloud.dbaas.entity.pg.DatabaseRegistry;
 import com.netcracker.cloud.dbaas.repositories.dbaas.DatabaseRegistryDbaasRepository;
@@ -12,23 +13,18 @@
 import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
 import lombok.extern.slf4j.Slf4j;
-
 import net.jodah.failsafe.Failsafe;
 import net.jodah.failsafe.RetryPolicy;
 import org.apache.commons.lang.StringUtils;
 
+import javax.annotation.Nullable;
 import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nullable;
-
-import static com.netcracker.cloud.dbaas.Constants.MICROSERVICE_NAME;
-import static com.netcracker.cloud.dbaas.Constants.ROLE;
-import static com.netcracker.cloud.dbaas.Constants.SCOPE;
-import static com.netcracker.cloud.dbaas.Constants.SCOPE_VALUE_TENANT;
+import static com.netcracker.cloud.dbaas.Constants.*;
 import static com.netcracker.cloud.dbaas.config.ServicesConfig.DBAAS_REPOSITORIES_MUTEX;
 import static jakarta.transaction.Transactional.TxType.REQUIRES_NEW;
 
@@ -141,6 +137,11 @@ public List<DatabaseRegistry> findAllTransactionalDatabaseRegistries(String name
         return databaseRegistryRepository.findAllByNamespaceAndDatabase_BgVersionNull(namespace);
     }
 
+    @Override
+    public List<DatabaseRegistry> findAllDatabasesByFilter(List<Filter> filters) {
+        return databaseRegistryRepository.findAllDatabasesByFilter(filters);
+    }
+
     @Override
     public void delete(DatabaseRegistry databaseRegistry) {
         log.debug("Delete logical database with classifier {} and type {}", databaseRegistry.getClassifier(), databaseRegistry.getType());

dbaas/dbaas-aggregator/src/main/java/com/netcracker/cloud/dbaas/dto/backupV2/BackupRequest.java

@@ -1,7 +1,7 @@
 package com.netcracker.cloud.dbaas.dto.backupV2;
 
 import com.netcracker.cloud.dbaas.enums.ExternalDatabaseStrategy;
-import com.netcracker.cloud.dbaas.utils.validation.BackupGroup;
+import com.netcracker.cloud.dbaas.utils.validation.group.BackupGroup;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -45,7 +45,7 @@ public class BackupRequest {
     )
     @Valid
     @NotNull
-    @ConvertGroup(from = Default.class, to = BackupGroup.class)
+    @ConvertGroup(to = BackupGroup.class)
     private FilterCriteria filterCriteria;
     @Schema(
             description = "How to handle external databases during backup",

dbaas/dbaas-aggregator/src/main/java/com/netcracker/cloud/dbaas/dto/backupV2/BackupResponse.java

@@ -3,12 +3,11 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.netcracker.cloud.dbaas.enums.BackupStatus;
 import com.netcracker.cloud.dbaas.enums.ExternalDatabaseStrategy;
-import com.netcracker.cloud.dbaas.utils.validation.BackupGroup;
+import com.netcracker.cloud.dbaas.utils.validation.group.BackupGroup;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.groups.ConvertGroup;
-import jakarta.validation.groups.Default;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
@@ -21,32 +20,32 @@
 @Schema(description = "Response containing backup operation details")
 public class BackupResponse {
 
-    @NotBlank
     @Schema(
             description = "Unique identifier of the backup",
             examples = {
                     "before-prod-update-20251013T1345-G5s8"
             },
             required = true
     )
-    private String backupName;
     @NotBlank
+    private String backupName;
     @Schema(
             description = "Name of the storage backend containing the backup",
             examples = {
                     "s3-backend"
             },
             required = true
     )
-    private String storageName;
     @NotBlank
+    private String storageName;
     @Schema(
             description = "Path to the backup file in the storage",
             examples = {
                     "/backups"
             },
             required = true
     )
+    @NotBlank
     private String blobPath;
     @Schema(
             description = "How to handle external databases during backup",
@@ -57,20 +56,20 @@ public class BackupResponse {
     )
     @NotNull
     private ExternalDatabaseStrategy externalDatabaseStrategy;
-    @NotNull
     @Schema(
             description = "Whether external databases were skipped during the backup",
             examples = {
                     "false"
             }
     )
+    @NotNull
     private boolean ignoreNotBackupableDatabases;
     @Schema(
             description = "Filter criteria",
             implementation = FilterCriteria.class
     )
     @Valid
-    @ConvertGroup(from = Default.class, to = BackupGroup.class)
+    @ConvertGroup(to = BackupGroup.class)
     private FilterCriteria filterCriteria;
 
     @Schema(
@@ -84,20 +83,23 @@ public class BackupResponse {
                     "5"
             }
     )
+    @NotNull
     private Integer total;
     @Schema(
             description = "Number of databases successfully backed up",
             examples = {
                     "3"
             }
     )
+    @NotNull
     private Integer completed;
     @Schema(
             description = "Total size of the backup in bytes",
             examples = {
                     "1073741824"
             }
     )
+    @NotNull
     private Long size;
     @Schema(
             description = "Error details if the backup failed",

dbaas/dbaas-aggregator/src/main/java/com/netcracker/cloud/dbaas/dto/backupV2/ClassifierResponse.java

@@ -0,0 +1,18 @@
+package com.netcracker.cloud.dbaas.dto.backupV2;
+
+import com.netcracker.cloud.dbaas.enums.ClassifierType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.SortedMap;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ClassifierResponse {
+    private ClassifierType type;
+    private String previousDatabase;
+    private SortedMap<String, Object> classifier;
+    private SortedMap<String, Object> classifierBeforeMapper;
+}

dbaas/dbaas-aggregator/src/main/java/com/netcracker/cloud/dbaas/dto/backupV2/Filter.java

@@ -1,5 +1,8 @@
 package com.netcracker.cloud.dbaas.dto.backupV2;
 
+import com.netcracker.cloud.dbaas.utils.validation.NotEmptyFilter;
+import com.netcracker.cloud.dbaas.utils.validation.group.BackupGroup;
+import com.netcracker.cloud.dbaas.utils.validation.group.RestoreGroup;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
@@ -9,6 +12,7 @@
 import java.util.List;
 
 @Data
+@NotEmptyFilter(groups = {BackupGroup.class, RestoreGroup.class})
 @NoArgsConstructor
 @Schema(description = "Single filter criteria for backup and restore operations")
 public class Filter {

dbaas/dbaas-aggregator/src/main/java/com/netcracker/cloud/dbaas/dto/backupV2/FilterCriteria.java

@@ -1,12 +1,14 @@
 package com.netcracker.cloud.dbaas.dto.backupV2;
 
-import com.netcracker.cloud.dbaas.utils.validation.BackupGroup;
+import com.netcracker.cloud.dbaas.utils.validation.group.BackupGroup;
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -23,13 +25,11 @@ public class FilterCriteria {
     )
     @NotNull(groups = {BackupGroup.class})
     @Size(min = 1, groups = {BackupGroup.class})
-    private List<Filter> filter;
-    @Schema(
-            description = "Include databases that match any of the filters in the list"
-    )
-    private List<Filter> include;
+    @Valid
+    private List<Filter> filter = new ArrayList<>();
+
     @Schema(
             description = "Exclude databases that match any of the filters in the list"
     )
-    private List<Filter> exclude;
+    private List<Filter> exclude = new ArrayList<>();
 }

dbaas/dbaas-aggregator/src/main/java/com/netcracker/cloud/dbaas/dto/backupV2/RestoreDatabaseResponse.java

@@ -26,7 +26,7 @@ public class RestoreDatabaseResponse {
             description = "List of database classifiers. Each classifier is a sorted map of attributes.",
             examples = "[{\"namespace\":\"namespace\", \"microserviceName\":\"microserviceName\", \"scope\":\"service\"}]"
     )
-    private List<Map<String, Object>> classifiers;
+    private List<ClassifierResponse> classifiers;
     @Schema(
             description = "List of database users",
             examples = "[{\"name\":\"username\",\"role\":\"admin\"}"
@@ -58,7 +58,7 @@ public class RestoreDatabaseResponse {
             required = true
     )
     private String path;
-    @Schema(description = "Error message if the backup failed",  examples = "Restore Not Found")
+    @Schema(description = "Error message if the backup failed", examples = "Restore Not Found")
     private String errorMessage;
     @Schema(description = "Timestamp when the restore was created", examples = "2025-11-13T12:34:56Z")
     private Instant creationTime;

dbaas/dbaas-aggregator/src/main/java/com/netcracker/cloud/dbaas/dto/backupV2/RestoreExternalDatabaseResponse.java

@@ -5,7 +5,6 @@
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
 import java.util.List;
-import java.util.SortedMap;
 
 @Data
 @NoArgsConstructor
@@ -19,6 +18,6 @@ public class RestoreExternalDatabaseResponse {
             description = "List of database classifiers. Each classifier is a sorted map of attributes.",
             examples = "[{\"namespace\":\"namespace\", \"microserviceName\":\"microserviceName\", \"scope\":\"service\"}]"
     )
-    private List<SortedMap<String, Object>> classifiers;
+    private List<ClassifierResponse> classifiers;
 }