expiring subs

App/Android/Android.py

@@ -46,7 +46,7 @@ class AndroidClient:
     @require_base_url
     async def logout_user(self, phone: str) -> APIResponse:
         """Logout a user by phone."""
-        response = await self.client.post(f"/logout/{phone}")
+        response = await self.client.post(f"/logout/{phone}", timeout=60)
         return APIResponse(**response.json())
 
     @require_base_url
@@ -67,7 +67,7 @@ class AndroidClient:
     @require_base_url
     async def get_active_users(self) -> APIResponse:
         """Retrieve all active users."""
-        response = await self.client.get("/users/active")
+        response = await self.client.get("/users/active", timeout=60)
         print(response.json())
         return APIResponse(**response.json())
 
@@ -76,7 +76,7 @@ class AndroidClient:
         """Enable or disable a user."""
         path = f"/users/{phone_number}/remove-session"
         try:
-            response = await self.client.post(path, json=None)
+            response = await self.client.post(path, json=None, timeout=60)
             return APIResponse(**response.json())
         except:
             pass
@@ -85,7 +85,7 @@ class AndroidClient:
     async def _disable_request(self, request: SetUserStatusRequest) -> APIResponse:
         """disable a user."""
         path = f"/users/{request.phone}/disable"
-        response = await self.client.post(path, json=None)
+        response = await self.client.post(path, json=None, timeout=60)
 
         return APIResponse(**response.json())
 
@@ -93,20 +93,20 @@ class AndroidClient:
     async def enable_user(self, request: SetUserStatusRequest) -> APIResponse:
         """Enable or disable a user."""
         path = f"/users/{request.phone}/enable"
-        response = await self.client.post(path, json=None)
+        response = await self.client.post(path, json=None, timeout=60)
         return APIResponse(**response.json())
 
     @require_base_url
     async def get_users_list(self) -> APIResponse:
         """Retrieve all users (active and inactive)."""
-        response = await self.client.get("/users")
+        response = await self.client.get("/users", timeout=60)
         return APIResponse(**response.json())
 
     @require_base_url
     async def get_user_stats(self, phone: Optional[str] = None) -> APIResponse:
         """Retrieve user statistics for a specific user or all users."""
         url = f"/user/stats/{phone}" if phone else "/user/stats"
-        response = await self.client.get(url)
+        response = await self.client.get(url, timeout=60)
         return APIResponse(**response.json())
 
     @require_base_url
@@ -126,15 +126,33 @@ class AndroidClient:
             "phoneNumbers": phone_numbers,
             "event": event,
         }
-        print(data)
-        response = await self.client.post("/send_message", json=data)
+        response = await self.client.post("/send_message", json=data, timeout=60)
         x = response.content
-        print(x)
-        if response.status_code < 200 or response.status_code >= 300:
+        print(response.status_code)
+        if response.status_code >= 200 or response.status_code <= 300:
             return response
         else:
             raise Exception(f"Error sending message : {x}")
 
+    @require_base_url
+    async def change_password(self, phone: str, new_password: str) -> APIResponse:
+        """
+        Change the password for a user.
+        Args:
+            phone (str): The phone number of the user.
+            new_password (str): The new password for the user.
+        Returns:
+            APIResponse: The response from the API.
+        """
+        path = f"/users/{phone}/change-password"
+        payload = {"new_password": new_password}
+
+        try:
+            response = await self.client.post(path, json=payload, timeout=60)
+            return APIResponse(**response.json())
+        except Exception as e:
+            raise Exception(f"Error changing password: {e}")
+
     async def close(self):
         """Close the client session."""
         await self.client.aclose()

App/Payments/PaymentsRoutes.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter, HTTPException, status, Query, Depends
 from typing import List
-from datetime import datetime
+from datetime import datetime, timedelta
 from .Model import Payment
 from App.Users.Model import User
 from App.Plans.Model import Plan
@@ -13,6 +13,7 @@ from .Schema import (
     PaymentListResponse,
 )
 from .Schema import PaymentMethod
+from .utils import get_current_month_range
 from App.Users.dependencies import (
     get_current_active_user,
     UserType,
@@ -40,7 +41,7 @@ async def create_payment(request: CreatePaymentRequest, internal: bool = False):
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND, detail="Plan not found"
         )
-
+    print(request.transaction_id)
     payment = await Payment.get_or_none(transaction_id=request.transaction_id)
 
     if payment:
