Merge pull request #58564 from nextcloud/backport/58327/stable31

[stable31] feat: add upload_time support to file search and recent files

Author: sorbaugh

apps/dav/lib/Capabilities.php

@@ -23,6 +23,7 @@ public function getCapabilities() {
 		$capabilities = [
 			'dav' => [
 				'chunking' => '1.0',
+				'search_supports_upload_time' => true,
 			]
 		];
 		if ($this->config->getSystemValueBool('bulkupload.enabled', true)) {

apps/dav/lib/Files/FileSearchBackend.php

@@ -85,6 +85,7 @@ public function getPropertyDefinitionsForScope(string $href, ?string $path): arr
 			new SearchPropertyDefinition('{DAV:}displayname', true, true, true),
 			new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true),
 			new SearchPropertyDefinition('{DAV:}getlastmodified', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
+			new SearchPropertyDefinition('{http://nextcloud.org/ns}upload_time', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
 			new SearchPropertyDefinition(FilesPlugin::SIZE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
 			new SearchPropertyDefinition(TagsPlugin::FAVORITE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_BOOLEAN),
 			new SearchPropertyDefinition(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, true, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
@@ -297,6 +298,8 @@ private function getSearchResultProperty(SearchResult $result, SearchPropertyDef
 				return $node->getName();
 			case '{DAV:}getlastmodified':
 				return $node->getLastModified();
+			case '{http://nextcloud.org/ns}upload_time':
+				return $node->getNode()->getUploadTime();
 			case FilesPlugin::SIZE_PROPERTYNAME:
 				return $node->getSize();
 			case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME:
@@ -451,6 +454,8 @@ private function mapPropertyNameToColumn(SearchPropertyDefinition $property) {
 				return 'mimetype';
 			case '{DAV:}getlastmodified':
 				return 'mtime';
+			case '{http://nextcloud.org/ns}upload_time':
+				return 'upload_time';
 			case FilesPlugin::SIZE_PROPERTYNAME:
 				return 'size';
 			case TagsPlugin::FAVORITE_PROPERTYNAME:

lib/private/Files/Cache/QuerySearchHelper.php

@@ -149,10 +149,12 @@ public function searchInCaches(ISearchQuery $searchQuery, array $caches): array
 
 		$builder = $this->getQueryBuilder();
 
-		$query = $builder->selectFileCache('file', false);
-
 		$requestedFields = $this->searchBuilder->extractRequestedFields($searchQuery->getSearchOperation());
 
+		$joinExtendedCache = in_array('upload_time', $requestedFields);
+
+		$query = $builder->selectFileCache('file', $joinExtendedCache);
+
 		if (in_array('systemtag', $requestedFields)) {
 			$this->equipQueryForSystemTags($query, $this->requireUser($searchQuery));
 		}

lib/private/Files/Cache/SearchBuilder.php

@@ -63,6 +63,7 @@ class SearchBuilder {
 		'share_with' => 'string',
 		'share_type' => 'integer',
 		'owner' => 'string',
+		'upload_time' => 'integer',
 	];
 
 	/** @var array<string, int|string> */
@@ -256,6 +257,7 @@ private function validateComparison(ISearchComparison $operator) {
 			'share_with' => ['eq'],
 			'share_type' => ['eq'],
 			'owner' => ['eq'],
+			'upload_time' => ['eq', 'gt', 'lt', 'gte', 'lte'],
 		];
 
 		if (!isset(self::$fieldTypes[$operator->getField()])) {