Convert to keys and setup feed_item

This commit is contained in:
Julia Lange 2026-02-04 15:49:55 -08:00
parent c3d9dff83f
commit f0a4e12f2b
Signed by: Julia
SSH key fingerprint: SHA256:5DJcfxa5/fKCYn57dcabJa2vN2e6eT0pBerYi5SUbto
8 changed files with 111 additions and 61 deletions

View file

@ -3,9 +3,9 @@ use crate::{
AdapterPool,
db::{
Channel,
ChannelId,
ChannelKey,
Feed,
FeedId,
FeedKey,
Item,
},
score::{
@ -26,8 +26,8 @@ pub struct UnparsedFeedChannel {
impl UnparsedFeedChannel {
pub fn parse(self) -> Result<FeedChannel> {
Ok(FeedChannel {
channel_id: ChannelId(self.channel_id),
feed_id: FeedId(self.feed_id),
channel_id: ChannelKey(self.channel_id),
feed_id: FeedKey(self.feed_id),
initial_score: Score::new(self.initial_score),
gravity: Gravity::new(self.gravity),
boost: Boost::new(self.boost),
@ -36,8 +36,8 @@ impl UnparsedFeedChannel {
}
pub struct FeedChannel {
channel_id: ChannelId,
feed_id: FeedId,
channel_id: ChannelKey,
feed_id: FeedKey,
initial_score: Score,
gravity: Gravity,
boost: Boost,
@ -80,7 +80,7 @@ mod tests {
use crate::{
db::{
Channel,
FeedId,
FeedKey,
User
},
test_utils::{
@ -123,7 +123,7 @@ mod tests {
let fc = FeedChannel {
channel_id: channel.id(),
feed_id: FeedId(1), // Fake Feed
feed_id: FeedKey(1), // Fake Feed
initial_score: Score::new(None),
gravity: Gravity::new(None),
boost: Boost::new(None),
@ -142,7 +142,7 @@ mod tests {
let feed = Feed::create(pool, user.id(), "My Feed").await.unwrap();
let fc = FeedChannel {
channel_id: ChannelId(1), // Fake Channel
channel_id: ChannelKey(1), // Fake Channel
feed_id: feed.id(),
initial_score: Score::new(None),
gravity: Gravity::new(None),