Adding DateOnly, TimeOnly and Point Field Mappers

Author: ssinno28

Lucene.Net.DocumentMapper.Tests/DocumentMapperTests.cs

@@ -351,6 +351,56 @@ public void Test_Not_Indexed_If_Too_Large_Text()
             Assert.False(isIndexed);
         }
 
+        [Fact]
+        public void Test_Is_TimeOnly()
+        {
+            var documentMapper = _serviceProvider.GetRequiredService<IDocumentMapper>();
+            // public PropertyInfo? GetProperty(string name);
+            var propertyMapper = documentMapper.GetFieldMapper(typeof(BlogPost).GetProperty(nameof(BlogPost.PublishedTimeOnly)));
+
+            Assert.Equal(typeof(TimeOnlyFieldMapper), propertyMapper?.GetType());
+
+            var timeOnly = new TimeOnly(14, 30, 0);
+            var blogPost = new BlogPost { PublishedTimeOnly = timeOnly };
+            var document = documentMapper.Map(blogPost);
+            var mappedBlogPost = documentMapper.Map<BlogPost>(document);
+            Assert.Equal(timeOnly, mappedBlogPost.PublishedTimeOnly);
+        }
+
+        [Fact]
+        public void Test_Is_DateOnly()
+        {
+            var documentMapper = _serviceProvider.GetRequiredService<IDocumentMapper>();
+            // public PropertyInfo? GetProperty(string name);
+            var propertyMapper = documentMapper.GetFieldMapper(typeof(BlogPost).GetProperty(nameof(BlogPost.PublishedDateOnly)));
+
+            Assert.Equal(typeof(DateOnlyFieldMapper), propertyMapper?.GetType());
+
+            var dateOnly = new DateOnly(2023, 12, 25);
+            var blogPost = new BlogPost { PublishedDateOnly = dateOnly };
+            var document = documentMapper.Map(blogPost);
+            var mappedBlogPost = documentMapper.Map<BlogPost>(document);
+            Assert.Equal(dateOnly, mappedBlogPost.PublishedDateOnly);
+        }
+
+        [Fact]
+        public void Test_Is_Point()
+        {
+            var documentMapper = _serviceProvider.GetRequiredService<IDocumentMapper>();
+
+            var blogPost = new BlogPost 
+            { 
+                Latitude = 40.7128, 
+                Longitude = -74.0060 
+            };
+
+            var document = documentMapper.Map(blogPost);
+            var mappedBlogPost = documentMapper.Map<BlogPost>(document);
+            
+            Assert.Equal(blogPost.Latitude, mappedBlogPost.Latitude);
+            Assert.Equal(blogPost.Longitude, mappedBlogPost.Longitude);
+        }
+
         private byte[] GetByteArray(int sizeInKb)
         {
             Random rnd = new Random();

Lucene.Net.DocumentMapper.Tests/Lucene.Net.DocumentMapper.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<LangVersion>preview</LangVersion>
 		<IsPackable>false</IsPackable>

Lucene.Net.DocumentMapper.Tests/Models/Blog/BlogPost.cs

@@ -1,13 +1,16 @@
 using System;
 using System.Collections.Generic;
 using Lucene.Net.DocumentMapper.Attributes;
+using Lucene.Net.DocumentMapper.Interfaces;
 
 namespace Lucene.Net.DocumentMapper.Tests.Models
 {
-    public class BlogPost
+    public class BlogPost : ILocationIndex
     {
         public DateTime PublishedDate { get; set; }
         public DateTimeOffset PublishedDateOffset { get; set; }
+        public DateOnly PublishedDateOnly { get; set; }
+        public TimeOnly PublishedTimeOnly { get; set; }
         public bool IsPublished { get; set; }
         public string Name { get; set; } = string.Empty;
         [Search(Tokenized = true)]
@@ -25,6 +28,8 @@ public class BlogPost
         public byte[] Thumbnail { get; set; }
 
         public EnumCategory Category3 { get; set; }
+        public double Latitude { get; set; }
+        public double Longitude { get; set; }
     }
 
     public enum EnumCategory

Lucene.Net.DocumentMapper/FieldMappers/DateOnlyFieldMapper.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Reflection;
+using Lucene.Net.DocumentMapper.Interfaces;
+using Lucene.Net.Documents;
+using Lucene.Net.Documents.Extensions;
+
+namespace Lucene.Net.DocumentMapper.FieldMappers
+{
+    public class DateOnlyFieldMapper : AFieldMapper, IFieldMapper
+    {
+        public int Priority => 0;
+
+        public bool IsMatch(PropertyInfo propertyInfo)
+        {
+            var type = GetPropertyType(propertyInfo);
+            return type == typeof(DateOnly);
+        }
+
+        public Field MapToField(PropertyInfo propertyInfo, object value, string name)
+        {
+            var date = value is DateOnly only ? only : default;
+            return new Int64Field(name, date.ToDateTime(TimeOnly.MinValue).Ticks, GetStore(propertyInfo));
+        }
+
+        public object MapFromField(Field field)
+        {
+            long ticks = field.GetInt64ValueOrDefault();
+            return DateOnly.FromDateTime(new DateTime(ticks));
+        }
+    }
+}

Lucene.Net.DocumentMapper/FieldMappers/PointFieldMapper.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Lucene.Net.DocumentMapper.Interfaces;
+using Lucene.Net.Documents;
+using Lucene.Net.Spatial;
+using Lucene.Net.Spatial.Vector;
+using Spatial4n.Context;
+using Spatial4n.Shapes;
+
+namespace Lucene.Net.DocumentMapper.FieldMappers
+{
+    public class PointFieldMapper : IFieldsMapper
+    {
+        public bool IsMatch(Type type)
+        {
+            return type.GetInterfaces().ToList().Contains(typeof(ILocationIndex));
+        }
+
+        public IList<Field> MapToFields(object @object)
+        {
+            ILocationIndex locationIndex = (ILocationIndex) @object;
+
+            SpatialContext ctx = SpatialContext.GEO;
+            SpatialStrategy strategy = new PointVectorStrategy(ctx, FieldPrefixConstants.LocationPointPrefix);
+            IShape shape = new Point(locationIndex.Longitude, locationIndex.Latitude, ctx);
+
+            return strategy.CreateIndexableFields(shape);
+        }
+    }
+}

Lucene.Net.DocumentMapper/FieldMappers/TimeOnlyFieldMapper.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Reflection;
+using Lucene.Net.DocumentMapper.Interfaces;
+using Lucene.Net.Documents;
+
+namespace Lucene.Net.DocumentMapper.FieldMappers
+{
+    public class TimeOnlyFieldMapper : AFieldMapper, IFieldMapper
+    {
+        public int Priority => 0;
+
+        public bool IsMatch(PropertyInfo propertyInfo)
+        {
+            var type = GetPropertyType(propertyInfo);
+            return type == typeof(TimeOnly);
+        }
+
+        public Field MapToField(PropertyInfo propertyInfo, object value, string name)
+        {
+            return new StringField(name,
+                value.ToString(),
+                GetStore(propertyInfo));
+        }
+
+        public object MapFromField(Field field)
+        {
+            return TimeOnly.Parse(field.GetStringValue());
+        }
+    }
+}

Lucene.Net.DocumentMapper/FieldPrefixConstants.cs

@@ -0,0 +1,6 @@
+namespace Lucene.Net.DocumentMapper;
+
+public class FieldPrefixConstants
+{
+    public static string LocationPointPrefix = "LatLong";
+}

Lucene.Net.DocumentMapper/Interfaces/ILocationIndex.cs

@@ -0,0 +1,7 @@
+namespace Lucene.Net.DocumentMapper.Interfaces;
+
+public interface ILocationIndex
+{
+    double Latitude { get; set; }
+    double Longitude { get; set; }
+}

Lucene.Net.DocumentMapper/Lucene.Net.DocumentMapper.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 	<Nullable>enable</Nullable>
 	<LangVersion>preview</LangVersion>
     <AssemblyName>Lucene.Net.DocumentMapper</AssemblyName>
     <RootNamespace>Lucene.Net.DocumentMapper</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.0.15</Version>
+    <Version>1.0.16</Version>
     <RepositoryUrl>https://github.com/ssinno28/Lucene.Net.DocumentMapper</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Description>A service that provides functionality for mapping C# types to Lucene Documents and back.</Description>
@@ -26,7 +26,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
+    <PackageReference Include="Lucene.Net" Version="4.8.0-beta00017" />
+    <PackageReference Include="Lucene.Net.Spatial" Version="4.8.0-beta00017" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />