refact: move views to each model file

src/main.rs

@@ -29,7 +29,6 @@ mod pg_pool;
 mod routers;
 mod schema;
 mod utils;
-mod view;
 
 embed_migrations!();
 

src/models/article.rs

@@ -108,3 +108,35 @@ pub mod form {
         }
     }
 }
+
+pub mod view {
+    use crate::models::article::Article;
+    use pulldown_cmark::{html, Parser};
+    use serde::Serialize;
+
+    #[derive(Debug, Serialize)]
+    pub struct ArticleView<'a> {
+        pub article: &'a Article,
+        pub timestamp: i64,
+        pub markdown_content: String,
+        pub description: String,
+    }
+
+    impl<'a> ArticleView<'a> {
+        pub fn from(article: &'a Article) -> ArticleView {
+            let content_split: Vec<_> = article.body.split("<!--more-->").collect();
+            let description_parser = Parser::new(&content_split[0]);
+            let parser = Parser::new(&article.body);
+            let mut description_buf = String::new();
+            let mut content_buf = String::new();
+            html::push_html(&mut content_buf, parser);
+            html::push_html(&mut description_buf, description_parser);
+            ArticleView {
+                article,
+                timestamp: article.publish_at.timestamp(),
+                markdown_content: content_buf,
+                description: description_buf,
+            }
+        }
+    }
+}

src/routers/article.rs

@@ -1,9 +1,12 @@
 use crate::{
     data::RubbleData,
-    models::{article::Article, setting::Setting, CRUD},
+    models::{
+        article::{view::ArticleView, Article},
+        setting::Setting,
+        CRUD,
+    },
     pg_pool::Pool,
     routers::RubbleResponder,
-    view::article::ArticleView,
 };
 use actix_web::{get, web, Either, HttpResponse, Responder};
 use std::{result::Result, sync::Arc};

src/routers/rss.rs

@@ -1,8 +1,11 @@
 use crate::{
     data::RubbleData,
-    models::{article::Article, setting::Setting, CRUD},
+    models::{
+        article::{view::ArticleView, Article},
+        setting::Setting,
+        CRUD,
+    },
     pg_pool::Pool,
-    view::article::ArticleView,
 };
 use actix_web::{get, web, HttpResponse, Responder};
 use rss::{Channel, ChannelBuilder, Item, ItemBuilder};

src/view/article.rs

@@ -1,29 +0,0 @@
-use crate::models::article::Article;
-use pulldown_cmark::{html, Parser};
-use serde::Serialize;
-
-#[derive(Debug, Serialize)]
-pub struct ArticleView<'a> {
-    pub article: &'a Article,
-    pub timestamp: i64,
-    pub markdown_content: String,
-    pub description: String,
-}
-
-impl<'a> ArticleView<'a> {
-    pub fn from(article: &'a Article) -> ArticleView {
-        let content_split: Vec<_> = article.body.split("<!--more-->").collect();
-        let description_parser = Parser::new(&content_split[0]);
-        let parser = Parser::new(&article.body);
-        let mut description_buf = String::new();
-        let mut content_buf = String::new();
-        html::push_html(&mut content_buf, parser);
-        html::push_html(&mut description_buf, description_parser);
-        ArticleView {
-            article,
-            timestamp: article.publish_at.timestamp(),
-            markdown_content: content_buf,
-            description: description_buf,
-        }
-    }
-}

src/view/mod.rs

@@ -1 +0,0 @@
-pub mod article;