Vitor-Avila commented on code in PR #44992:
URL: https://github.com/apache/superset/pull/44992#discussion_r4215527223
##########
superset/daos/report.py:
##########
@@ -392,3 +404,187 @@ def bulk_delete_logs(model: ReportSchedule, from_date:
datetime) -> int | None:
)
.delete(synchronize_session="fetch")
)
+
+ @staticmethod
+ def find_with_email_recipients() -> list[ReportSchedule]:
+ """
+ Find every schedule (active or not) with at least one e-mail recipient.
+ """
+ return (
+ db.session.query(ReportSchedule)
+ .join(
+ ReportRecipients,
+ ReportRecipients.report_schedule_id == ReportSchedule.id,
+ )
+ .filter(ReportRecipients.type == ReportRecipientType.EMAIL)
+ .options(selectinload(ReportSchedule.recipients))
+ .distinct()
+ .all()
+ )
+
+ @staticmethod
+ def find_by_type(report_type: ReportScheduleType) -> list[ReportSchedule]:
+ """
+ Find every schedule (active or not) of the given type.
+ """
+ return (
+ db.session.query(ReportSchedule)
+ .filter(ReportSchedule.type == report_type)
+ .all()
+ )
+
+
+class ReportConfigDAO:
+ """
+ Access to the global Alerts & Reports configuration in ``key_value``.
+
+ One versioned document stores only settings explicitly saved by an admin.
+ Missing settings resolve to legacy application config or feature flag
values.
+ """
+
+ VERSION: Literal[1] = 1
+
+ @staticmethod
+ def get_stored_values() -> dict[str, Any]:
+ """
+ Return explicitly saved settings from the versioned document.
+
+ A stored null is distinct from a missing setting key.
+ """
+ document: ReportConfigDocument | None = KeyValueDAO.get_value(
+ KeyValueResource.ALERT_REPORT_CONFIG,
+ FIXED_RESOURCE_KEYS[KeyValueResource.ALERT_REPORT_CONFIG],
+ JsonKeyValueCodec(),
+ )
+ if document is None:
+ return {}
+ return dict(document["settings"])
+
+ @staticmethod
+ def get_fallback_value(key: ReportConfigKey) -> Any:
+ """Return the legacy application config / feature flag value for
``key``."""
+ if key == ReportConfigKey.ALERTS_ATTACH_REPORTS:
+ return
feature_flag_manager.is_feature_enabled("ALERTS_ATTACH_REPORTS")
+ if key == ReportConfigKey.DATE_FORMAT_IN_EMAIL_SUBJECT:
+ return feature_flag_manager.is_feature_enabled(
+ "DATE_FORMAT_IN_EMAIL_SUBJECT"
+ )
+ if key in (
+ ReportConfigKey.ALERT_MINIMUM_INTERVAL,
+ ReportConfigKey.REPORT_MINIMUM_INTERVAL,
+ ):
+ value = current_app.config.get(key.upper(), 0)
+ return value() if callable(value) else value
+ # These are new configs, no legacy fallback
+ if key == ReportConfigKey.LIMIT_RECIPIENTS_TO_USERS:
+ return False
+ if key == ReportConfigKey.ALLOWED_EMAIL_DOMAINS:
+ return []
+ return None
+
+ @staticmethod
+ def get_effective_value(key: ReportConfigKey) -> Any:
+ """
+ Return the value in effect for ``key``: the stored value when present,
+ otherwise the legacy fallback.
+ """
+ if key in (stored := ReportConfigDAO.get_stored_values()):
+ return stored[key]
+ return ReportConfigDAO.get_fallback_value(key)
+
+ @staticmethod
+ def get_effective_config() -> dict[str, Any]:
+ """Return the value in effect for every ``ReportConfigKey``."""
+ stored = ReportConfigDAO.get_stored_values()
+ return {
+ key.value: (
+ stored[key]
+ if key in stored
+ else ReportConfigDAO.get_fallback_value(key)
+ )
+ for key in ReportConfigKey
+ }
+
+ @staticmethod
+ def upsert(values: dict[str, Any]) -> None:
+ """
+ Merge submitted settings into the shared document without committing.
+ Only absent keys inherit application configuration; null stays
explicit.
+ """
+ stored = ReportConfigDAO.get_stored_values()
Review Comment:
while this is technically true, it's also not something specific to this
SIP. This would be true for many flows in Superset, so I'll ignore it for now.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
