Improved search engine

1 files changed, 21 insertions, 13 deletions

diff --git a/Services/SearchService.cs b/Services/SearchService.cs
index cebc704..8a109ea 100644
--- a/Services/SearchService.cs
+++ b/Services/SearchService.cs
@@ -19,20 +19,28 @@ public class SearchService : ISearchService {
 
         var matchedTag = db.TagDefinitions
             .FirstOrDefault(td => td.Name.ToLower() == query)?.Guid;
-        if(matchedTag is not null)
-            return db.Media
-                .Include(m => m.Tags)
-                .ThenInclude(t => t.TagDefinition)
-                .Where(m => m.Tags
-                    .Select(t => t.TagDefinition)
-                    .Select(td => td.Guid)
-                    .Contains((Guid) matchedTag))
-                .ToArray();
 
-        var matchingTags = db.TagDefinitions
-            .Where(td => td.Name.ToLower().Contains(query))
-            .Select(td => td.Guid);
+        Guid[] guids;
+
+        if(matchedTag is not null) {
+            guids = new[] { (Guid) matchedTag };
+        } else {
+            guids = db.TagDefinitions
+                .Where(td => td.Name.ToLower().Contains(query))
+                .Select(td => td.Guid)
+                .ToArray();
+        }
 
-        throw new NotImplementedException();
+        return db.Media
+            .Include(m => m.Tags)
+            .ThenInclude(m => m.TagDefinition)
+            .AsEnumerable()
+            .Where(m => m.Tags.IntersectBy(guids, t => t.TagDefinition.Guid).Any())
+            .Concat(db.Media
+                .Where(m =>
+                    (m.ShortDescription != null && m.ShortDescription.ToLower().Contains(query)) ||
+                    (m.LongDescription != null && m.LongDescription.ToLower().Contains(query))))
+            .DistinctBy(m => m.Guid)
+            .ToArray();
     }
 }