Feat/16115 recherche date producteur

src/bundle/recordsManagement/Controller/archiveAccessTrait.php

@@ -971,14 +971,14 @@ trait archiveAccessTrait
     }
 
     /**
-     * Get archive assert
+     * Get archive query parts
      * @param array $args
      * @param array $queryParams
      * @param bool  $checkAccess
      *
-     * @return string Query
+     * @return array The query parts
      */
-    public function getArchiveAssert($args, &$queryParams, $checkAccess = true)
+    public function getArchiveQueryParts($args, &$queryParams, $checkAccess = true)
     {
         // Args on archive
         $currentDate = \laabs::newDate();
@@ -1044,6 +1044,7 @@ trait archiveAccessTrait
             $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]);
@@ -1052,15 +1053,15 @@ trait archiveAccessTrait
                 $args['originatingDate'][1] = \laabs::newDate($args['originatingDate'][1]);
             }
 
-            if (!empty($args['originatingDate'][0])) { // originatingStartDate
+            if (!empty($args['originatingDate'][0])) {
                 $args['originatingDate'][0] = $args['originatingDate'][0]->format('Y-m-d');
-                $queryParts['originatingDate0'] = "originatingDate>= :originatingDate0";
-                $queryParams['originatingDate0'] =$args['originatingDate'][0];
+                $queryParts['originatingDateFrom'] = "originatingDate>= :originatingDateFrom";
+                $queryParams['originatingDateFrom'] =$args['originatingDate'][0];
             }
-            if (!empty($args['originatingDate'][1])) { // originatingEndDate;
+            if (!empty($args['originatingDate'][1])) {;
                 $args['originatingDate'][1] = $args['originatingDate'][1]->format('Y-m-d');
-                $queryParts['originatingDate1'] = "originatingDate<= :originatingDate1";
-                $queryParams['originatingDate1'] = $args['originatingDate'][1];
+                $queryParts['originatingDateTo'] = "originatingDate<= :originatingDateTo";
+                $queryParams['originatingDateTo'] = $args['originatingDate'][1];
             }
         }
 
@@ -1118,10 +1119,25 @@ trait archiveAccessTrait
             $accessRuleAssert = $this->getAccessRuleAssert($currentDateString);
 
             if ($accessRuleAssert) {
-                $queryParts[] = $accessRuleAssert;
+                $queryParts['accessRule'] = $accessRuleAssert;
             }
         }
 
+        return $queryParts;
+    }
+
+    /**
+     * Get archive assert
+     * @param array $args
+     * @param array $queryParams
+     * @param bool  $checkAccess
+     *
+     * @return string Query
+     */
+    public function getArchiveAssert($args, &$queryParams, $checkAccess = true)
+    {
+        $queryParts = $this->getArchiveQueryParts($args, $queryParams, $checkAccess);
+
         return implode(' and ', $queryParts);
     }