refactor(api): use FeedUrl instead of String

ymgyt · Apr 20, 2024 · 95bb5ea · 95bb5ea
1 parent 759950b
commit 95bb5ea
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 15 deletions.
diff --git a/crates/synd_api/src/gql/mutation/subscribe_feed.rs b/crates/synd_api/src/gql/mutation/subscribe_feed.rs
@@ -1,7 +1,7 @@
 use async_graphql::{InputObject, Object, Union};
 use synd_feed::{
     feed::parser::FetchFeedError,
-    types::{Category, Requirement},
+    types::{Category, FeedUrl, Requirement},
 };
 
 use crate::{
@@ -15,7 +15,7 @@ use crate::{
 #[derive(InputObject, Debug)]
 pub struct SubscribeFeedInput {
     /// Feed url to subscribe
-    pub url: String,
+    pub url: FeedUrl,
     /// Requirement level for feed
     pub requirement: Option<Requirement>,
     /// Feed category

diff --git a/crates/synd_api/src/gql/mutation/unsubscribe_feed.rs b/crates/synd_api/src/gql/mutation/unsubscribe_feed.rs
@@ -1,11 +1,12 @@
 use async_graphql::{InputObject, Object, Union};
+use synd_feed::types::FeedUrl;
 
 use crate::{gql::mutation::ResponseStatus, usecase};
 
 #[derive(InputObject)]
 pub struct UnsubscribeFeedInput {
     /// Feed url to unsubscribe
-    pub url: String,
+    pub url: FeedUrl,
 }
 
 impl From<UnsubscribeFeedInput> for usecase::UnsubscribeFeedInput {

diff --git a/crates/synd_api/src/gql/object/mod.rs b/crates/synd_api/src/gql/object/mod.rs
@@ -5,7 +5,7 @@ use async_graphql::{
     Enum, Object, SimpleObject, ID,
 };
 use feed_rs::model as feedrs;
-use synd_feed::types::{self, Annotated, Category, Requirement};
+use synd_feed::types::{self, Annotated, Category, FeedUrl, Requirement};
 
 use crate::gql::scalar;
 
@@ -107,7 +107,7 @@ impl Feed {
     }
 
     /// Feed URL
-    async fn url(&self) -> &str {
+    async fn url(&self) -> &FeedUrl {
         self.0.feed.meta().url()
     }
 
@@ -237,7 +237,7 @@ impl<'a> FeedMeta<'a> {
     }
 
     /// Url of the feed
-    async fn url(&self) -> &str {
+    async fn url(&self) -> &FeedUrl {
         self.0.feed.url()
     }
 

diff --git a/crates/synd_api/src/gql/query.rs b/crates/synd_api/src/gql/query.rs
@@ -50,7 +50,7 @@ impl Subscription {
         let edges = feeds
             .into_iter()
             .take(first)
-            .map(|feed| (feed.feed.meta().url().to_owned(), feed))
+            .map(|feed| (feed.feed.meta().url().as_str().to_owned(), feed))
             .map(|(cursor, feed)| (cursor, object::Feed::from(feed)))
             .map(|(cursor, feed)| Edge::new(cursor, feed));
 

diff --git a/crates/synd_api/src/repository/types.rs b/crates/synd_api/src/repository/types.rs
@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use kvsd::Value;
 use serde::{Deserialize, Serialize};
-use synd_feed::types::{self, Annotated, Category, Requirement};
+use synd_feed::types::{self, Annotated, Category, FeedUrl, Requirement};
 
 use crate::repository::RepositoryError;
 
@@ -15,15 +15,15 @@ pub struct Feed {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct FeedSubscription {
     pub user_id: String,
-    pub url: String,
+    pub url: FeedUrl,
     pub requirement: Option<Requirement>,
     pub category: Option<Category<'static>>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Default)]
 pub struct SubscribedFeeds {
-    pub urls: Vec<String>,
-    pub annotations: Option<HashMap<String, FeedAnnotations>>,
+    pub urls: Vec<FeedUrl>,
+    pub annotations: Option<HashMap<FeedUrl, FeedAnnotations>>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]

diff --git a/crates/synd_api/src/usecase/fetch_subscribed_feeds.rs b/crates/synd_api/src/usecase/fetch_subscribed_feeds.rs
@@ -70,7 +70,7 @@ impl Usecase for FetchSubscribedFeeds {
                     feeds
                         .urls
                         .iter()
-                        .position(|url| url == &after)
+                        .position(|url| url.as_str() == after)
                         .map(|p| p + 1)
                 })
                 .unwrap_or(0);

diff --git a/crates/synd_api/src/usecase/subscribe_feed.rs b/crates/synd_api/src/usecase/subscribe_feed.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use synd_feed::{
     feed::{cache::FetchCachedFeed, parser::FetchFeedError},
-    types::{Annotated, Category, Feed, Requirement},
+    types::{Annotated, Category, Feed, FeedUrl, Requirement},
 };
 use synd_o11y::metric;
 use thiserror::Error;
@@ -21,7 +21,7 @@ pub struct SubscribeFeed {
 }
 
 pub struct SubscribeFeedInput {
-    pub url: String,
+    pub url: FeedUrl,
     pub requirement: Option<Requirement>,
     pub category: Option<Category<'static>>,
 }

diff --git a/crates/synd_api/src/usecase/unsubscribe_feed.rs b/crates/synd_api/src/usecase/unsubscribe_feed.rs
@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use synd_feed::types::FeedUrl;
 use synd_o11y::metric;
 
 use crate::{
@@ -15,7 +16,7 @@ pub struct UnsubscribeFeed {
 }
 
 pub struct UnsubscribeFeedInput {
-    pub url: String,
+    pub url: FeedUrl,
 }
 
 pub struct UnsubscribeFeedOutput {}