first commit

reportbuilder/tests/local/aggregation/avg_test.php

@@ -0,0 +1,117 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace core_reportbuilder\local\aggregation;
+
+use core_reportbuilder_testcase;
+use core_reportbuilder_generator;
+use core_reportbuilder\manager;
+use core_reportbuilder\local\report\column;
+use core_user\reportbuilder\datasource\users;
+use stdClass;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
+
+/**
+ * Unit tests for avg aggregation
+ *
+ * @package     core_reportbuilder
+ * @covers      \core_reportbuilder\local\aggregation\avg
+ * @copyright   2022 Paul Holden <paulh@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class avg_test extends core_reportbuilder_testcase {
+
+    /**
+     * Test aggregation when applied to column
+     */
+    public function test_column_aggregation(): void {
+        $this->resetAfterTest();
+
+        // Test subjects.
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'suspended' => 1]);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'suspended' => 0]);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // Report columns, aggregated/sorted by user suspended.
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:firstname']);
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:suspended',
+            'aggregation' => avg::get_class_name(),
+            'sortenabled' => 1,
+            'sortdirection' => SORT_DESC,
+        ]);
+
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertEquals([
+            ['Bob', '0.5'],
+            ['Admin', '0.0'],
+        ], array_map('array_values', $content));
+    }
+
+    /**
+     * Test aggregation when applied to column with callback
+     */
+    public function test_column_aggregation_with_callback(): void {
+        $this->resetAfterTest();
+
+        // Test subjects.
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'suspended' => 1]);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'suspended' => 0]);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // First column, sorted.
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:firstname', 'sortenabled' => 1]);
+
+        // This is the column we'll aggregate.
+        $generator->create_column(
+            ['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:suspended', 'aggregation' => avg::get_class_name()]
+        );
+
+        // Set callback to format the column (hack column definition to ensure callbacks are executed).
+        $instance = manager::get_report_from_persistent($report);
+        $instance->get_column('user:suspended')
+            ->set_type(column::TYPE_FLOAT)
+            ->set_callback(static function(float $value, stdClass $row, $arguments, ?string $aggregation): string {
+                // Simple callback to return the given value, and append aggregation type.
+                return number_format($value, 1) . " ({$aggregation})";
+            });
+
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertEquals([
+            [
+                'c0_firstname' => 'Admin',
+                'c1_suspended' => '0.0 (avg)',
+            ],
+            [
+                'c0_firstname' => 'Bob',
+                'c1_suspended' => '0.5 (avg)',
+            ],
+        ], $content);
+    }
+}

reportbuilder/tests/local/aggregation/count_test.php

@@ -0,0 +1,72 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace core_reportbuilder\local\aggregation;
+
+use core_reportbuilder_testcase;
+use core_reportbuilder_generator;
+use core_user\reportbuilder\datasource\users;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
+
+/**
+ * Unit tests for count aggregation
+ *
+ * @package     core_reportbuilder
+ * @covers      \core_reportbuilder\local\aggregation\base
+ * @covers      \core_reportbuilder\local\aggregation\count
+ * @copyright   2021 Paul Holden <paulh@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class count_test extends core_reportbuilder_testcase {
+
+    /**
+     * Test aggregation when applied to column
+     */
+    public function test_column_aggregation(): void {
+        $this->resetAfterTest();
+
+        // Test subjects.
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'lastname' => 'Apple']);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'lastname' => 'Banana']);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'lastname' => 'Banana']);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // Report columns, aggregated/sorted by user lastname.
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:firstname']);
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:lastname',
+            'aggregation' => count::get_class_name(),
+            'sortenabled' => 1,
+            'sortdirection' => SORT_DESC,
+        ]);
+
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertEquals([
+            ['Bob', 3],
+            ['Admin', 1],
+        ], array_map('array_values', $content));
+    }
+}

reportbuilder/tests/local/aggregation/countdistinct_test.php

