Skip to content

Commit e4e3789

Browse files
authored
Merge pull request #8 from akhilnarang/fix-validation
fix(user_profile): validate fields received by the API
2 parents 87e5a2a + 169403b commit e4e3789

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

eps/eps/doctype/energy_point_log/energy_point_log.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,4 +394,4 @@ def get_footer_message(timespan):
394394

395395

396396
def delete_energy_point_logs_for_user(user, event):
397-
frappe.db.delete("Energy Point Log", {"user": user.name})
397+
frappe.db.delete("Energy Point Log", {"user": user.name})

eps/eps/page/user_profile/user_profile.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
@frappe.whitelist()
10-
def get_energy_points_heatmap_data(user, date):
10+
def get_energy_points_heatmap_data(user: str, date: str | None):
1111
try:
1212
date = getdate(date)
1313
except Exception:
@@ -29,7 +29,10 @@ def get_energy_points_heatmap_data(user, date):
2929

3030

3131
@frappe.whitelist()
32-
def get_energy_points_percentage_chart_data(user, field):
32+
def get_energy_points_percentage_chart_data(user: str, field: str):
33+
if field not in ("type", "reference_doctype", "rule"):
34+
frappe.throw(frappe._("Invalid field for grouping"))
35+
3336
result = frappe.get_all(
3437
"Energy Point Log",
3538
filters={"user": user, "type": ["!=", "Review"]},
@@ -46,7 +49,7 @@ def get_energy_points_percentage_chart_data(user, field):
4649

4750

4851
@frappe.whitelist()
49-
def get_user_rank(user):
52+
def get_user_rank(user: str):
5053
month_start = datetime.today().replace(day=1)
5154
monthly_rank = frappe.get_all(
5255
"Energy Point Log",
@@ -88,7 +91,7 @@ def update_profile_info(profile_info):
8891

8992

9093
@frappe.whitelist()
91-
def get_energy_points_list(start, limit, user):
94+
def get_energy_points_list(start: int, limit: int, user: str):
9295
return frappe.db.get_list(
9396
"Energy Point Log",
9497
filters={"user": user, "type": ["!=", "Review"]},

0 commit comments

Comments
 (0)