This commit is contained in:
Francesco 2023-09-24 11:40:27 +02:00
parent d714b8c0a6
commit 2d2f24f1e3
9 changed files with 45 additions and 14 deletions

View File

@ -12,7 +12,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.core.env.Environment;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;

View File

@ -163,7 +163,7 @@ public class DefaultDbAdminController {
DbObjectSchema schema = dbAdmin.findSchemaByClassName(className);
try {
PaginatedResult result = null;
PaginatedResult<DbObject> result = null;
if (query != null || !otherParams.isEmpty()) {
result = repository.search(schema, query, page, pageSize, sortKey, sortOrder, queryFilters);
} else {

View File

@ -215,7 +215,7 @@ public class DbAdminRepository {
* @param query
* @return
*/
public PaginatedResult search(DbObjectSchema schema, String query, int page, int pageSize, String sortKey,
public PaginatedResult<DbObject> search(DbObjectSchema schema, String query, int page, int pageSize, String sortKey,
String sortOrder, Set<QueryFilter> queryFilters) {
AdvancedJpaRepository jpaRepository = schema.getJpaRepository();

View File

@ -2,8 +2,6 @@ package tech.ailef.dbadmin.external.dto;
import java.util.List;
import tech.ailef.dbadmin.external.dbmapping.DbObject;
public class PaginatedResult<T> {
private PaginationInfo pagination;

View File

@ -0,0 +1,29 @@
package tech.ailef.dbadmin.internal.model;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
@Entity
public class UserSetting {
@Id
private String id;
private String value;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
}

View File

@ -3,7 +3,6 @@ package tech.ailef.dbadmin.internal.repository;
import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Component;
@ -13,8 +12,6 @@ import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import tech.ailef.dbadmin.external.DbAdmin;
import tech.ailef.dbadmin.external.dbmapping.DbObjectSchema;
import tech.ailef.dbadmin.internal.model.UserAction;
@Component
@ -23,9 +20,6 @@ public class CustomActionRepositoryImpl implements CustomActionRepository {
@PersistenceContext(unitName = "internal")
private EntityManager entityManager;
@Autowired
private DbAdmin dbAdmin;
@Override
public List<UserAction> findActions(String table, String actionType, String itemId, PageRequest page) {

View File

@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
import tech.ailef.dbadmin.internal.model.UserAction;
@Repository
public interface ActionRepository extends JpaRepository<UserAction, Integer>, CustomActionRepository {
public interface UserActionRepository extends JpaRepository<UserAction, Integer>, CustomActionRepository {
public List<UserAction> findAllByOnTableAndActionTypeAndPrimaryKey(String table, String actionType, String primaryKey, PageRequest pageRequest);
}

View File

@ -0,0 +1,11 @@
package tech.ailef.dbadmin.internal.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import tech.ailef.dbadmin.internal.model.UserSetting;
@Repository
public interface UserSettingsRepository extends JpaRepository<UserSetting, Integer> {
}

View File

@ -10,13 +10,13 @@ import org.springframework.transaction.annotation.Transactional;
import tech.ailef.dbadmin.external.dto.PaginatedResult;
import tech.ailef.dbadmin.external.dto.PaginationInfo;
import tech.ailef.dbadmin.internal.model.UserAction;
import tech.ailef.dbadmin.internal.repository.ActionRepository;
import tech.ailef.dbadmin.internal.repository.CustomActionRepositoryImpl;
import tech.ailef.dbadmin.internal.repository.UserActionRepository;
@Service
public class UserActionService {
@Autowired
private ActionRepository repo;
private UserActionRepository repo;
@Autowired
private CustomActionRepositoryImpl customRepo;