@@ -166,8 +167,14 @@ async def link_user_to_payment(payment_id: str, request: UpdatePaymentUserReques
 
 @payment_router.get("/payments/date-range", response_model=PaymentListResponse)
 async def get_payments_by_date_range(
-    start_date: datetime = Query(..., description="Start date in ISO format"),
-    end_date: datetime = Query(..., description="End date in ISO format"),
+    start_date: datetime = Query(
+        default_factory=lambda: get_current_month_range()[0],
+        description="Start date in ISO format",
+    ),
+    end_date: datetime = Query(
+        default_factory=lambda: get_current_month_range()[1],
+        description="End date in ISO format",
+    ),
 ):
     if start_date > end_date:
         raise HTTPException(

App/Payments/Schema.py

@@ -1,7 +1,10 @@
 from pydantic import BaseModel, Field
-from typing import Optional, List
+from typing import Optional, List, Union
 from decimal import Decimal
 from datetime import datetime
+from uuid import UUID
+
+from uuid import UUID, uuid4  # Ensure you have this import at the top
 
 
 class BaseResponse(BaseModel):
@@ -38,7 +41,8 @@ class CreatePaymentRequest(BaseModel):
         ..., description="Method of payment", example=PaymentMethod.CASH
     )
     transaction_id: Optional[str] = Field(
-        None, description="Unique transaction ID (for methods like Lipa Number)"
+        default_factory=lambda: str(uuid4()),  # Generate a UUID and convert to string
+        description="Unique transaction ID (for methods like Lipa Number)",
     )
 
 
@@ -49,13 +53,13 @@ class UpdatePaymentStatusRequest(BaseModel):
 
 
 class PaymentResponse(BaseModel):
-    id: str
-    user_id: Optional[str]
-    plan_id: Optional[str]
+    id: Union[UUID, str]
+    user_id: Optional[Union[UUID, str]]
+    plan_id: Optional[Union[UUID, str]]
     amount: Decimal
     payment_method: str
     status: str
-    transaction_id: Optional[str]
+    transaction_id: Optional[Union[UUID, str]]
     created_time: datetime
     updated_time: datetime
 

App/Payments/utils.py

@@ -0,0 +1,11 @@
+from datetime import datetime, timedelta
+import calendar
+
+
+def get_current_month_range():
+    """Helper function to get the first and last dates of the current month."""
+    now = datetime.now()
+    start_of_month = datetime(now.year, now.month, 1)
+    _, last_day = calendar.monthrange(now.year, now.month)
+    end_of_month = datetime(now.year, now.month, last_day, 23, 59, 59)
+    return start_of_month, end_of_month

App/Subscriptions/background_tasks.py

@@ -0,0 +1,35 @@
+from tortoise import Tortoise
+from datetime import datetime, timedelta
+from App.Subscriptions.Model import Subscription
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+async def check_expiring_subscriptions():
+    """
+    Background task to check for subscriptions that are about to expire
+    and update their status accordingly.
+    """
+    try:
+        # Get the current time
+        current_time = datetime.now()
+
+        # Define the threshold for expiring subscriptions (e.g., 1 hour)
+        threshold = current_time + timedelta(hours=1)
+
+        # Fetch subscriptions that are about to expire
+        expiring_subscriptions = await Subscription.filter(
+            active=True, expiration_time__lt=threshold
+        ).all()
+
+        for subscription in expiring_subscriptions:
+            # Deactivate the subscription
+            subscription.active = False
+            await subscription.save()
+            logger.info(
+                f"Subscription {subscription.id} has been deactivated due to expiration."
+            )
+
+    except Exception as e:
+        logger.error(f"Error checking expiring subscriptions: {str(e)}")

App/Templates/Templates.py

@@ -1,8 +1,10 @@
 import os
 from jinja2 import Environment, FileSystemLoader
 from decimal import Decimal
+from datetime import datetime
 
-BUSINESS = "Goba Buku Wifi😉"
+
+BUSINESS = "Buku Mbili Wifi"
 
 
 class MessageTemplate:
@@ -26,10 +28,13 @@ class MessageTemplate:
 
     def payment_confirmation_message(self, amount, expiry_date, business_name=BUSINESS):
         """Generates the payment confirmation message for SMS."""
+        formatted_expiry_date = expiry_date.strftime(
+            "%Y-%m-%d %H:%M:%S"
+        )  # Format the date and time
         return self.render_template(
             "Payment.md",
             amount=amount,
-            expiry_date=expiry_date,
+            expiry_date=formatted_expiry_date,
             business_name=business_name,
         )
 
@@ -59,10 +64,10 @@ class MessageTemplate:
     def insufficient_funds_message(
         self, required_amount: Decimal, provided_amount: Decimal
     ) -> str:
-        return f"Pesa hazitoshi kwa mpango uliyochagua. Zinazohitajika: {required_amount}, Zilizotolewa: {provided_amount}. Tafadhali ongeza pesa zaidi au chagua mpango tofauti."
+        return f"Pesa hazitoshi kwa mpango uliyochagua. Zinazohitajika: {required_amount:,.2f}, Zilizotolewa: {provided_amount:,.2f}. Tafadhali ongeza pesa zaidi au chagua mpango tofauti."
 
     def balance_assigned_message(self, amount: Decimal, new_balance: Decimal) -> str:
-        return f"Habari! Salio la {amount} limeongezwa kwa mafanikio kwenye akaunti yako. Salio lako jipya ni {new_balance}."
+        return f"Habari! Salio la {amount:,.2f} limeongezwa kwa mafanikio kwenye akaunti yako. Salio lako jipya ni {new_balance:,.2f}."
 
     def subscription_expired_message(
         self, user_name: str, plan_name: str, business_name=BUSINESS

App/Users/Schema.py

@@ -19,6 +19,10 @@ class UserResponse(BaseModel):
     account_locked: bool
     model_config = ConfigDict(from_attributes=True)
 
+
+class UserResponseSub(UserResponse):
+    expiration_time: str
+
     # class Config:
     #     orm_mode = True
 

App/Users/UserRoutes.py

@@ -9,6 +9,7 @@ from .Schema import (
     ResetPasswordRequest,
     BaseResponse,
     UserResponse,
+    UserResponseSub,
 )
 from .Model import User
 from jose import jwt
@@ -79,7 +80,11 @@ async def login_user(request: LoginUserRequest):
     if db_user and valid_password:
 
         # Fetch active subscription if it exists
-        subscription = await Subscription.filter(user=db_user, active=True).first()
+        subscription = (
+            await Subscription.filter(user=db_user, expiration_time__isnull=False)
+            .order_by("-expiration_time")
+            .first()
+        )
 
         # Handle case when no active subscription is found
         subscription_end = (
@@ -196,12 +201,31 @@ async def toggle_user_status(user_id: str):
 
 
 @user_router.get(
-    "/user/me", response_model=UserResponse, status_code=status.HTTP_200_OK
+    "/user/me", response_model=UserResponseSub, status_code=status.HTTP_200_OK
 )
 async def get_user_details(current_user: User = Depends(get_current_active_user)):
     """
     Get the current user's details and balance.
     """
+    subscription = (
+        await Subscription.filter(user=current_user, expiration_time__isnull=False)
+        .order_by("-expiration_time")
+        .first()
+    )
+
+    data = UserResponse.from_orm(current_user).model_dump()
+    data["expiration_time"] = subscription.expiration_time.isoformat()
+    return UserResponseSub(**data)
+
+
+@user_router.get(
+    "/user/{user_id}", response_model=UserResponse, status_code=status.HTTP_200_OK
+)
+async def get_user_details(user_id: str, admin: User = Depends(get_admin_user)):
+    """
+    user's details and balance.
+    """
+    current_user = await User.get_or_none(id=user_id)
     return UserResponse.from_orm(current_user)
 
 

App/app.py

@@ -10,12 +10,23 @@ from .Plans.PlanRoutes import plan_router
 from .Portals.PortalRoutes import portal_router
 from .Metrics.MetricsRoutes import metrics_router
 from .Messages.MessagesRoute import message_router
+from .Subscriptions.background_tasks import check_expiring_subscriptions
 
 # from .Subscriptions.background_tasks import check_expiring_subscriptions
 import asyncio, os
 import logging
 import subprocess
 
+
+async def periodic_task():
+    """
+    Periodically run the background task to check for expiring subscriptions.
+    """
+    while True:
+        await check_expiring_subscriptions()
+        await asyncio.sleep(100)  # Run every hour (adjust the interval as needed)
+
+
 logging.basicConfig(level=logging.INFO)
 
 app = FastAPI()
@@ -34,6 +45,9 @@ app.add_middleware(
 async def startup_event():
     await Tortoise.init(config=TORTOISE_ORM)
     await Tortoise.generate_schemas()
+    print("check subs")
+    asyncio.create_task(periodic_task())
+    print("checked subs")
 
 
 @app.get("/")