@@ -0,0 +1,100 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace core_reportbuilder\local\aggregation;
+
+use core_reportbuilder_testcase;
+use core_reportbuilder_generator;
+use core_user\reportbuilder\datasource\users;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
+
+/**
+ * Unit tests for count distinct aggregation
+ *
+ * @package     core_reportbuilder
+ * @covers      \core_reportbuilder\local\aggregation\base
+ * @covers      \core_reportbuilder\local\aggregation\countdistinct
+ * @copyright   2021 Paul Holden <paulh@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class countdistinct_test extends core_reportbuilder_testcase {
+
+    /**
+     * Test aggregation when applied to column
+     */
+    public function test_column_aggregation(): void {
+        $this->resetAfterTest();
+
+        // Test subjects.
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'lastname' => 'Apple']);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'lastname' => 'Banana']);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'lastname' => 'Banana']);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // Report columns, aggregated/sorted by user lastname.
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:firstname']);
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:lastname',
+            'aggregation' => countdistinct::get_class_name(),
+            'sortenabled' => 1,
+            'sortdirection' => SORT_DESC,
+        ]);
+
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertEquals([
+            ['Bob', 2],
+            ['Admin', 1],
+        ], array_map('array_values', $content));
+    }
+
+    /**
+     * Test aggregation when applied to column with multiple fields
+     */
+    public function test_column_aggregation_multiple_fields(): void {
+        $this->resetAfterTest();
+
+        // Create a user with the same firstname as existing admin.
+        $this->getDataGenerator()->create_user(['firstname' => 'Admin', 'lastname' => 'Test']);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // This is the column we'll aggregate.
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:fullname',
+            'aggregation' => countdistinct::get_class_name(),
+        ]);
+
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertCount(1, $content);
+
+        // There are two distinct fullnames ("Admin User" & "Admin Test").
+        $countdistinct = reset($content[0]);
+        $this->assertEquals(2, $countdistinct);
+    }
+}

reportbuilder/tests/local/aggregation/groupconcat_test.php

