Merge pull request #48 from LD-Reborn/40-add-attributes-to-query-result
40 add attributes to query result
This commit is contained in:
@@ -6,6 +6,7 @@ using Server.Models;
|
||||
|
||||
namespace Server.Controllers;
|
||||
|
||||
[ApiExplorerSettings(IgnoreApi = true)]
|
||||
[Route("[Controller]")]
|
||||
public class AccountController : Controller
|
||||
{
|
||||
|
||||
@@ -25,7 +25,7 @@ public class EntityController : ControllerBase
|
||||
}
|
||||
|
||||
[HttpGet("Query")]
|
||||
public ActionResult<EntityQueryResults> Query(string searchdomain, string query, int? topN)
|
||||
public ActionResult<EntityQueryResults> Query(string searchdomain, string query, int? topN, bool returnAttributes = false)
|
||||
{
|
||||
Searchdomain searchdomain_;
|
||||
try
|
||||
@@ -44,7 +44,8 @@ public class EntityController : ControllerBase
|
||||
List<EntityQueryResult> queryResults = [.. results.Select(r => new EntityQueryResult
|
||||
{
|
||||
Name = r.Item2,
|
||||
Value = r.Item1
|
||||
Value = r.Item1,
|
||||
Attributes = returnAttributes ? (searchdomain_.entityCache.FirstOrDefault(x => x.name == r.Item2)?.attributes ?? null) : null
|
||||
})];
|
||||
return Ok(new EntityQueryResults(){Results = queryResults, Success = true });
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ using Server.Exceptions;
|
||||
using Server.Models;
|
||||
namespace Server.Controllers;
|
||||
|
||||
[ApiController]
|
||||
[ApiExplorerSettings(IgnoreApi = true)]
|
||||
[Route("/")]
|
||||
public class HomeController : Controller
|
||||
{
|
||||
|
||||
@@ -19,6 +19,9 @@ public class EntityQueryResult
|
||||
public required string Name { get; set; }
|
||||
[JsonPropertyName("Value")]
|
||||
public float Value { get; set; }
|
||||
[JsonPropertyName("Attributes")]
|
||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
|
||||
public Dictionary<string, string>? Attributes { get; set; }
|
||||
}
|
||||
|
||||
public class EntityIndexResult
|
||||
|
||||
Reference in New Issue
Block a user