Skip to content

feat: backup v2 add complex filtering #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Logaka wants to merge 9 commits into from
+936 −165
Closed

feat: backup v2 add complex filtering #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
07e49bd
feat: expand filtering
Logaka Dec 2, 2025
9765ff6
refactor: rewrite dynamic SQL filter
Logaka Dec 8, 2025
e0963a5
Merge branch 'main' into feat/backupV2-add-complex-filtering
Logaka Dec 8, 2025
f665ab3
feat: add NotEmptyFilter validation to Filter class
Logaka Dec 9, 2025
af1004a
feat: expanded filtering for external databases
Logaka Dec 9, 2025
fb32b57
Merge branch 'main' into feat/backupV2-add-complex-filtering
Logaka Dec 18, 2025
6b56a7d
fix: prevent empty filter from generating invalid WHERE clause
Logaka Dec 18, 2025
8ad5d86
refactor: make databaseKind join conditional
Logaka Jan 19, 2026
9f6d293
refactor: make kinds validation flexible
Logaka Jan 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions ...src/main/java/com/netcracker/cloud/dbaas/dao/jpa/DatabaseRegistryDbaasRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion ...dbaas-aggregator/src/main/java/com/netcracker/cloud/dbaas/dto/backupV2/BackupRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...baas-aggregator/src/main/java/com/netcracker/cloud/dbaas/dto/backupV2/BackupResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
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;
Expand Down
4 changes: 4 additions & 0 deletions dbaas/dbaas-aggregator/src/main/java/com/netcracker/cloud/dbaas/dto/backupV2/Filter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions ...baas-aggregator/src/main/java/com/netcracker/cloud/dbaas/dto/backupV2/FilterCriteria.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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<>();
}
2 changes: 1 addition & 1 deletion ...baas-aggregator/src/main/java/com/netcracker/cloud/dbaas/dto/backupV2/RestoreRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.RestoreGroup;
import com.netcracker.cloud.dbaas.utils.validation.group.RestoreGroup;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.groups.ConvertGroup;
Expand Down
2 changes: 1 addition & 1 deletion ...aas-aggregator/src/main/java/com/netcracker/cloud/dbaas/dto/backupV2/RestoreResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.netcracker.cloud.dbaas.enums.ExternalDatabaseStrategy;
import com.netcracker.cloud.dbaas.enums.RestoreStatus;
import com.netcracker.cloud.dbaas.utils.validation.RestoreGroup;
import com.netcracker.cloud.dbaas.utils.validation.group.RestoreGroup;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.groups.ConvertGroup;
Expand Down
5 changes: 3 additions & 2 deletions ...n/java/com/netcracker/cloud/dbaas/repositories/dbaas/DatabaseRegistryDbaasRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.netcracker.cloud.dbaas.repositories.dbaas;

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 javax.annotation.Nullable;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;

import javax.annotation.Nullable;

public interface DatabaseRegistryDbaasRepository {
List<DatabaseRegistry> findAnyLogDbRegistryTypeByNamespace(String namespace);

Expand Down Expand Up @@ -63,4 +63,5 @@ public interface DatabaseRegistryDbaasRepository {

List<DatabaseRegistry> findAllTransactionalDatabaseRegistries(String namespace);

List<DatabaseRegistry> findAllDatabasesByFilter(List<Filter> filters);
}
69 changes: 65 additions & 4 deletions .../main/java/com/netcracker/cloud/dbaas/repositories/pg/jpa/DatabaseRegistryRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
package com.netcracker.cloud.dbaas.repositories.pg.jpa;

import com.netcracker.cloud.dbaas.dto.backupV2.DatabaseKind;
import com.netcracker.cloud.dbaas.dto.backupV2.DatabaseType;
import com.netcracker.cloud.dbaas.dto.backupV2.Filter;
import com.netcracker.cloud.dbaas.entity.pg.DatabaseRegistry;
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.transaction.Transactional;
import lombok.extern.slf4j.Slf4j;

import java.util.List;
import java.util.Optional;
import java.util.SortedMap;
import java.util.UUID;
import java.util.*;

import static com.netcracker.cloud.dbaas.Constants.MICROSERVICE_NAME;
import static com.netcracker.cloud.dbaas.Constants.NAMESPACE;

@Slf4j
@ApplicationScoped
@Transactional
public class DatabaseRegistryRepository implements PanacheRepositoryBase<DatabaseRegistry, UUID> {
Expand All @@ -33,4 +38,60 @@ public List<DatabaseRegistry> findAllByNamespaceAndDatabase_BgVersionNull(String
public List<DatabaseRegistry> findAllByNamespaceAndDatabase_BgVersionNotNull(String namespace) {
return list("namespace = ?1 and database.bgVersion is not null", namespace);
}

public List<DatabaseRegistry> findAllDatabasesByFilter(List<Filter> filters) {
StringBuilder q = new StringBuilder(
"SELECT cl.* " +
"FROM classifier cl "
);

int index = 0;
boolean needDatabaseJoin = false;
List<String> orBlock = new ArrayList<>();
Map<String, Object> params = new HashMap<>();

for (Filter filter : filters) {
List<String> query = new ArrayList<>();
if (filter.getNamespace() != null && !filter.getNamespace().isEmpty()) {
String nsValues = "nsValues" + index;
query.add("cl.classifier #>> '{" + NAMESPACE + "}' = ANY(:" + nsValues + ")");
params.put(nsValues, filter.getNamespace().toArray(new String[0]));
}
if (filter.getMicroserviceName() != null && !filter.getMicroserviceName().isEmpty()) {
String msValues = "msValues" + index;
query.add("cl.classifier #>> '{" + MICROSERVICE_NAME + "}' = ANY(:" + msValues + ")");
params.put(msValues, filter.getMicroserviceName().toArray(new String[0]));
}
if (filter.getDatabaseType() != null && !filter.getDatabaseType().isEmpty()) {
String typeValues = "typeValues" + index;
query.add("cl.type = ANY(:" + typeValues + ")");
params.put(typeValues, filter.getDatabaseType().stream().map(DatabaseType::getType).toList().toArray(new String[0]));
}
if (filter.getDatabaseKind() != null && filter.getDatabaseKind().size() == 1) {
needDatabaseJoin = true;
DatabaseKind kind = filter.getDatabaseKind().getFirst();
if (kind == DatabaseKind.CONFIGURATION) {
query.add("d.bgversion IS NOT NULL AND d.bgversion <> '' ");
} else if (kind == DatabaseKind.TRANSACTIONAL) {
query.add("(d.bgversion IS NULL OR d.bgversion = '') ");
}
}
if (!query.isEmpty()) {
String block = "(" + String.join(" AND ", query) + ")";
orBlock.add(block);
index++;
}
}

if (needDatabaseJoin)
q.append("LEFT JOIN database d ON cl.database_id = d.id ");

if (!orBlock.isEmpty())
q.append("WHERE ").append(String.join(" OR ", orBlock));

var query = getEntityManager()
.createNativeQuery(q.toString(), DatabaseRegistry.class);
params.forEach(query::setParameter);
return query.getResultList();
}
}
Loading
Loading