@@ -0,0 +1,201 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace core_reportbuilder\local\aggregation;
+
+use core_badges_generator;
+use core_badges\reportbuilder\datasource\badges;
+use core_reportbuilder_testcase;
+use core_reportbuilder_generator;
+use core_reportbuilder\manager;
+use core_user\reportbuilder\datasource\users;
+use stdClass;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
+
+/**
+ * Unit tests for group concatenation aggregation
+ *
+ * @package     core_reportbuilder
+ * @covers      \core_reportbuilder\local\aggregation\base
+ * @covers      \core_reportbuilder\local\aggregation\groupconcat
+ * @copyright   2021 Paul Holden <paulh@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class groupconcat_test extends core_reportbuilder_testcase {
+
+    /**
+     * Test aggregation when applied to column
+     */
+    public function test_column_aggregation(): void {
+        $this->resetAfterTest();
+
+        // Test subjects.
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'lastname' => 'Banana']);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'lastname' => 'Apple']);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'lastname' => 'Banana']);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // Report columns, aggregated/sorted by user lastname.
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:firstname']);
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:lastname',
+            'aggregation' => groupconcat::get_class_name(),
+            'sortenabled' => 1,
+            'sortdirection' => SORT_ASC,
+        ]);
+
+        // Assert lastname column was aggregated, and itself also sorted predictably.
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertEquals([
+            ['Bob', 'Apple, Banana, Banana'],
+            ['Admin', 'User'],
+        ], array_map('array_values', $content));
+    }
+
+    /**
+     * Test aggregation when applied to column with multiple fields
+     */
+    public function test_column_aggregation_multiple_fields(): void {
+        $this->resetAfterTest();
+
+        $user = $this->getDataGenerator()->create_user(['firstname' => 'Adam', 'lastname' => 'Apple']);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // This is the column we'll aggregate.
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:fullnamewithlink',
+            'aggregation' => groupconcat::get_class_name(),
+        ]);
+
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertCount(1, $content);
+
+        // Ensure users are sorted predictably (Adam -> Admin).
+        [$userone, $usertwo] = explode(', ', reset($content[0]));
+        $this->assertStringContainsString(fullname($user, true), $userone);
+        $this->assertStringContainsString(fullname(get_admin(), true), $usertwo);
+    }
+
+    /**
+     * Test aggregation when applied to column with callback
+     */
+    public function test_column_aggregation_with_callback(): void {
+        $this->resetAfterTest();
+
+        // Test subjects.
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'confirmed' => 1]);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'confirmed' => 0]);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'confirmed' => 1]);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // First column, sorted.
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:firstname', 'sortenabled' => 1]);
+
+        // This is the column we'll aggregate.
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:confirmed',
+            'aggregation' => groupconcat::get_class_name(),
+        ]);
+
+        // Add callback to format the column.
+        $instance = manager::get_report_from_persistent($report);
+        $instance->get_column('user:confirmed')
+            ->add_callback(static function(string $value, stdClass $row, $arguments, ?string $aggregation): string {
+                // Simple callback to return the given value, and append aggregation type.
+                return "{$value} ({$aggregation})";
+            });
+
+        // Assert confirmed column was aggregated, and sorted predictably with callback applied.
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertEquals([
+            [
+                'c0_firstname' => 'Admin',
+                'c1_confirmed' => 'Yes (groupconcat)',
+            ],
+            [
+                'c0_firstname' => 'Bob',
+                'c1_confirmed' => 'No (groupconcat), Yes (groupconcat), Yes (groupconcat)',
+            ],
+        ], $content);
+    }
+
+    /**
+     * Test aggregation when applied to column with callback that expects/handles null values
+     */
+    public function test_datasource_aggregate_column_callback_with_null(): void {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        $userone = $this->getDataGenerator()->create_user(['description' => 'First user']);
+        $usertwo = $this->getDataGenerator()->create_user(['description' => 'Second user']);
+
+        /** @var core_badges_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_badges');
+
+        // Create course badge, issue to both users.
+        $badgeone = $generator->create_badge(['name' => 'First badge']);
+        $badgeone->issue($userone->id, true);
+        $badgeone->issue($usertwo->id, true);
+
+        // Create second badge, without issuing to anyone.
+        $badgetwo = $generator->create_badge(['name' => 'Second badge']);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Badges', 'source' => badges::class, 'default' => 0]);
+
+        // First column, sorted.
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'badge:name', 'sortenabled' => 1]);
+
+        // This is the column we'll aggregate.
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:description',
+            'aggregation' => groupconcat::get_class_name(),
+        ]);
+
+        // Assert description column was aggregated, with callbacks accounting for null values.
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertEquals([
+            [
+                'c0_name' => $badgeone->name,
+                'c1_description' => "{$userone->description}, {$usertwo->description}",
+            ],
+            [
+                'c0_name' => $badgetwo->name,
+                'c1_description' => '',
+            ],
+        ], $content);
+    }
+}

reportbuilder/tests/local/aggregation/groupconcatdistinct_test.php

@@ -0,0 +1,162 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace core_reportbuilder\local\aggregation;
+
+use core_reportbuilder_testcase;
+use core_reportbuilder_generator;
+use core_reportbuilder\manager;
+use core_reportbuilder\local\report\column;
+use core_user\reportbuilder\datasource\users;
+use stdClass;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
+
+/**
+ * Unit tests for group concatenation distinct aggregation
+ *
+ * @package     core_reportbuilder
+ * @covers      \core_reportbuilder\local\aggregation\base
+ * @covers      \core_reportbuilder\local\aggregation\groupconcatdistinct
+ * @copyright   2021 Paul Holden <paulh@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class groupconcatdistinct_test extends core_reportbuilder_testcase {
+
+    /**
+     * Test setup, we need to skip these tests on non-supported databases
+     */
+    public function setUp(): void {
+        global $DB;
+
+        if (!groupconcatdistinct::compatible(column::TYPE_TEXT)) {
+            $this->markTestSkipped('Distinct group concatenation not supported in ' . $DB->get_dbfamily());
+        }
+    }
+
+    /**
+     * Test aggregation when applied to column
+     */
+    public function test_column_aggregation(): void {
+        $this->resetAfterTest();
+
+        // Test subjects.
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'lastname' => 'Banana']);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'lastname' => 'Apple']);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'lastname' => 'Banana']);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // Report columns, aggregated/sorted by user lastname.
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:firstname']);
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:lastname',
+            'aggregation' => groupconcatdistinct::get_class_name(),
+            'sortenabled' => 1,
+            'sortdirection' => SORT_ASC,
+        ]);
+
+        // Assert lastname column was aggregated, and itself also sorted predictably.
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertEquals([
+            ['Bob', 'Apple, Banana'],
+            ['Admin', 'User'],
+        ], array_map('array_values', $content));
+    }
+
+    /**
+     * Test aggregation when applied to column with multiple fields
+     */
+    public function test_column_aggregation_multiple_fields(): void {
+        $this->resetAfterTest();
+
+        $user = $this->getDataGenerator()->create_user(['firstname' => 'Adam', 'lastname' => 'Apple']);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // This is the column we'll aggregate.
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:fullnamewithlink',
+            'aggregation' => groupconcatdistinct::get_class_name(),
+        ]);
+
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertCount(1, $content);
+
+        // Ensure users are sorted predictably (Adam -> Admin).
+        [$userone, $usertwo] = explode(', ', reset($content[0]));
+        $this->assertStringContainsString(fullname($user, true), $userone);
+        $this->assertStringContainsString(fullname(get_admin(), true), $usertwo);
+    }
+
+    /**
+     * Test aggregation when applied to column with callback
+     */
+    public function test_column_aggregation_with_callback(): void {
+        $this->resetAfterTest();
+
+        // Test subjects.
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'confirmed' => 1]);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'confirmed' => 0]);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'confirmed' => 1]);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // First column, sorted.
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:firstname', 'sortenabled' => 1]);
+
+        // This is the column we'll aggregate.
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:confirmed',
+            'aggregation' => groupconcatdistinct::get_class_name(),
+        ]);
+
+        // Add callback to format the column.
+        $instance = manager::get_report_from_persistent($report);
+        $instance->get_column('user:confirmed')
+            ->add_callback(static function(string $value, stdClass $row, $arguments, ?string $aggregation): string {
+                // Simple callback to return the given value, and append aggregation type.
+                return "{$value} ({$aggregation})";
+            });
+
+        // Assert confirmed column was aggregated, and sorted predictably with callback applied.
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertEquals([
+            [
+                'c0_firstname' => 'Admin',
+                'c1_confirmed' => 'Yes (groupconcatdistinct)',
+            ],
+            [
+                'c0_firstname' => 'Bob',
+                'c1_confirmed' => 'No (groupconcatdistinct), Yes (groupconcatdistinct)',
+            ],
+        ], $content);
+    }
+}

