From 2d2f24f1e349d9a12e64a2d0c35cdc3d900e5370 Mon Sep 17 00:00:00 2001 From: Francesco Date: Sun, 24 Sep 2023 11:40:27 +0200 Subject: [PATCH] WIP --- .../external/DbAdminAutoConfiguration.java | 1 - .../controller/DefaultDbAdminController.java | 2 +- .../external/dbmapping/DbAdminRepository.java | 2 +- .../dbadmin/external/dto/PaginatedResult.java | 2 -- .../dbadmin/internal/model/UserSetting.java | 29 +++++++++++++++++++ .../CustomActionRepositoryImpl.java | 6 ---- ...ository.java => UserActionRepository.java} | 2 +- .../repository/UserSettingsRepository.java | 11 +++++++ .../internal/service/UserActionService.java | 4 +-- 9 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 src/main/java/tech/ailef/dbadmin/internal/model/UserSetting.java rename src/main/java/tech/ailef/dbadmin/internal/repository/{ActionRepository.java => UserActionRepository.java} (80%) create mode 100644 src/main/java/tech/ailef/dbadmin/internal/repository/UserSettingsRepository.java diff --git a/src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java b/src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java index de2d65a..9313a15 100644 --- a/src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java +++ b/src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java @@ -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; diff --git a/src/main/java/tech/ailef/dbadmin/external/controller/DefaultDbAdminController.java b/src/main/java/tech/ailef/dbadmin/external/controller/DefaultDbAdminController.java index 5925d00..ac3ddc1 100644 --- a/src/main/java/tech/ailef/dbadmin/external/controller/DefaultDbAdminController.java +++ b/src/main/java/tech/ailef/dbadmin/external/controller/DefaultDbAdminController.java @@ -163,7 +163,7 @@ public class DefaultDbAdminController { DbObjectSchema schema = dbAdmin.findSchemaByClassName(className); try { - PaginatedResult result = null; + PaginatedResult result = null; if (query != null || !otherParams.isEmpty()) { result = repository.search(schema, query, page, pageSize, sortKey, sortOrder, queryFilters); } else { diff --git a/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbAdminRepository.java b/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbAdminRepository.java index aace47c..9296525 100644 --- a/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbAdminRepository.java +++ b/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbAdminRepository.java @@ -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 search(DbObjectSchema schema, String query, int page, int pageSize, String sortKey, String sortOrder, Set queryFilters) { AdvancedJpaRepository jpaRepository = schema.getJpaRepository(); diff --git a/src/main/java/tech/ailef/dbadmin/external/dto/PaginatedResult.java b/src/main/java/tech/ailef/dbadmin/external/dto/PaginatedResult.java index da21851..2b22fda 100644 --- a/src/main/java/tech/ailef/dbadmin/external/dto/PaginatedResult.java +++ b/src/main/java/tech/ailef/dbadmin/external/dto/PaginatedResult.java @@ -2,8 +2,6 @@ package tech.ailef.dbadmin.external.dto; import java.util.List; -import tech.ailef.dbadmin.external.dbmapping.DbObject; - public class PaginatedResult { private PaginationInfo pagination; diff --git a/src/main/java/tech/ailef/dbadmin/internal/model/UserSetting.java b/src/main/java/tech/ailef/dbadmin/internal/model/UserSetting.java new file mode 100644 index 0000000..700b9cb --- /dev/null +++ b/src/main/java/tech/ailef/dbadmin/internal/model/UserSetting.java @@ -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; + } + +} diff --git a/src/main/java/tech/ailef/dbadmin/internal/repository/CustomActionRepositoryImpl.java b/src/main/java/tech/ailef/dbadmin/internal/repository/CustomActionRepositoryImpl.java index 176dce5..467b307 100644 --- a/src/main/java/tech/ailef/dbadmin/internal/repository/CustomActionRepositoryImpl.java +++ b/src/main/java/tech/ailef/dbadmin/internal/repository/CustomActionRepositoryImpl.java @@ -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 findActions(String table, String actionType, String itemId, PageRequest page) { diff --git a/src/main/java/tech/ailef/dbadmin/internal/repository/ActionRepository.java b/src/main/java/tech/ailef/dbadmin/internal/repository/UserActionRepository.java similarity index 80% rename from src/main/java/tech/ailef/dbadmin/internal/repository/ActionRepository.java rename to src/main/java/tech/ailef/dbadmin/internal/repository/UserActionRepository.java index eb64f46..f719561 100644 --- a/src/main/java/tech/ailef/dbadmin/internal/repository/ActionRepository.java +++ b/src/main/java/tech/ailef/dbadmin/internal/repository/UserActionRepository.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository; import tech.ailef.dbadmin.internal.model.UserAction; @Repository -public interface ActionRepository extends JpaRepository, CustomActionRepository { +public interface UserActionRepository extends JpaRepository, CustomActionRepository { public List findAllByOnTableAndActionTypeAndPrimaryKey(String table, String actionType, String primaryKey, PageRequest pageRequest); } diff --git a/src/main/java/tech/ailef/dbadmin/internal/repository/UserSettingsRepository.java b/src/main/java/tech/ailef/dbadmin/internal/repository/UserSettingsRepository.java new file mode 100644 index 0000000..f129d1a --- /dev/null +++ b/src/main/java/tech/ailef/dbadmin/internal/repository/UserSettingsRepository.java @@ -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 { + +} diff --git a/src/main/java/tech/ailef/dbadmin/internal/service/UserActionService.java b/src/main/java/tech/ailef/dbadmin/internal/service/UserActionService.java index 2721f8a..cbd0a0c 100644 --- a/src/main/java/tech/ailef/dbadmin/internal/service/UserActionService.java +++ b/src/main/java/tech/ailef/dbadmin/internal/service/UserActionService.java @@ -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;