Add bonus days

the2pizza · the2pizza · commit 6b644b86ba1f · 2026-01-24T05:09:57.000+03:00
diff --git a/dev/dev.sql b/dev/dev.sql
@@ -170,6 +170,16 @@ CREATE INDEX idx_subscriptions_expires_at ON subscriptions(expires_at);
 CREATE INDEX idx_subscriptions_referred_by ON subscriptions(referred_by);
 
 
+ALTER TABLE subscriptions
+ADD COLUMN refer_code CHAR(13);
+
+CREATE INDEX idx_subscriptions_refcode ON subscriptions(refer_code);
+
+ALTER TABLE subscriptions
+ADD COLUMN bonus_days INTEGER DEFAULT NULL;
+
+
+
 
 
 
diff --git a/src/bin/api/core/http/handlers/sub.rs b/src/bin/api/core/http/handlers/sub.rs
@@ -281,6 +281,11 @@ where
     let down_str = format_bytes(downlink);
     let up_str = format_bytes(uplink);
 
+    let bonus_days = if let Some(days) = sub.bonus_days() {
+        format!("{}", days)
+    } else {
+        format!("0")
+    };
     let base_link = format!("{}/sub?id={}&env={}", host, id, env);
     let main_link = format!("{}/sub?id={}&format=txt&env={}", host, id, env);
 
