From 17602f077a53cf1bbafd7b020b6a1d9cc41f8965 Mon Sep 17 00:00:00 2001
From: Sebastian Krupinski <krupinski01@gmail.com>
Date: Fri, 3 Jul 2026 21:40:42 -0400
Subject: [PATCH] recator: range construction

Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>
---
 lib/Manager.php | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/lib/Manager.php b/lib/Manager.php
index ab3935a..fbb91f5 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -20,7 +20,6 @@ use KTXF\Resource\Filter\IFilter;
 use KTXF\Resource\Identifier\CollectionIdentifier;
 use KTXF\Resource\Identifier\EntityIdentifier;
 use KTXF\Resource\Identifier\ResourceIdentifiers;
-use KTXF\Resource\Range\RangeAnchorType;
 use KTXF\Resource\Range\RangeType;
 use KTXF\Resource\Sort\ISort;
 use Psr\Log\LoggerInterface;
@@ -572,20 +571,7 @@ class Manager {
                 // construct range for entities
                 $entityRange = null;
                 if ($range !== null && $range !== [] && isset($range['type'])) {
-                    $entityRange = $service->entityListRange(RangeType::from($range['type']));
-                    // Cast to IRangeTally if the range type is TALLY
-                    if ($entityRange->type() === RangeType::TALLY) {
-                        /** @var \KTXF\Resource\Range\IRangeTally $entityRange */
-                        if (isset($range['anchor'])) {
-                            $entityRange->setAnchor(RangeAnchorType::from($range['anchor']));
-                        }
-                        if (isset($range['position'])) {
-                            $entityRange->setPosition($range['position']);
-                        }
-                        if (isset($range['tally'])) {
-                            $entityRange->setTally($range['tally']);
-                        }
-                    }
+                    $entityRange = $service->entityListRange(RangeType::from($range['type']))->jsonDeserialize($range);
                 }
                 // retrieve entities for each collection
                 foreach ($collectionSelected as $collectionId) {
@@ -661,19 +647,7 @@ class Manager {
                 // construct range for entities
                 $entityRange = null;
                 if ($range !== null && $range !== [] && isset($range['type'])) {
-                    $entityRange = $service->entityListRange(RangeType::from($range['type']));
-                    if ($entityRange->type() === RangeType::TALLY) {
-                        /** @var \KTXF\Resource\Range\IRangeTally $entityRange */
-                        if (isset($range['anchor'])) {
-                            $entityRange->setAnchor(RangeAnchorType::from($range['anchor']));
-                        }
-                        if (isset($range['position'])) {
-                            $entityRange->setPosition($range['position']);
-                        }
-                        if (isset($range['tally'])) {
-                            $entityRange->setTally($range['tally']);
-                        }
-                    }
+                    $entityRange = $service->entityListRange(RangeType::from($range['type']))->jsonDeserialize($range);
                 }
                 // yield entities for each collection individually
                 foreach ($collectionSelected as $collectionId) {
@@ -1105,4 +1079,3 @@ class Manager {
     }
 
 }
-