Skip to content
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

feat(): jdbc custom dashboard implementation #6607

Merged
merged 4 commits into from
Jan 6, 2025
Merged

feat(): jdbc custom dashboard implementation #6607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2525bc2
WIP: commit to be edited
Skraye Dec 30, 2024
ca04f8c
feat(*): finished implementation for custom dashboard in JDBC
Skraye Dec 31, 2024
4acfd72
chore: disable metricRepository all() test because of leap year
Skraye Dec 31, 2024
a69cf58
chore(): PR review
Skraye Jan 6, 2025
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
3 changes: 2 additions & 1 deletion core/src/main/java/io/kestra/plugin/core/dashboard/data/Executions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public enum Fields {
DURATION,
LABELS,
START_DATE,
END_DATE
END_DATE,
TRIGGER_EXECUTION_ID
}
}
1 change: 1 addition & 0 deletions core/src/test/java/io/kestra/core/repositories/AbstractMetricRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import io.micronaut.data.model.Pageable;
import io.kestra.core.junit.annotations.KestraTest;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import java.time.Duration;
Expand Down
8 changes: 6 additions & 2 deletions jdbc-h2/src/main/java/io/kestra/repository/h2/H2DashboardRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@

import io.kestra.core.events.CrudEvent;
import io.kestra.core.models.dashboards.Dashboard;
import io.kestra.core.repositories.QueryBuilderInterface;
import io.kestra.jdbc.repository.AbstractJdbcDashboardRepository;
import io.micronaut.context.event.ApplicationEventPublisher;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
import org.jooq.Condition;

import java.util.List;