@@ -427,6 +432,7 @@ ul {{
 </div>
 
 <div class="small">Вы пригласили: {invited}</div>
+<div class="small">Вы получили {bonus_days} бесплатных дней</div>
 
 <div class="small"><a href="{web_host}/ref.html"> Информация о реферальной программе</a></div>
 
@@ -469,8 +475,8 @@ window.onload = () => {{
         base_link = base_link,
         ref = sub.referral_code(),
         invited = invited,
-        subscription_id = id
-    );
+        subscription_id = id,
+        bonus_days = bonus_days    );
 
     Ok(Box::new(warp::reply::with_status(
         warp::reply::with_header(html, "Content-Type", "text/html; charset=utf-8"),
diff --git a/src/bin/api/core/postgres/subscription.rs b/src/bin/api/core/postgres/subscription.rs
@@ -1,10 +1,12 @@
 use std::sync::Arc;
 use tokio::sync::Mutex;
 
-use super::PgClientManager;
 use pony::memory::subscription::Subscription;
+use pony::utils::get_uuid_last_octet_simple;
 use pony::Result;
 
+use super::PgClientManager;
+
 pub struct PgSubscription {
     pub manager: Arc<Mutex<PgClientManager>>,
 }
@@ -34,41 +36,51 @@ impl PgSubscription {
         let mut manager = self.manager.lock().await;
         let client = manager.get_client().await?;
 
+        let ref_code = get_uuid_last_octet_simple(&new_sub.id);
+
         let row = client
             .query_one(
                 r#"
             INSERT INTO subscriptions 
-            (id, expires_at, referred_by)
-            VALUES ($1, $2, $3)
+            (id, expires_at, referred_by, refer_code)
+            VALUES ($1, $2, $3, $4)
             RETURNING *
             "#,
-                &[&new_sub.id, &new_sub.expires_at, &new_sub.referred_by],
+                &[
+                    &new_sub.id,
+                    &new_sub.expires_at,
+                    &new_sub.referred_by,
+                    &ref_code,
+                ],
             )
             .await?;
 
         Ok(Subscription::from(row))
     }
 
-    pub async fn update_expires_at(
+    pub async fn update_subscription(
         &self,
         id: uuid::Uuid,
-        expires_at: Option<chrono::DateTime<chrono::Utc>>,
+        expires_at: chrono::DateTime<chrono::Utc>,
+        bonus_days: Option<i32>,
+        referred_by: Option<&String>,
     ) -> Result<Subscription> {
         let mut manager = self.manager.lock().await;
         let client = manager.get_client().await?;
-
         let now = chrono::Utc::now();
 
         let row = client
             .query_one(
                 r#"
             UPDATE subscriptions
-            SET expires_at = $1,
-                updated_at = $2
-            WHERE id = $3
+            SET expires_at  = $1,
+                bonus_days  = $2,
+                referred_by = $3,
+                updated_at  = $4
+            WHERE id = $5
             RETURNING *
             "#,
-                &[&expires_at, &now, &id],
+                &[&expires_at, &bonus_days, &referred_by, &now, &id],
             )
             .await?;
 
diff --git a/src/bin/api/core/sync/tasks.rs b/src/bin/api/core/sync/tasks.rs
@@ -462,19 +462,39 @@ where
             sub.extend(days);
         }
 
+        if let Some(bonus_days) = sub_req.bonus_days {
+            sub.set_bonus_days(bonus_days); // 👈 см. ниже
+        }
+
+        if let Some(ref_code) = sub_req.referred_by.clone() {
+            sub.set_referred_by(ref_code);
+        }
+
+        let expires_at = sub
+            .expires_at()
+            .ok_or_else(|| SyncError::InconsistentState {
+                resource: "Subscription".to_string(),
+                id: *sub_id,
+            })?;
+
         if let Err(e) = self
             .db
             .sub()
-            .update_expires_at(*sub_id, sub.expires_at())
+            .update_subscription(
+                *sub_id,
+                expires_at,
+                sub.bonus_days(),
+                sub.referred_by().as_ref(),
+            )
             .await
         {
             log::error!(
-                "Failed to update subscription {} stats in database: {}",
+                "Failed to update subscription {} in database: {}",
                 sub_id,
                 e
             );
             return Err(SyncError::Database(e));
-        };
+        }
 
         log::info!("Successfully updated subscription: {}", sub_id);
         Ok(OperationStatus::Updated(*sub_id))
diff --git a/src/http/requests.rs b/src/http/requests.rs
@@ -44,6 +44,7 @@ pub struct SubCreateReq {
 pub struct SubUpdateReq {
     pub referred_by: Option<String>,
     pub days: Option<i64>,
+    pub bonus_days: Option<i32>,
 }
 
 #[derive(Serialize, Deserialize)]
diff --git a/src/memory/subscription.rs b/src/memory/subscription.rs
@@ -14,6 +14,8 @@ pub struct Subscription {
     pub id: uuid::Uuid,
     pub expires_at: Option<DateTime<Utc>>,
     pub referred_by: Option<String>,
+    pub refer_code: Option<String>,
+    pub bonus_days: Option<i32>,
     pub created_at: DateTime<Utc>,
     pub updated_at: DateTime<Utc>,
     pub is_deleted: bool,
@@ -30,6 +32,8 @@ impl Subscription {
             id: id,
             expires_at: exp_at,
             referred_by: ref_by,
+            refer_code: Some(get_uuid_last_octet_simple(&id)),
+            bonus_days: None,
             created_at: now,
             updated_at: now,
             is_deleted: false,
@@ -40,11 +44,16 @@ impl Subscription {
 impl Default for Subscription {
     fn default() -> Self {
         let now = Utc::now();
+        let id = uuid::Uuid::new_v4();
+
+        let refer_code = get_uuid_last_octet_simple(&id);
 
         Self {
-            id: uuid::Uuid::new_v4(),
+            id: id,
             expires_at: None,
             referred_by: None,
+            refer_code: Some(refer_code),
+            bonus_days: None,
             created_at: now,
             updated_at: now,
             is_deleted: false,
@@ -62,6 +71,8 @@ impl From<tokio_postgres::Row> for Subscription {
             id: row.get("id"),
             expires_at,
             referred_by: row.get("referred_by"),
+            refer_code: row.get("refer_code"),
+            bonus_days: row.get("bonus_days"),
             created_at,
             updated_at,
             is_deleted: row.get::<_, bool>("is_deleted"),
@@ -113,6 +124,7 @@ pub struct UpdateSubscription {
 pub struct SubscriptionStats {
     pub id: uuid::Uuid,
     pub expires_at: Option<DateTime<Utc>>,
+    pub bonus_days: i32,
     pub days_remaining: i64,
     pub is_active: bool,
 }
@@ -126,9 +138,16 @@ impl Subscription {
             99999
         };
 
+        let bonus_days = if let Some(days) = self.bonus_days {
+            days
+        } else {
+            0
+        };
+
         SubscriptionStats {
             id: self.id,
             expires_at: self.expires_at,
+            bonus_days,
             days_remaining,
             is_active: days_remaining > 0 && !self.is_deleted,
         }
@@ -141,10 +160,13 @@ pub trait Operations {
     fn expires_at(&self) -> Option<DateTime<Utc>>;
     fn referral_code(&self) -> String;
     fn referred_by(&self) -> Option<String>;
+    fn set_referred_by(&mut self, code: String);
     fn is_active(&self) -> bool;
     fn days_remaining(&self) -> Option<i64>;
     fn set_expires_at(&mut self, expires_at: DateTime<Utc>) -> Result<(), String>;
     fn mark_deleted(&mut self);
+    fn bonus_days(&self) -> Option<i32>;
+    fn set_bonus_days(&mut self, days: i32);
 }
 
 impl Operations for Subscription {
@@ -171,6 +193,10 @@ impl Operations for Subscription {
         self.referred_by.clone()
     }
 
+    fn set_referred_by(&mut self, code: String) {
+        self.referred_by = Some(code);
+    }
+
     fn is_active(&self) -> bool {
         !self.is_deleted && self.expires_at > Some(Utc::now())
     }
@@ -184,6 +210,14 @@ impl Operations for Subscription {
         }
     }
 
+    fn bonus_days(&self) -> Option<i32> {
+        self.bonus_days.clone()
+    }
+
+    fn set_bonus_days(&mut self, days: i32) {
+        self.bonus_days = Some(days);
+    }
+
     fn set_expires_at(&mut self, expires_at: DateTime<Utc>) -> Result<(), String> {
         if expires_at <= Utc::now() {
             return Err("Expiration date must be in the future".to_string());

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ pub struct SubCreateReq {`
`44`	`44`	`pub struct SubUpdateReq {`
`45`	`45`	`pub referred_by: Option<String>,`
`46`	`46`	`pub days: Option<i64>,`
	`47`	`+ pub bonus_days: Option<i32>,`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`#[derive(Serialize, Deserialize)]`