updated the db

App/Messages/Model.py

@@ -19,6 +19,7 @@ class Message(Model):
     sim_number = fields.IntField(null=True)
     parsed_data = fields.JSONField(null=True)  # New field for parsed data
     created_time = fields.DatetimeField(auto_now_add=True)
+    
 
     class Meta:
         table = "messages"

App/Subscriptions/Schema.py

@@ -14,6 +14,20 @@ class CreateSubscriptionRequest(BaseModel):
     plan_id: str = Field(..., description="ID of the plan to base the subscription on")
 
 
+class CreateCustomSubscriptionRequest(BaseModel):
+    user_id: Optional[str] = Field(
+        None, description="ID of the user to create subscription for"
+    )
+    phone_number: Optional[str] = Field(
+        None, description="The Phone Number of the user to create subscription for"
+    )
+    plan_id: str = Field(..., description="ID of the plan to base the subscription on")
+    expiration_time: str = Field(
+        ...,
+        description="The expiration time of the subscription in 'day/month' format (e.g., 12/1 for 12th January)",
+    )
+
+
 class UpdateUsageRequest(BaseModel):
     download_mb: float = Field(0.0, ge=0, description="Download usage in megabytes")
     upload_mb: float = Field(0.0, ge=0, description="Upload usage in megabytes")

App/Subscriptions/SubscriptionRoutes.py

@@ -9,6 +9,7 @@ from .Schema import (
     SubscriptionResponse,
     BaseResponse,
     UpdateUsageRequest,
+    CreateCustomSubscriptionRequest,
     SubscriptionListResponse,
 )
 
@@ -171,3 +172,75 @@ async def deactivate_subscription(subscription_id: str):
     return BaseResponse(
         code=200, message="Subscription and user deactivated successfully"
     )
+
+
+from datetime import datetime, time
+
+
+from datetime import datetime
+
+
+@subscription_router.post("/subscription/custom", response_model=BaseResponse)
+async def create_subscription(request: CreateCustomSubscriptionRequest):
+    # Find user by user_id or phone_number
+    user = None
+    if request.user_id:  # Check if user_id is provided
+        user = await User.get_or_none(id=request.user_id)
+    elif request.phone_number:  # Check if phone_number is provided
+        user = await User.get_or_none(phoneNumber=request.phone_number)
+
+    if not user:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND, detail="User not found"
+        )
+
+    # Check if plan exists
+    plan = await Plan.get_or_none(id=request.plan_id)
+    if not plan:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND, detail="Plan not found"
+        )
+
+    # Parse expiration_time
+    try:
+        # Expecting expiration_time in "day/month" format (e.g., "12/1" for 12th January)
+        day, month = map(int, request.expiration_time.split("/"))
+        today = datetime.now()
+        expiration_date = datetime(
+            year=today.year,  # Always use the current year
+            month=month,
+            day=day,
+            hour=12,  # Fixed time at 12 PM
+            minute=0,
+            second=0,
+        )
+    except (ValueError, IndexError):
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Invalid expiration_time format. Use 'day/month' (e.g., '12/1').",
+        )
+
+    # Validate expiration_date is not in the past
+    if expiration_date < datetime.now():
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Expiration time cannot be in the past",
+        )
+
+    # Create new subscription based on plan details
+    subscription = await Subscription.create(
+        user=user,
+        plan=plan,
+        duration=plan.duration,
+        download_mb=plan.download_speed * 1024,  # Converting Mbps to MB
+        upload_mb=plan.upload_speed * 1024,  # Converting Mbps to MB
+        expiration_time=expiration_date,
+        active=True,
+    )
+    await subscription.save()
+
+    return BaseResponse(
+        code=200,
+        message="Subscription created successfully",
+        payload={"subscription_id": str(subscription.id)},
+    )

App/modelInit.py

@@ -1,4 +1,4 @@
-import ssl
+import ssl, os
 from App.discovery import discover_models
 
 # Set up SSL context for secure database connections
@@ -13,17 +13,40 @@ print("Discovered models:", models)
 ## for migrations
 models.append("aerich.models")
 
+# TORTOISE_ORM = {
+#     "connections": {
+#         "default": {
+#             "engine": "tortoise.backends.asyncpg",
+#             "credentials": {
+#                 "host": "ep-patient-darkness-a5bmmt9r.us-east-2.aws.neon.tech",
+#                 "port": "5432",
+#                 "user": "neondb_owner",
+#                 "password": "l2kE5dbMyqfx",
+#                 "database": "neondb",
+#                 "ssl": ssl_context,  # Pass the SSL context here
+#             },
+#         }
+#     },
+#     "apps": {
+#         "models": {
+#             "models": models,
+#             "default_connection": "default",
+#         }
+#     },
+# }
+
+
 TORTOISE_ORM = {
     "connections": {
         "default": {
             "engine": "tortoise.backends.asyncpg",
             "credentials": {
-                "host": "ep-patient-darkness-a5bmmt9r.us-east-2.aws.neon.tech",
+                "host": "aws-0-us-west-1.pooler.supabase.com",
                 "port": "5432",
-                "user": "neondb_owner",
-                "password": "l2kE5dbMyqfx",
-                "database": "neondb",
-                "ssl": ssl_context,  # Pass the SSL context here
+                "user": os.getenv("DB_USER"),
+                "user": os.getenv("DB_PASSWORD"),
+                "database": "postgres",
+                # "ssl": ssl_context,  # Uncomment this if SSL is required
             },
         }
     },