@Singleton
@H2RepositoryEnabled
public class H2DashboardRepository extends AbstractJdbcDashboardRepository {
@Inject
public H2DashboardRepository(@Named("dashboards") H2Repository<Dashboard> repository,
ApplicationEventPublisher<CrudEvent<Dashboard>> eventPublisher) {
super(repository, eventPublisher);
ApplicationEventPublisher<CrudEvent<Dashboard>> eventPublisher,
List<QueryBuilderInterface<?>> queryBuilders) {
super(repository, eventPublisher, queryBuilders);
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions jdbc-h2/src/main/java/io/kestra/repository/h2/H2ExecutionRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import io.kestra.core.models.executions.Execution;
import io.kestra.jdbc.repository.AbstractJdbcExecutionRepository;
import io.kestra.jdbc.runner.AbstractJdbcExecutorStateStorage;
import io.kestra.jdbc.services.JdbcFilterService;
import io.micronaut.context.ApplicationContext;
import jakarta.inject.Inject;
import jakarta.inject.Named;
Expand All @@ -17,8 +18,9 @@ public class H2ExecutionRepository extends AbstractJdbcExecutionRepository {
@Inject
public H2ExecutionRepository(@Named("executions") H2Repository<Execution> repository,
ApplicationContext applicationContext,
AbstractJdbcExecutorStateStorage executorStateStorage) {
super(repository, applicationContext, executorStateStorage);
AbstractJdbcExecutorStateStorage executorStateStorage,
JdbcFilterService filterService) {
super(repository, applicationContext, executorStateStorage, filterService);
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions jdbc-h2/src/main/java/io/kestra/repository/h2/H2LogRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import io.kestra.core.models.executions.LogEntry;
import io.kestra.jdbc.repository.AbstractJdbcLogRepository;
import io.kestra.jdbc.services.JdbcFilterService;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
Expand All @@ -13,8 +14,9 @@
@H2RepositoryEnabled
public class H2LogRepository extends AbstractJdbcLogRepository {
@Inject
public H2LogRepository(@Named("logs") H2Repository<LogEntry> repository) {
super(repository);
public H2LogRepository(@Named("logs") H2Repository<LogEntry> repository,
JdbcFilterService filterService) {
super(repository, filterService);
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions jdbc-h2/src/main/java/io/kestra/repository/h2/H2MetricRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import io.kestra.core.models.executions.MetricEntry;
import io.kestra.jdbc.repository.AbstractJdbcMetricRepository;
import io.kestra.jdbc.services.JdbcFilterService;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
Expand All @@ -10,8 +11,9 @@
@H2RepositoryEnabled
public class H2MetricRepository extends AbstractJdbcMetricRepository {
@Inject
public H2MetricRepository(@Named("metrics") H2Repository<MetricEntry> repository) {
super(repository);
public H2MetricRepository(@Named("metrics") H2Repository<MetricEntry> repository,
JdbcFilterService filterService) {
super(repository, filterService);
}
}

2 changes: 1 addition & 1 deletion jdbc-h2/src/main/resources/migrations/h2/V1_25__dashboard.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CREATE TABLE IF NOT EXISTS dashboards (
"key" VARCHAR(250) NOT NULL PRIMARY KEY,
Skraye marked this conversation as resolved.
Show resolved Hide resolved
"key" VARCHAR(250) NOT NULL PRIMARY KEY,
"value" TEXT NOT NULL,
"deleted" BOOL NOT NULL GENERATED ALWAYS AS (JQ_BOOLEAN("value", '.deleted')),
"tenant_id" VARCHAR(250) NOT NULL GENERATED ALWAYS AS (JQ_STRING("value", '.tenantId')),
Expand Down
8 changes: 8 additions & 0 deletions jdbc-h2/src/main/resources/migrations/h2/V1_27__dashboard_tenant_nullable.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
DROP INDEX IF EXISTS dashboards_tenant;
DROP INDEX IF EXISTS dashboards_id;

ALTER TABLE dashboards DROP COLUMN "tenant_id";
ALTER TABLE dashboards ADD COLUMN "tenant_id" VARCHAR(250) GENERATED ALWAYS AS (JQ_STRING("value", '.tenantId'));

CREATE INDEX IF NOT EXISTS dashboards_tenant ON dashboards ("deleted", "tenant_id");
CREATE INDEX IF NOT EXISTS dashboards_id ON dashboards ("id", "deleted", "tenant_id");
8 changes: 6 additions & 2 deletions jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlDashboardRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@

import io.kestra.core.events.CrudEvent;
import io.kestra.core.models.dashboards.Dashboard;
import io.kestra.core.repositories.QueryBuilderInterface;
import io.kestra.jdbc.repository.AbstractJdbcDashboardRepository;
import io.micronaut.context.event.ApplicationEventPublisher;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
import org.jooq.Condition;

import java.util.List;

@Singleton
@MysqlRepositoryEnabled
public class MysqlDashboardRepository extends AbstractJdbcDashboardRepository {
@Inject
public MysqlDashboardRepository(@Named("dashboards") MysqlRepository<Dashboard> repository,
ApplicationEventPublisher<CrudEvent<Dashboard>> eventPublisher) {
super(repository, eventPublisher);
ApplicationEventPublisher<CrudEvent<Dashboard>> eventPublisher,
List<QueryBuilderInterface<?>> queryBuilders) {
super(repository, eventPublisher, queryBuilders);
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlExecutionRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import io.kestra.core.models.executions.Execution;
import io.kestra.jdbc.repository.AbstractJdbcExecutionRepository;
import io.kestra.jdbc.runner.AbstractJdbcExecutorStateStorage;
import io.kestra.jdbc.services.JdbcFilterService;
import io.micronaut.context.ApplicationContext;
import jakarta.inject.Inject;
import jakarta.inject.Named;
Expand All @@ -19,8 +20,9 @@ public class MysqlExecutionRepository extends AbstractJdbcExecutionRepository {
@Inject
public MysqlExecutionRepository(@Named("executions") MysqlRepository<Execution> repository,
ApplicationContext applicationContext,
AbstractJdbcExecutorStateStorage executorStateStorage) {
super(repository, applicationContext, executorStateStorage);
AbstractJdbcExecutorStateStorage executorStateStorage,
JdbcFilterService filterService) {
super(repository, applicationContext, executorStateStorage, filterService);
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlLogRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import io.kestra.core.models.executions.LogEntry;
import io.kestra.jdbc.repository.AbstractJdbcLogRepository;
import io.kestra.jdbc.services.JdbcFilterService;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
Expand All @@ -13,8 +14,9 @@
@MysqlRepositoryEnabled
public class MysqlLogRepository extends AbstractJdbcLogRepository {
@Inject
public MysqlLogRepository(@Named("logs") MysqlRepository<LogEntry> repository) {
super(repository);
public MysqlLogRepository(@Named("logs") MysqlRepository<LogEntry> repository,
JdbcFilterService filterService) {
super(repository, filterService);
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlMetricRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import io.kestra.core.models.executions.MetricEntry;
import io.kestra.jdbc.repository.AbstractJdbcMetricRepository;
import io.kestra.jdbc.services.JdbcFilterService;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
Expand All @@ -13,8 +14,9 @@
@MysqlRepositoryEnabled
public class MysqlMetricRepository extends AbstractJdbcMetricRepository {
@Inject
public MysqlMetricRepository(@Named("metrics") MysqlRepository<MetricEntry> repository) {
super(repository);
public MysqlMetricRepository(@Named("metrics") MysqlRepository<MetricEntry> repository,
JdbcFilterService filterService) {
super(repository, filterService);
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions jdbc-mysql/src/main/resources/migrations/mysql/V1_27__dashboard_tenant_nullable.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE dashboards
MODIFY COLUMN `tenant_id` VARCHAR(250) GENERATED ALWAYS AS (value ->> '$.tenantId') STORED;
8 changes: 6 additions & 2 deletions jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresDashboardRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@

import io.kestra.core.events.CrudEvent;
import io.kestra.core.models.dashboards.Dashboard;
import io.kestra.core.repositories.QueryBuilderInterface;
import io.kestra.jdbc.repository.AbstractJdbcDashboardRepository;
import io.micronaut.context.event.ApplicationEventPublisher;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
import org.jooq.Condition;

import java.util.List;

@Singleton
@PostgresRepositoryEnabled
public class PostgresDashboardRepository extends AbstractJdbcDashboardRepository {
@Inject
public PostgresDashboardRepository(@Named("dashboards") PostgresRepository<Dashboard> repository,
ApplicationEventPublisher<CrudEvent<Dashboard>> eventPublisher) {
super(repository, eventPublisher);
ApplicationEventPublisher<CrudEvent<Dashboard>> eventPublisher,
List<QueryBuilderInterface<?>> queryBuilders) {
super(repository, eventPublisher, queryBuilders);
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresExecutionRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import io.kestra.core.models.flows.State;
import io.kestra.jdbc.repository.AbstractJdbcExecutionRepository;
import io.kestra.jdbc.runner.AbstractJdbcExecutorStateStorage;
import io.kestra.jdbc.services.JdbcFilterService;
import io.micronaut.context.ApplicationContext;
import jakarta.inject.Inject;
import jakarta.inject.Named;
Expand All @@ -22,8 +23,9 @@ public class PostgresExecutionRepository extends AbstractJdbcExecutionRepository
@Inject
public PostgresExecutionRepository(@Named("executions") PostgresRepository<Execution> repository,
ApplicationContext applicationContext,
AbstractJdbcExecutorStateStorage executorStateStorage) {
super(repository, applicationContext, executorStateStorage);
AbstractJdbcExecutorStateStorage executorStateStorage,
JdbcFilterService filterService) {
super(repository, applicationContext, executorStateStorage, filterService);
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresLogRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import io.kestra.core.models.executions.LogEntry;
import io.kestra.jdbc.repository.AbstractJdbcLogRepository;
import io.kestra.jdbc.services.JdbcFilterService;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
Expand All @@ -18,8 +19,9 @@
@PostgresRepositoryEnabled
public class PostgresLogRepository extends AbstractJdbcLogRepository {
@Inject
public PostgresLogRepository(@Named("logs") PostgresRepository<LogEntry> repository) {
super(repository);
public PostgresLogRepository(@Named("logs") PostgresRepository<LogEntry> repository,
JdbcFilterService filterService) {
super(repository, filterService);
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresMetricRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import io.kestra.core.models.executions.MetricEntry;
import io.kestra.jdbc.repository.AbstractJdbcMetricRepository;
import io.kestra.jdbc.services.JdbcFilterService;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
Expand All @@ -10,8 +11,9 @@
@PostgresRepositoryEnabled
public class PostgresMetricRepository extends AbstractJdbcMetricRepository {
@Inject
public PostgresMetricRepository(@Named("metrics") PostgresRepository<MetricEntry> repository) {
super(repository);
public PostgresMetricRepository(@Named("metrics") PostgresRepository<MetricEntry> repository,
JdbcFilterService filterService) {
super(repository, filterService);
}
}

17 changes: 14 additions & 3 deletions jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcDashboardRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,20 @@
import io.kestra.core.models.dashboards.charts.DataChart;
import io.kestra.core.repositories.ArrayListTotal;
import io.kestra.core.repositories.DashboardRepositoryInterface;
import io.kestra.core.repositories.QueryBuilderInterface;
import io.micronaut.context.event.ApplicationEventPublisher;
import io.micronaut.data.model.Pageable;
import jakarta.validation.ConstraintViolationException;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.NotImplementedException;
import org.jooq.*;
import org.jooq.impl.DSL;

import java.io.IOException;
import java.time.Instant;
import java.time.ZonedDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

Expand All @@ -29,6 +31,8 @@ public abstract class AbstractJdbcDashboardRepository extends AbstractJdbcReposi
protected io.kestra.jdbc.AbstractJdbcRepository<Dashboard> jdbcRepository;
private final ApplicationEventPublisher<CrudEvent<Dashboard>> eventPublisher;

List<QueryBuilderInterface<?>> queryBuilders;

@Override
public Optional<Dashboard> get(String tenantId, String id) {
return jdbcRepository
Expand Down Expand Up @@ -129,11 +133,18 @@ public Dashboard delete(String tenantId, String id) {

@Override
public <F extends Enum<F>> ArrayListTotal<Map<String, Object>> generate(String tenantId, DataChart<?, DataFilter<F, ? extends ColumnDescriptor<F>>> dataChart, ZonedDateTime startDate, ZonedDateTime endDate, Pageable pageable) throws IOException {
throw new NotImplementedException();
Map<Class<? extends QueryBuilderInterface<?>>, QueryBuilderInterface<?>> queryBuilderByHandledFields = new HashMap<>();

QueryBuilderInterface<F> queryBuilder = (QueryBuilderInterface<F>) queryBuilderByHandledFields.computeIfAbsent(
dataChart.getData().repositoryClass(),
clazz -> queryBuilders.stream().filter(b -> clazz.isAssignableFrom(b.getClass())).findFirst().orElseThrow(() -> new UnsupportedOperationException("No query builder found for " + clazz))
);

return queryBuilder.fetchData(tenantId, dataChart.getData(), startDate, endDate, pageable);
}

@Override
public Boolean isEnabled() {
return false;
return true;
}
}
Loading
Loading