reportbuilder/tests/local/aggregation/max_test.php

@@ -0,0 +1,71 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace core_reportbuilder\local\aggregation;
+
+use core_reportbuilder_testcase;
+use core_reportbuilder_generator;
+use core_user\reportbuilder\datasource\users;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
+
+/**
+ * Unit tests for max aggregation
+ *
+ * @package     core_reportbuilder
+ * @covers      \core_reportbuilder\local\aggregation\base
+ * @covers      \core_reportbuilder\local\aggregation\max
+ * @copyright   2021 Paul Holden <paulh@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class max_test extends core_reportbuilder_testcase {
+
+    /**
+     * Test aggregation when applied to column
+     */
+    public function test_column_aggregation(): void {
+        $this->resetAfterTest();
+
+        // Test subjects.
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'suspended' => 1]);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'suspended' => 0]);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // Report columns, aggregated/sorted by user suspended.
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:firstname']);
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:suspended',
+            'aggregation' => max::get_class_name(),
+            'sortenabled' => 1,
+            'sortdirection' => SORT_DESC,
+        ]);
+
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertEquals([
+            ['Bob', 'Yes'],
+            ['Admin', 'No'],
+        ], array_map('array_values', $content));
+    }
+}

reportbuilder/tests/local/aggregation/min_test.php

@@ -0,0 +1,71 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace core_reportbuilder\local\aggregation;
+
+use core_reportbuilder_testcase;
+use core_reportbuilder_generator;
+use core_user\reportbuilder\datasource\users;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
+
+/**
+ * Unit tests for min aggregation
+ *
+ * @package     core_reportbuilder
+ * @covers      \core_reportbuilder\local\aggregation\base
+ * @covers      \core_reportbuilder\local\aggregation\min
+ * @copyright   2021 Paul Holden <paulh@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class min_test extends core_reportbuilder_testcase {
+
+    /**
+     * Test aggregation when applied to column
+     */
+    public function test_column_aggregation(): void {
+        $this->resetAfterTest();
+
+        // Test subjects.
+        $this->getDataGenerator()->create_user(['firstname' => 'Admin', 'suspended' => 1]);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'suspended' => 1]);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // Report columns, aggregated/sorted by user suspended.
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:firstname']);
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:suspended',
+            'aggregation' => min::get_class_name(),
+            'sortenabled' => 1,
+            'sortdirection' => SORT_DESC,
+        ]);
+
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertEquals([
+            ['Bob', 'Yes'],
+            ['Admin', 'No'],
+        ], array_map('array_values', $content));
+    }
+}

