payments
Browse files- App/Messages/MessagesRoute.py +2 -1
- App/Payments/PaymentsRoutes.py +2 -0
- App/Users/Model.py +1 -1
App/Messages/MessagesRoute.py
CHANGED
@@ -20,6 +20,7 @@ import logging
|
|
20 |
from App.Users.dependencies import (
|
21 |
get_current_active_user,
|
22 |
UserType,
|
|
|
23 |
) # Assuming you have a dependency to get the current user
|
24 |
|
25 |
message_router = APIRouter(tags=["Messages"], prefix="/messages")
|
@@ -29,7 +30,7 @@ message_router = APIRouter(tags=["Messages"])
|
|
29 |
|
30 |
|
31 |
@message_router.get("/messages", response_model=List[MessageResponse])
|
32 |
-
async def get_all_messages(current_user: User = Depends(
|
33 |
# Check if the current user is an admin
|
34 |
if current_user.user_type != UserType.ADMIN:
|
35 |
raise HTTPException(
|
|
|
20 |
from App.Users.dependencies import (
|
21 |
get_current_active_user,
|
22 |
UserType,
|
23 |
+
get_admin_user,
|
24 |
) # Assuming you have a dependency to get the current user
|
25 |
|
26 |
message_router = APIRouter(tags=["Messages"], prefix="/messages")
|
|
|
30 |
|
31 |
|
32 |
@message_router.get("/messages", response_model=List[MessageResponse])
|
33 |
+
async def get_all_messages(current_user: User = Depends(get_admin_user)):
|
34 |
# Check if the current user is an admin
|
35 |
if current_user.user_type != UserType.ADMIN:
|
36 |
raise HTTPException(
|
App/Payments/PaymentsRoutes.py
CHANGED
@@ -17,6 +17,7 @@ from .utils import get_current_month_range
|
|
17 |
from App.Users.dependencies import (
|
18 |
get_current_active_user,
|
19 |
UserType,
|
|
|
20 |
) # Assuming you have a dependency to get the current user
|
21 |
|
22 |
|
@@ -175,6 +176,7 @@ async def get_payments_by_date_range(
|
|
175 |
default_factory=lambda: get_current_month_range()[1],
|
176 |
description="End date in ISO format",
|
177 |
),
|
|
|
178 |
):
|
179 |
if start_date > end_date:
|
180 |
raise HTTPException(
|
|
|
17 |
from App.Users.dependencies import (
|
18 |
get_current_active_user,
|
19 |
UserType,
|
20 |
+
get_admin_user,
|
21 |
) # Assuming you have a dependency to get the current user
|
22 |
|
23 |
|
|
|
176 |
default_factory=lambda: get_current_month_range()[1],
|
177 |
description="End date in ISO format",
|
178 |
),
|
179 |
+
admin: User = Depends(get_admin_user),
|
180 |
):
|
181 |
if start_date > end_date:
|
182 |
raise HTTPException(
|
App/Users/Model.py
CHANGED
@@ -170,7 +170,7 @@ class User(models.Model):
|
|
170 |
raise e
|
171 |
new_user = await cls.create(**user_data)
|
172 |
logger.info(f"User {new_user.phoneNumber} created successfully.")
|
173 |
-
await new_user.send_welcome_message()
|
174 |
# if there is a promotion and activate the user
|
175 |
promo_plans = await Plan.filter(is_promo=True).all()
|
176 |
for promo_plan in promo_plans:
|
|
|
170 |
raise e
|
171 |
new_user = await cls.create(**user_data)
|
172 |
logger.info(f"User {new_user.phoneNumber} created successfully.")
|
173 |
+
# await new_user.send_welcome_message()
|
174 |
# if there is a promotion and activate the user
|
175 |
promo_plans = await Plan.filter(is_promo=True).all()
|
176 |
for promo_plan in promo_plans:
|