feat:update views and post views

Author: m1guer

Cargo.toml

@@ -13,11 +13,11 @@ default-run = "miguer_api-cli"
 loco-rs = { version = "0.15" }
 
 [dependencies]
-loco-rs = { workspace = true  }
+loco-rs = { workspace = true }
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1" }
 tokio = { version = "1.33.0", default-features = false, features = [
-  "rt-multi-thread",
+    "rt-multi-thread",
 ] }
 async-trait = { version = "0.1.74" }
 axum = { version = "0.8.1" }
@@ -26,17 +26,17 @@ tracing-subscriber = { version = "0.3.17", features = ["env-filter", "json"] }
 regex = { version = "1.11.1" }
 migration = { path = "migration" }
 sea-orm = { version = "1.1.0", features = [
-  "sqlx-sqlite",
-  "sqlx-postgres",
-  "runtime-tokio-rustls",
-  "macros",
+    "sqlx-sqlite",
+    "sqlx-postgres",
+    "runtime-tokio-rustls",
+    "macros",
 ] }
 chrono = { version = "0.4" }
 validator = { version = "0.20" }
 uuid = { version = "1.6.0", features = ["v4"] }
 include_dir = { version = "0.7" }
 dotenvy = "0.15.7"
-axum-client-ip = "1.0.0"
+axum-client-ip = "0.7.0"
 
 [[bin]]
 name = "miguer_api-cli"

src/app.rs

@@ -1,4 +1,5 @@
 use async_trait::async_trait;
+use axum_client_ip::SecureClientIpSource;
 use loco_rs::{
     app::{AppContext, Hooks, Initializer},
     bgworker::{BackgroundWorker, Queue},
@@ -50,6 +51,11 @@ impl Hooks for App {
             .add_route(controllers::posts::routes())
             .add_route(controllers::auth::routes())
     }
+
+    async fn after_routes(router: axum::Router, _ctx: &AppContext) -> Result<axum::Router> {
+        let router = router.layer(SecureClientIpSource::ConnectInfo.into_extension());
+        Ok(router)
+    }
     async fn connect_workers(ctx: &AppContext, queue: &Queue) -> Result<()> {
         queue.register(DownloadWorker::build(ctx)).await?;
         Ok(())

src/controllers/posts.rs

@@ -7,9 +7,10 @@ use crate::models::{
 };
 use axum::{
     debug_handler,
-    extract::{Query, Request},
-    http::{header, HeaderMap, StatusCode},
+    extract::Query,
+    http::{HeaderMap, StatusCode},
 };
+use axum_client_ip::{InsecureClientIp, SecureClientIp};
 use chrono::{Duration, Utc};
 use loco_rs::prelude::*;
 use serde::Deserialize;
@@ -122,23 +123,63 @@ pub async fn create(
 pub async fn increase_views(
     State(_ctx): State<AppContext>,
     Path(id): Path<i32>,
-    req: Request,
+    insecure_ip: InsecureClientIp,
+    headers: HeaderMap,
 ) -> Result<Response> {
-    let post_model = posts::Model::by_id(id)
-        .await
+    let ip_str = insecure_ip.0.to_string();
+    let now = Utc::now();
+    let cutoff = now - Duration::hours(6);
+
+    let mut post = posts::Entity::find_by_id(id)
         .one(&_ctx.db)
         .await?
-        .ok_or_else(|| Error::NotFound)?;
-    let cutoff = Utc::now() - Duration::hours(6);
-    println!("{:?}", req.headers());
-    // let ip = headers
-    //     .get()
-    //     .and_then(|value| value.to_str().ok())
-    //     .and_then(|x_forwarded| x_forwarded.split(',').next())
-    //     .unwrap_or_else(|| String::from("default-ip"));
-    // let already_viewed = post_model
-    //     .find_related(post_views::Entity)
-    //     .filter(post_views::Column::IpAddress.eq(ip));
+        .ok_or(Error::NotFound)?;
+
+    let recent_view = post_views::Entity::find()
+        .filter(post_views::Column::PostId.eq(post.id))
+        .filter(post_views::Column::IpAddress.eq(ip_str.clone()))
+        .filter(post_views::Column::CreatedAt.gt(cutoff))
+        .one(&_ctx.db)
+        .await?;
+
+    if recent_view.is_none() {
+        let user_agent = headers
+            .get("user-agent")
+            .and_then(|v| v.to_str().ok())
+            .map(|s| s.to_string());
+
+        let referer = headers
+            .get("referer")
+            .and_then(|v| v.to_str().ok())
+            .map(|s| s.to_string());
+
+        let device_type = user_agent
+            .as_ref()
+            .map(|ua| {
+                if ua.contains("Mobile") {
+                    Some("mobile")
+                } else if ua.contains("Tablet") {
+                    Some("tablet")
+                } else {
+                    Some("desktop")
+                }
+            })
+            .flatten()
+            .map(String::from);
+
+        let view = post_views::ActiveModel {
+            post_id: Set(post.id),
+            ip_address: Set(ip_str),
+            user_agent: Set(user_agent),
+            referer: Set(referer),
+            device_type: Set(device_type),
+            ..Default::default()
+        };
+        view.insert(&_ctx.db).await?;
+        let mut active_post = post.clone().into_active_model().clone();
+        active_post.views = Set(post.views + 1);
+        active_post.update(&_ctx.db).await?;
+    }
 
     format::text("Views Increased")
 }