Skip to content

Commit c6d098f

Browse files
feat[backend](updated filters and rules): forced filters adn rules to follow id convention of system owned rules/filters
1 parent bf78f42 commit c6d098f

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

backend/src/main/java/com/park/utmstack/repository/logstash_filter/UtmLogstashFilterRepository.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public interface UtmLogstashFilterRepository extends JpaRepository<UtmLogstashFi
2727

2828
Optional<UtmLogstashFilter> findOneByModuleName(String moduleName);
2929

30+
Optional<UtmLogstashFilter> findFirstBySystemOwnerIsTrueOrderByIdDesc();
31+
3032
@Query("select ulf from UtmLogstashFilter ulf where ulf.id in (:filterList) and ulf.systemOwner=false")
3133
List<UtmLogstashFilter> findAllByListOfId(@Param("filterList") List<Long> filterList);
3234

backend/src/main/java/com/park/utmstack/service/DefinitionSyncService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ private Set<String> syncFilters() {
8989
}
9090
} else {
9191
UtmLogstashFilter filter = new UtmLogstashFilter();
92+
filter.setId(filterService.getSystemSequenceNextValue());
9293
filter.setModuleName(moduleName);
9394
filter.setFilterName(moduleName + " Filter");
9495
filter.setLogstashFilter(content);
@@ -141,7 +142,7 @@ private Set<String> syncRules() {
141142
if (ruleOpt.isPresent()) {
142143
ruleDto.setId(ruleOpt.get().getId());
143144
} else {
144-
ruleDto.setId(rulesRepository.getNextId());
145+
ruleDto.setId(rulesService.getSystemSequenceNextValue());
145146
}
146147

147148
ruleDto.setName(ruleYaml.getName());

backend/src/main/java/com/park/utmstack/service/logstash_filter/UtmLogstashFilterService.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,10 @@ public List<UtmLogstashFilter> filtersByPipelineId(Long pipelineId) {
119119
throw new RuntimeException(ctx + ": " + e.getMessage());
120120
}
121121
}
122+
123+
public Long getSystemSequenceNextValue() {
124+
return logstashFilterRepository.findFirstBySystemOwnerIsTrueOrderByIdDesc()
125+
.map(filter -> filter.getId() + 1)
126+
.orElse(1L);
127+
}
122128
}

0 commit comments

Comments
 (0)