From ce77d56301933fc2c8ce45799df89cb532e37381 Mon Sep 17 00:00:00 2001
From: agazzarini <a.gazzarini@sease.io>
Date: Mon, 18 May 2020 09:11:01 +0200
Subject: [PATCH 1/2] [ SEARCH-2151 ] Wrong boolean check on date fields

---
 .../java/org/alfresco/solr/AlfrescoSolrDataModel.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java
index c7a2bfcab..126c8a91d 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java
@@ -1033,7 +1033,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
 
     }
 
-    public String getDateDerivedFIeld(QName propertyQName)
+    public String getDateDerivedField(QName propertyQName)
     {
         PropertyDefinition propertyDefinition = getPropertyDefinition(propertyQName);
         return "part@sd@" + propertyDefinition.getName().toString();
@@ -1644,10 +1644,10 @@ public class AlfrescoSolrDataModel implements QueryConstants
         }
 
         if ((propertyDef.getDataType().getName().equals(DataTypeDefinition.DATETIME)
-                || propertyDef.getDataType().getName().equals(DataTypeDefinition.DATE) &&
-                !isDerivedDateField(fieldNameAndEnding.getSecond())))
+                || propertyDef.getDataType().getName().equals(DataTypeDefinition.DATE)) &&
+                isDerivedDateField(fieldNameAndEnding.getSecond()))
         {
-            return getDateDerivedFIeld(propertyDef.getName()) + fieldNameAndEnding.getSecond();
+            return getDateDerivedField(propertyDef.getName()) + fieldNameAndEnding.getSecond();
         }
         else if (propertyDef.getDataType().getName().equals(DataTypeDefinition.TEXT))
         {

From f6a10e4ec331a203031aa3c369db7aef915c9079 Mon Sep 17 00:00:00 2001
From: agazzarini <a.gazzarini@sease.io>
Date: Mon, 18 May 2020 09:11:38 +0200
Subject: [PATCH 2/2] [ SEARCH-2151 ] Wrong method name

---
 .../src/main/java/org/alfresco/solr/query/Solr4QueryParser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
index 84d8dc9c0..22b198b52 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
@@ -4224,7 +4224,7 @@ public class Solr4QueryParser extends QueryParser implements QueryConstants
             {
                 return subQueryBuilder.getQuery(
                         AlfrescoSolrDataModel.getInstance()
-                                .getDateDerivedFIeld(propertyQName) + fieldNameAndEnding.getSecond(),
+                                .getDateDerivedField(propertyQName) + fieldNameAndEnding.getSecond(),
                         queryText, analysisMode, luceneFunction);
             }
         }