radrootsd

commit 594d35534c2a10c3bada84947d63f0690f72aa6e
parent 2a332b259d56a65b8d20d7f6967954257cb43f59
Author: triesap <triesap@radroots.dev>
Date:   Sun,  4 Jan 2026 03:27:44 +0000

events: flatten resource area event response

- Replace flattened event view with explicit row fields
- Extract resource area parsing into helper for reuse
- Sort resource areas by created_at on flattened row
- Update tests to assert against flattened row fields

Diffstat:
M
src/api/jsonrpc/methods/events/resource_area/list.rs
 | 
51
+++++++++++++++++++++++++++++++++++----------------

1 file changed, 35 insertions(+), 16 deletions(-)
diff --git a/src/api/jsonrpc/methods/events/resource_area/list.rs b/src/api/jsonrpc/methods/events/resource_area/list.rs
@@ -3,7 +3,7 @@ use jsonrpsee::server::RpcModule;
 use serde::Serialize;
 use std::time::Duration;
 
-use crate::api::jsonrpc::nostr::{event_tags, event_view_with_tags, NostrEventView};
+use crate::api::jsonrpc::nostr::{event_tags, event_view_with_tags};
 use crate::api::jsonrpc::params::{
     apply_time_bounds,
     limit_or,
@@ -22,18 +22,23 @@ use radroots_nostr::prelude::{
 };
 
 #[derive(Clone, Debug, Serialize)]
-struct ResourceAreaEventFlat {
-    #[serde(flatten)]
-    event: NostrEventView,
+struct ResourceAreaRow {
+    id: String,
+    author: String,
+    created_at: u64,
+    kind: u32,
+    tags: Vec<Vec<String>>,
+    content: String,
+    sig: String,
     resource_area: Option<RadrootsResourceArea>,
 }
 
 #[derive(Clone, Debug, Serialize)]
 struct ResourceAreaListResponse {
-    resource_areas: Vec<ResourceAreaEventFlat>,
+    resource_areas: Vec<ResourceAreaRow>,
 }
 
-fn build_resource_area_rows<I>(events: I) -> Vec<ResourceAreaEventFlat>
+fn build_resource_area_rows<I>(events: I) -> Vec<ResourceAreaRow>
 where
     I: IntoIterator<Item = RadrootsNostrEvent>,
 {
@@ -41,18 +46,32 @@ where
         .into_iter()
         .map(|ev| {
             let tags = event_tags(&ev);
-            let kind = ev.kind.as_u16() as u32;
-            let resource_area = resource_area_from_event(kind, &tags, &ev.content).ok();
-            ResourceAreaEventFlat {
-                event: event_view_with_tags(&ev, tags),
+            let resource_area = parse_resource_area_event(&ev, &tags);
+            let event = event_view_with_tags(&ev, tags);
+            ResourceAreaRow {
+                id: event.id,
+                author: event.author,
+                created_at: event.created_at,
+                kind: event.kind,
+                tags: event.tags,
+                content: event.content,
+                sig: event.sig,
                 resource_area,
             }
         })
         .collect::<Vec<_>>();
-    items.sort_by(|a, b| b.event.created_at.cmp(&a.event.created_at));
+    items.sort_by(|a, b| b.created_at.cmp(&a.created_at));
     items
 }
 
+fn parse_resource_area_event(
+    event: &RadrootsNostrEvent,
+    tags: &[Vec<String>],
+) -> Option<RadrootsResourceArea> {
+    let kind = event.kind.as_u16() as u32;
+    resource_area_from_event(kind, tags, &event.content).ok()
+}
+
 pub fn register(m: &mut RpcModule<RpcContext>, registry: &MethodRegistry) -> Result<()> {
     registry.track("events.resource_area.list");
     m.register_async_method("events.resource_area.list", |params, ctx, _| async move {
@@ -201,10 +220,10 @@ mod tests {
         let areas = build_resource_area_rows(vec![older, newer]);
 
         assert_eq!(areas.len(), 2);
-        assert_eq!(areas[0].event.id, new_id);
-        assert_eq!(areas[0].event.created_at, 200);
-        assert_eq!(areas[1].event.id, old_id);
-        assert_eq!(areas[1].event.created_at, 100);
+        assert_eq!(areas[0].id, new_id);
+        assert_eq!(areas[0].created_at, 200);
+        assert_eq!(areas[1].id, old_id);
+        assert_eq!(areas[1].created_at, 100);
     }
 
     #[test]
@@ -220,7 +239,7 @@ mod tests {
         let areas = build_resource_area_rows(vec![event]);
 
         assert_eq!(areas.len(), 1);
-        assert_eq!(areas[0].event.tags, tags);
+        assert_eq!(areas[0].tags, tags);
         let parsed = areas[0].resource_area.as_ref().expect("area");
         assert_eq!(parsed.d_tag, "area-1");
         assert_eq!(parsed.name, "Area One");