Skip to content

RHCLOUD-46150 - Event table normalization #4289

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

Open
bonscji1 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

RHCLOUD-46150 - Event table normalization #4289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d2b298
Event table normalization - query adjustments - unleash toggle - cove…
Apr 1, 2026
ccb04a6
Test update - code cleanup
Apr 2, 2026
e72d9df
Normalized logic path now correctly populates required event fields
Apr 8, 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
10 changes: 10 additions & 0 deletions backend/src/main/java/com/redhat/cloud/notifications/config/BackendConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public class BackendConfig {
private String sourcesOidcAuthToggle;
private String toggleUseBetaTemplatesEnabled;
private String showHiddenEventTypesToggle;
private String normalizedQueriesToggle;

@ConfigProperty(name = UNLEASH, defaultValue = "false")
@Deprecated(forRemoval = true, since = "To be removed when we're done migrating to Unleash in all environments")
Expand Down Expand Up @@ -130,6 +131,7 @@ void postConstruct() {
sourcesOidcAuthToggle = toggleRegistry.register("sources-oidc-auth", true);
toggleUseBetaTemplatesEnabled = toggleRegistry.register("use-beta-templates", true);
showHiddenEventTypesToggle = toggleRegistry.register("show-hidden-event-types", true);
normalizedQueriesToggle = toggleRegistry.register("normalized-queries", true);
}

void logConfigAtStartup(@Observes Startup event) {
Expand Down Expand Up @@ -318,4 +320,12 @@ public boolean isShowHiddenEventTypes(String orgId) {
return false;
}
}

public boolean isNormalizedQueriesEnabled(String orgId) {
if (unleashEnabled) {
return unleash.isEnabled(normalizedQueriesToggle, buildUnleashContextWithOrgId(orgId), false);
} else {
return false;
}
}
}
93 changes: 72 additions & 21 deletions ...ain/java/com/redhat/cloud/notifications/db/repositories/DrawerNotificationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.redhat.cloud.notifications.db.repositories;

