From 5a9590dfad2ed47f0e323d0666bde42d87892d8d Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Tue, 25 Oct 2022 10:49:06 +0200
Subject: [PATCH] MDL-76073 badges: badge RB entity should have nullable
 callbacks

---
 .../reportbuilder/local/entities/badge.php    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/badges/classes/reportbuilder/local/entities/badge.php b/badges/classes/reportbuilder/local/entities/badge.php
index 339d5404358..9fa76e9cbb2 100644
--- a/badges/classes/reportbuilder/local/entities/badge.php
+++ b/badges/classes/reportbuilder/local/entities/badge.php
@@ -134,7 +134,9 @@ class badge extends base {
             ->set_disabled_aggregation_all()
             ->add_callback(static function($badgeid): string {
                 global $PAGE;
-
+                if (!$badgeid) {
+                    return '';
+                }
                 $badge = new \core_badges\badge($badgeid);
 
                 $renderer = $PAGE->get_renderer('core_badges');
@@ -156,7 +158,10 @@ class badge extends base {
             ->add_field($DB->sql_cast_to_char("{$badgealias}.imagecaption"), 'imagecaption')
             ->add_fields(context_helper::get_preload_record_columns_sql($contextalias))
             ->set_disabled_aggregation_all()
-            ->add_callback(static function(int $badgeid, stdClass $badge): string {
+            ->add_callback(static function(?int $badgeid, stdClass $badge): string {
+                if (!$badgeid) {
+                    return '';
+                }
                 if ($badge->type == BADGE_TYPE_SITE) {
                     $context = context_system::instance();
                 } else {
@@ -180,7 +185,7 @@ class badge extends base {
             ->set_is_sortable(true)
             ->add_callback(static function($language): string {
                 $languages = get_string_manager()->get_list_of_languages();
-                return $languages[$language] ?? $language;
+                return $languages[$language] ?? $language ?? '';
             });
 
         // Version.
@@ -205,7 +210,7 @@ class badge extends base {
             ->add_field("{$badgealias}.status")
             ->set_is_sortable(true)
             ->add_callback(static function($status): string {
-                return get_string("badgestatus_{$status}", 'core_badges');
+                return $status ? get_string("badgestatus_{$status}", 'core_badges') : '';
             });
 
         // Expiry date/period.
@@ -216,11 +221,13 @@ class badge extends base {
         ))
             ->add_joins($this->get_joins())
             ->set_type(column::TYPE_TIMESTAMP)
-            ->add_fields("{$badgealias}.expiredate, {$badgealias}.expireperiod")
+            ->add_fields("{$badgealias}.expiredate, {$badgealias}.expireperiod, {$badgealias}.id")
             ->set_is_sortable(true, ["{$badgealias}.expiredate", "{$badgealias}.expireperiod"])
             ->set_disabled_aggregation_all()
-            ->add_callback(static function(int $expiredate, stdClass $badge): string {
-                if ($expiredate) {
+            ->add_callback(static function(?int $expiredate, stdClass $badge): string {
+                if (!$badge->id) {
+                    return '';
+                } else if ($expiredate) {
                     return userdate($expiredate);
                 } else if ($badge->expireperiod) {
                     return format_time($badge->expireperiod);