fix analytics

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>

Author: Koc

lib/Analytics/AnalyticsDatasource.php

@@ -13,23 +13,23 @@
 use OCA\Tables\Errors\NotFoundError;
 use OCA\Tables\Errors\PermissionError;
 use OCA\Tables\Service\ColumnService;
+use OCA\Tables\Service\RelationService;
 use OCA\Tables\Service\RowService;
 use OCA\Tables\Service\TableService;
 use OCA\Tables\Service\ViewService;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\IL10N;
-use Psr\Log\LoggerInterface;
 
 class AnalyticsDatasource implements IDatasource {
 
 	public function __construct(
 		private readonly IL10N $l10n,
-		private readonly LoggerInterface $logger,
 		private readonly TableService $tableService,
 		private readonly ViewService $viewService,
 		private readonly ColumnService $columnService,
 		private readonly RowService $rowService,
+		private readonly RelationService $relationService,
 		protected ?string $userId,
 	) {
 	}
@@ -253,6 +253,7 @@ private function getData(int $nodeId, ?int $limit, ?int $offset, ?string $nodeTy
 	private function formatValue(Column $column, mixed $value): mixed {
 		return match ($column->getType()) {
 			Column::TYPE_SELECTION => $this->formatSelectionValue($column, $value),
+			Column::TYPE_RELATION => $this->formatRelationValue($column, $value),
 			Column::TYPE_TEXT => $this->formatTextValue($column, $value),
 			Column::TYPE_USERGROUP => $this->formatUsergroupValue($value),
 			default => $value,
@@ -372,6 +373,17 @@ private function formatUsergroupValue(mixed $value): string {
 		return implode(', ', array_filter($labels, static fn (string $label): bool => $label !== ''));
 	}
 
+	private function formatRelationValue(Column $column, mixed $value): string {
+		if ($value === null || $value === '') {
+			return '';
+		}
+
+		$relationData = $this->relationService->getRelationData($column);
+		$valueId = (int)$value;
+
+		return $relationData[$valueId]['label'] ?? (string)$value;
+	}
+
 	private function parseDefaultValue(?string $value): mixed {
 		if ($value === null || $value === '') {
 			return '';

tests/unit/Analytics/AnalyticsDatasourceTest.php

@@ -17,20 +17,21 @@ interface IDatasource {
 use OCA\Tables\Db\Column;
 use OCA\Tables\Db\Row2;
 use OCA\Tables\Service\ColumnService;
+use OCA\Tables\Service\RelationService;
 use OCA\Tables\Service\RowService;
 use OCA\Tables\Service\TableService;
 use OCA\Tables\Service\ViewService;
 use OCP\IL10N;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
 
 final class AnalyticsDatasourceTest extends TestCase {
 	private IL10N|MockObject $l10n;
 	private TableService|MockObject $tableService;
 	private ViewService|MockObject $viewService;
 	private ColumnService|MockObject $columnService;
 	private RowService|MockObject $rowService;
+	private RelationService|MockObject $relationService;
 	private AnalyticsDatasource $datasource;
 
 	protected function setUp(): void {
@@ -42,14 +43,15 @@ protected function setUp(): void {
 		$this->viewService = $this->createMock(ViewService::class);
 		$this->columnService = $this->createMock(ColumnService::class);
 		$this->rowService = $this->createMock(RowService::class);
+		$this->relationService = $this->createMock(RelationService::class);
 
 		$this->datasource = new AnalyticsDatasource(
 			$this->l10n,
-			$this->createMock(LoggerInterface::class),
 			$this->tableService,
 			$this->viewService,
 			$this->columnService,
 			$this->rowService,
+			$this->relationService,
 			'user1',
 		);
 	}
@@ -148,6 +150,44 @@ public function testReadDataFormatsDisplayValuesForAnalytics(): void {
 		], $result['data']);
 	}
 
+	public function testReadDataFormatsRelationValuesForAnalytics(): void {
+		$this->columnService
+			->expects($this->once())
+			->method('findAllByTable')
+			->with(123, 'user1')
+			->willReturn([
+				$this->createColumn(1, 'Name', 'text'),
+				$this->createColumn(2, 'Customer', 'relation'),
+			]);
+
+		$this->relationService
+			->expects($this->once())
+			->method('getRelationData')
+			->willReturn([
+				42 => ['id' => 42, 'label' => 'Acme Corp'],
+				43 => ['id' => 43, 'label' => 'Globex'],
+			]);
+
+		$row = new Row2();
+		$row->setData([
+			['columnId' => 1, 'value' => 'Order 1'],
+			['columnId' => 2, 'value' => 42],
+		]);
+
+		$this->rowService
+			->expects($this->once())
+			->method('findAllByTable')
+			->with(123, 'user1', null, null)
+			->willReturn([$row]);
+
+		$result = $this->datasource->readData([
+			'tableId' => '123',
+			'user_id' => 'user1',
+		]);
+
+		self::assertSame([['Order 1', 'Acme Corp', 1]], $result['data']);
+	}
+
 	public function testReadDataFormatsDefaultValuesForAnalytics(): void {
 		$numberColumn = $this->createColumn(1, 'Amount', 'number');
 		$numberColumn->setNumberDefault(10);