flower comment supported

Server/Controller/EventApiController.cs

@@ -37,6 +37,7 @@ public class EventApiController : BaseController
     ///     p: bool?
     /// 
     /// </remarks>
+    /// <param name="flowerId">花草唯一 id</param>
     /// <param name="eventId">事件类型 id</param>
     /// <param name="key">查询关键字</param>
     /// <param name="from">起始日期</param>
@@ -56,6 +57,7 @@ public class EventApiController : BaseController
     [HttpGet]
     [ResponseCache(NoStore = true, Location = ResponseCacheLocation.None)]
     public ActionResult<RecordItem[]> GetRecords(
+        [FromQuery(Name = "fid")] int? flowerId,
         [FromQuery(Name = "eid")] int? eventId,
         [FromQuery] string? key,
         [FromQuery] long? from,
@@ -74,7 +76,25 @@ public class EventApiController : BaseController
 
         SaveDatabase();
 
-        var records = database.Records.Where(r => r.OwnerId == user.Id);
+        var records = database.Records.Where(r => r.OwnerId == user.Id).Select(r => new RecordItem
+        {
+            Id = r.Id,
+            OwnerId = r.OwnerId,
+            ByUserId = r.ByUserId,
+            DateUnixTime = r.DateUnixTime,
+            EventId = r.EventId,
+            FlowerId = r.FlowerId,
+            IsHidden = r.IsHidden,
+            Latitude = r.Latitude,
+            Longitude = r.Longitude,
+            Title = r.Title,
+            Memo = r.Memo,
+            ByUserName = string.IsNullOrEmpty(r.ByUserName) && r.ByUserId != null ? database.Users.Single(u => u.Id == r.ByUserId).Name : r.ByUserName
+        });
+        if (flowerId != null)
+        {
+            records = records.Where(r => r.FlowerId == flowerId);
+        }
         if (eventId != null)
         {
             records = records.Where(r => r.EventId == eventId);
@@ -99,7 +119,16 @@ public class EventApiController : BaseController
             records = records.Include(r => r.Photos);
         }
 
-        return Ok(records.ToArray());
+        var array = records.ToArray();
+        foreach (var r in array)
+        {
+            if (string.IsNullOrEmpty(r.ByUserName))
+            {
+                r.ByUserName = user.Name;
+            }
+        }
+
+        return Ok(array);
     }
 
     /// <summary>
@@ -249,8 +278,10 @@ public class EventApiController : BaseController
             FlowerId = @event.FlowerId,
             EventId = @event.CategoryId,
             DateUnixTime = now,
+            IsHidden = @event.IsHidden,
             ByUserId = @event.ByUser == null ? user.Id : null,
             ByUserName = @event.ByUser,
+            Title = @event.Title,
             Memo = @event.Memo,
             Latitude = @event.Latitude,
             Longitude = @event.Longitude
@@ -357,6 +388,7 @@ public class EventApiController : BaseController
         record.FlowerId = update.FlowerId;
         record.EventId = update.CategoryId;
         record.DateUnixTime = now;
+        record.IsHidden = update.IsHidden;
         if (update.ByUser == null)
         {
             record.ByUserId = user.Id;
@@ -367,6 +399,7 @@ public class EventApiController : BaseController
             record.ByUserId = null;
             record.ByUserName = update.ByUser;
         }
+        record.Title = update.Title;
         record.Memo = update.Memo;
         record.Latitude = update.Latitude;
         record.Longitude = update.Longitude;