import com.redhat.cloud.notifications.config.BackendConfig;
import com.redhat.cloud.notifications.db.Query;
import com.redhat.cloud.notifications.db.Sort;
import com.redhat.cloud.notifications.models.DrawerEntryPayload;
Expand All @@ -23,6 +24,9 @@ public class DrawerNotificationRepository {
@Inject
EntityManager entityManager;

@Inject
BackendConfig backendConfig;

@Transactional
public Integer updateReadStatus(String orgId, String username, Set<UUID> notificationIds, Boolean readStatus) {

Expand All @@ -40,13 +44,32 @@ public Integer updateReadStatus(String orgId, String username, Set<UUID> notific
public List<DrawerEntryPayload> getNotifications(String orgId, String username, Set<UUID> bundleIds, Set<UUID> appIds, Set<UUID> eventTypeIds,
LocalDateTime startDate, LocalDateTime endDate, Boolean readStatus, Query query) {

Optional<Sort> sort = Sort.getSort(query, "created:DESC", DrawerNotification.SORT_FIELDS);

String hql = "SELECT dn.id.eventId, dn.read, " +
"dn.event.bundleDisplayName, dn.event.applicationDisplayName, dn.event.eventTypeDisplayName, dn.created, dn.event.renderedDrawerNotification, bundle.name, dn.event.severity "
+ "FROM DrawerNotification dn join Bundle bundle on dn.event.bundleId = bundle.id where dn.id.orgId = :orgId and dn.id.userId = :userid";
boolean useNormalized = backendConfig.isNormalizedQueriesEnabled(orgId);
Optional<Sort> sort = Sort.getSort(query, "created:DESC", DrawerNotification.getSortFields(useNormalized));

// Calculate once for reuse
boolean bundlesNotEmpty = bundleIds != null && !bundleIds.isEmpty();
boolean applicationsNotEmpty = appIds != null && !appIds.isEmpty();
boolean eventTypesNotEmpty = eventTypeIds != null && !eventTypeIds.isEmpty();

String hql;
if (useNormalized) {
hql = "SELECT dn.id.eventId, dn.read, " +
"bundle.displayName, app.displayName, et.displayName, dn.created, dn.event.renderedDrawerNotification, bundle.name, dn.event.severity " +
"FROM DrawerNotification dn " +
"JOIN dn.event e " +
"JOIN e.eventType et " +
"JOIN et.application app " +
"JOIN app.bundle bundle " +
"WHERE dn.id.orgId = :orgId AND dn.id.userId = :userid";
} else {
hql = "SELECT dn.id.eventId, dn.read, " +
"dn.event.bundleDisplayName, dn.event.applicationDisplayName, dn.event.eventTypeDisplayName, dn.created, dn.event.renderedDrawerNotification, bundle.name, dn.event.severity " +
"FROM DrawerNotification dn JOIN Bundle bundle ON dn.event.bundleId = bundle.id " +
"WHERE dn.id.orgId = :orgId AND dn.id.userId = :userid";
}

hql = addHqlConditions(hql, bundleIds, appIds, eventTypeIds, startDate, endDate, readStatus);
hql = addHqlConditions(hql, useNormalized, bundlesNotEmpty, applicationsNotEmpty, eventTypesNotEmpty, startDate, endDate, readStatus);
if (sort.isPresent()) {
hql += getOrderBy(sort.get());
}
Expand All @@ -65,18 +88,41 @@ public List<DrawerEntryPayload> getNotifications(String orgId, String username,

public Long count(String orgId, String username, Set<UUID> bundleIds, Set<UUID> appIds, Set<UUID> eventTypeIds,
LocalDateTime startDate, LocalDateTime endDate, Boolean readStatus) {
String hql = "SELECT count(dn.id.userId) FROM DrawerNotification dn "
+ "where dn.id.orgId = :orgId and dn.id.userId = :userid";
boolean useNormalized = backendConfig.isNormalizedQueriesEnabled(orgId);

hql = addHqlConditions(hql, bundleIds, appIds, eventTypeIds, startDate, endDate, readStatus);
// Calculate once for reuse
boolean bundlesNotEmpty = bundleIds != null && !bundleIds.isEmpty();
boolean applicationsNotEmpty = appIds != null && !appIds.isEmpty();
boolean eventTypesNotEmpty = eventTypeIds != null && !eventTypeIds.isEmpty();

String hql = "SELECT count(dn.id.userId) FROM DrawerNotification dn ";

// Add selective JOINs for normalized approach - only join what we need
if (useNormalized && (bundlesNotEmpty || applicationsNotEmpty || eventTypesNotEmpty)) {
hql += "JOIN dn.event e ";
hql += "JOIN e.eventType et ";

if (bundlesNotEmpty || applicationsNotEmpty) {
hql += "JOIN et.application app ";
}

if (bundlesNotEmpty) {
hql += "JOIN app.bundle bundle ";
}
}

hql += "WHERE dn.id.orgId = :orgId AND dn.id.userId = :userid";

hql = addHqlConditions(hql, useNormalized, bundlesNotEmpty, applicationsNotEmpty, eventTypesNotEmpty, startDate, endDate, readStatus);

TypedQuery<Long> typedQuery = entityManager.createQuery(hql, Long.class);
setQueryParams(typedQuery, orgId, username, bundleIds, appIds, eventTypeIds, startDate, endDate, readStatus);

return typedQuery.getSingleResult();
}

private static String addHqlConditions(String hql, Set<UUID> bundleIds, Set<UUID> appIds, Set<UUID> eventTypeIds,
private static String addHqlConditions(String hql, boolean useNormalized,
boolean bundlesNotEmpty, boolean applicationsNotEmpty, boolean eventTypesNotEmpty,
LocalDateTime startDate, LocalDateTime endDate, Boolean readStatus) {

if (startDate != null && endDate != null) {
Expand All @@ -91,23 +137,28 @@ private static String addHqlConditions(String hql, Set<UUID> bundleIds, Set<UUID
hql += " AND dn.read = :readStatus";
}

boolean eventTypesNotEmpty = (eventTypeIds != null && !eventTypeIds.isEmpty());
boolean applicationsNotEmpty = (appIds != null && !appIds.isEmpty());
boolean bundlesNotEmpty = (bundleIds != null && !bundleIds.isEmpty());

if (eventTypesNotEmpty ||
applicationsNotEmpty ||
bundlesNotEmpty) {

if (!useNormalized) {
// add org id as criteria on event table to allow usage of
// index ix_event_org_id_bundle_id_application_id_event_type_display_nam
hql += " AND dn.event.orgId = :orgId";
}

if (eventTypesNotEmpty) {
if (eventTypesNotEmpty) {
if (useNormalized) {
hql += " AND et.id IN (:eventTypeIds)";
} else {
hql += " AND dn.event.eventType.id IN (:eventTypeIds)";
} else if (applicationsNotEmpty) {
}
} else if (applicationsNotEmpty) {
if (useNormalized) {
hql += " AND app.id IN (:appIds)";
} else {
hql += " AND dn.event.applicationId IN (:appIds)";
} else if (bundlesNotEmpty) {
}
} else if (bundlesNotEmpty) {
if (useNormalized) {
hql += " AND bundle.id IN (:bundleIds)";
} else {
hql += " AND dn.event.bundleId IN (:bundleIds)";
}
}
Expand Down
Loading
Loading