From b2f3edebec6de2980f07502d86413a7ce56cdd4d Mon Sep 17 00:00:00 2001 From: Thomas Jensen <32744171+Mast3rwaf1z@users.noreply.github.com> Date: Sat, 8 Jun 2024 16:45:47 +0200 Subject: [PATCH] [Fix] Add remaining member data to userdata csv (#465) * add data missed in member model * fix missing gender * formatting * Apply suggestions from code review I don't really care either way, all is up to the FITminister Co-authored-by: Kresten Laust --------- Co-authored-by: Kresten Laust --- stregsystem/mail.py | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/stregsystem/mail.py b/stregsystem/mail.py index ceeb38a6..7656e51b 100644 --- a/stregsystem/mail.py +++ b/stregsystem/mail.py @@ -50,6 +50,11 @@ def send_userdata_mail(member): mobilepayments: list[MobilePayment] = member.mobilepayment_set.order_by("timestamp") mobilepay_payments: list[Payment] = [mobilepayment.payment for mobilepayment in mobilepayments] + if member.gender in [i for (i, _) in member.GENDER_CHOICES]: + gender = [text for (i, text) in member.GENDER_CHOICES if member.gender == i][0] + else: + gender = member.gender + sales_csv = rows_to_csv( [["Timestamp", "Name", "Price"]] + [[sale.timestamp, sale.product.name, sale.price] for sale in sales] ) @@ -59,8 +64,32 @@ def send_userdata_mail(member): ) userdata_csv = rows_to_csv( [ - ["Id", "Name", "First name", "Last name", "Email", "Registration year"], - [member.id, member.username, member.firstname, member.lastname, member.email, member.year], + [ + "Id", + "Name", + "First name", + "Last name", + "Email", + "Registration year", + "Active", + "Gender", + "Want spam", + "Balance", + "Undo count", + ], + [ + member.id, + member.username, + member.firstname, + member.lastname, + member.email, + member.year, + member.active, + gender, + member.want_spam, + member.balance, + member.undo_count, + ], ] )