reportbuilder/tests/local/aggregation/percent_test.php

@@ -0,0 +1,71 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace core_reportbuilder\local\aggregation;
+
+use core_reportbuilder_testcase;
+use core_reportbuilder_generator;
+use core_user\reportbuilder\datasource\users;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
+
+/**
+ * Unit tests for sum aggregation
+ *
+ * @package     core_reportbuilder
+ * @covers      \core_reportbuilder\local\aggregation\base
+ * @covers      \core_reportbuilder\local\aggregation\percent
+ * @copyright   2021 Paul Holden <paulh@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class percent_test extends core_reportbuilder_testcase {
+
+    /**
+     * Test aggregation when applied to column
+     */
+    public function test_column_aggregation(): void {
+        $this->resetAfterTest();
+
+        // Test subjects.
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'suspended' => 1]);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'suspended' => 0]);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // Report columns, aggregated/sorted by user suspended.
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:firstname']);
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:suspended',
+            'aggregation' => percent::get_class_name(),
+            'sortenabled' => 1,
+            'sortdirection' => SORT_DESC,
+        ]);
+
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertEquals([
+            ['Bob', '50.0%'],
+            ['Admin', '0.0%'],
+        ], array_map('array_values', $content));
+    }
+}

reportbuilder/tests/local/aggregation/sum_test.php

@@ -0,0 +1,118 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace core_reportbuilder\local\aggregation;
+
+use core_reportbuilder_testcase;
+use core_reportbuilder_generator;
+use core_reportbuilder\manager;
+use core_reportbuilder\local\report\column;
+use core_user\reportbuilder\datasource\users;
+use stdClass;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
+
+/**
+ * Unit tests for sum aggregation
+ *
+ * @package     core_reportbuilder
+ * @covers      \core_reportbuilder\local\aggregation\base
+ * @covers      \core_reportbuilder\local\aggregation\sum
+ * @copyright   2021 Paul Holden <paulh@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class sum_test extends core_reportbuilder_testcase {
+
+    /**
+     * Test aggregation when applied to column
+     */
+    public function test_column_aggregation(): void {
+        $this->resetAfterTest();
+
+        // Test subjects.
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'suspended' => 1]);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'suspended' => 1]);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // Report columns, aggregated/sorted by user suspended.
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:firstname']);
+        $generator->create_column([
+            'reportid' => $report->get('id'),
+            'uniqueidentifier' => 'user:suspended',
+            'aggregation' => sum::get_class_name(),
+            'sortenabled' => 1,
+            'sortdirection' => SORT_DESC,
+        ]);
+
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertEquals([
+            ['Bob', 2],
+            ['Admin', 0],
+        ], array_map('array_values', $content));
+    }
+
+    /**
+     * Test aggregation when applied to column with callback
+     */
+    public function test_column_aggregation_with_callback(): void {
+        $this->resetAfterTest();
+
+        // Test subjects.
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'suspended' => 1]);
+        $this->getDataGenerator()->create_user(['firstname' => 'Bob', 'suspended' => 1]);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
+
+        // First column, sorted.
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:firstname', 'sortenabled' => 1]);
+
+        // This is the column we'll aggregate.
+        $generator->create_column(
+            ['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:suspended', 'aggregation' => sum::get_class_name()]
+        );
+
+        // Set callback to format the column (hack column definition to ensure callbacks are executed).
+        $instance = manager::get_report_from_persistent($report);
+        $instance->get_column('user:suspended')
+            ->set_type(column::TYPE_INTEGER)
+            ->set_callback(static function(int $value, stdClass $row, $arguments, ?string $aggregation): string {
+                // Simple callback to return the given value, and append aggregation type.
+                return "{$value} ({$aggregation})";
+            });
+
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertEquals([
+            [
+                'c0_firstname' => 'Admin',
+                'c1_suspended' => '0 (sum)',
+            ],
+            [
+                'c0_firstname' => 'Bob',
+                'c1_suspended' => '2 (sum)',
+            ],
+        ], $content);
+    }
+}