From 66ce90ee467fedeea2040f5e65e859a27a48ea57 Mon Sep 17 00:00:00 2001
From: Arnaud PAUGET <arnaud.pauget@maarch.org>
Date: Thu, 21 Apr 2022 14:39:05 +0200
Subject: [PATCH 1/2] fix(17942) : add search on archiveId archiverArchiveId
 and originatorArchiveId with only one field

---
 .../Controller/archiveAccessTrait.php                 | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/bundle/recordsManagement/Controller/archiveAccessTrait.php b/src/bundle/recordsManagement/Controller/archiveAccessTrait.php
index ebcea7ba0..78d04359d 100755
--- a/src/bundle/recordsManagement/Controller/archiveAccessTrait.php
+++ b/src/bundle/recordsManagement/Controller/archiveAccessTrait.php
@@ -85,6 +85,12 @@ trait archiveAccessTrait
         $checkAccess = true,
         $maxResults = null
     ) {
+        if(is_null($originatorArchiveId)) {
+            $originatorArchiveId = $archiverArchiveId;
+        }
+        // var_dump($originatorArchiveId);
+        // var_dump($archiverArchiveId);
+        // exit;
         $accountController = \laabs::newController('auth/userAccount');
         $accountController->isAuthorized('user');
 
@@ -1035,6 +1041,11 @@ trait archiveAccessTrait
             $queryParts['archiverArchiveId'] = "archiverArchiveId= :archiverArchiveId";
             $queryParams['archiverArchiveId'] = $args['archiverArchiveId'];
         }
+        if (!empty($args['originatorArchiveId']) && !empty($args['archiverArchiveId']) && $args['originatorArchiveId'] == $args['archiverArchiveId']) {
+            $queryParts['originatorArchiveId'] = "(archiveId= :archiveId OR originatorArchiveId= :originatorArchiveId OR archiverArchiveId= :archiverArchiveId)";
+            $queryParams['archiveId'] = $args['originatorArchiveId'];
+            unset($queryParts['archiverArchiveId']);
+        }
         if (!empty($args['originatingDate'])) {
             if (!empty($args['originatingDate'][0]) && is_string($args['originatingDate'][0])) {
                 $args['originatingDate'][0] = \laabs::newDate($args['originatingDate'][0]);
-- 
GitLab


From 13a701bf99bac5dd77059bb879e2fbb58d2eea71 Mon Sep 17 00:00:00 2001
From: Arnaud PAUGET <arnaud.pauget@maarch.org>
Date: Thu, 21 Apr 2022 15:23:10 +0200
Subject: [PATCH 2/2] fix(17942) : removes comments

---
 .../recordsManagement/Controller/archiveAccessTrait.php       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/bundle/recordsManagement/Controller/archiveAccessTrait.php b/src/bundle/recordsManagement/Controller/archiveAccessTrait.php
index 78d04359d..db3c34cbe 100755
--- a/src/bundle/recordsManagement/Controller/archiveAccessTrait.php
+++ b/src/bundle/recordsManagement/Controller/archiveAccessTrait.php
@@ -88,9 +88,7 @@ trait archiveAccessTrait
         if(is_null($originatorArchiveId)) {
             $originatorArchiveId = $archiverArchiveId;
         }
-        // var_dump($originatorArchiveId);
-        // var_dump($archiverArchiveId);
-        // exit;
+        
         $accountController = \laabs::newController('auth/userAccount');
         $accountController->isAuthorized('user');
 
-- 
GitLab