Merge branch 'master' of https://github.com/UWPCE-PythonCert/IntroPython-2017

Author: PythonCHB

students/eowyn/session10/ff-mailroom/ffmailroom.py

@@ -33,7 +33,7 @@ def filter_donations(self, min_donation, max_donation):
 
     @property
     def sum_donations(self):
-        return round(sum(self.donations), 2)
+        return sum(self.donations)
 
     @property
     def count_donations(self):
@@ -65,20 +65,22 @@ def add_donor(self, name, amt):
         return this_donor.generate_letter()
 
     def get_donor(self, name):
-        for i in self.all_donors:
-            if i.name == name:
-                return i
+        for this_donor in self.all_donors:
+            if this_donor.name == name:
+                return this_donor
 
     def list_names(self):
         return ("Donor Names:\n" +
                 '\n'.join([i.name for i in self.all_donors]))
 
     def generate_report_data(self):
-        names = [i.name for i in self.all_donors]
-        totals = [i.sum_donations for i in self.all_donors]
-        counts = [i.count_donations for i in self.all_donors]
-        averages = [i.average_donation for i in self.all_donors]
-        report_data = list(zip(names, totals, counts, averages))
+        report_data = []
+        for this_donor in self.all_donors:
+            new_data = (this_donor.name,
+                        this_donor.sum_donations,
+                        this_donor.count_donations,
+                        this_donor.average_donation)
+            report_data.append(new_data)
         report_data = sorted(report_data,
                              key=lambda y: int(y[1]),
                              reverse=True)
@@ -110,10 +112,8 @@ def print_donor_records(self):
 
     @property
     def total_donations(self):
-        total = 0
-        for i in self.all_donors:
-            total += i.sum_donations
-        return total
+        return sum( (d.sum_donations for d in self.all_donors) )
+
 
     def challenge(self, factor, min_donation=0,
                   max_donation=float('inf')):

students/eowyn/session10/ff-mailroom/test_ffmailroom.py

@@ -109,6 +109,7 @@ def test_generate_report_data():
     t.add_donor(name2, amt3)
     result = [('Marge Simpson', 1500.0, 2, 750.0),
               ('Ada Lovelace', 345.0, 1, 345.0)]
+    print(t.generate_report_data)
     assert t.generate_report_data() == result
 
 

students/eowyn/session11/Mailroom/bin/mailroom

@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+import sys
+import copy
+from textwrap import dedent
+from mailroom.transactions import Transactions
+from mailroom.ui import Mailroom
+
+if __name__ == "__main__":
+    Mailroom(Transactions()).mainloop()

students/eowyn/session11/Mailroom/mailroom/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.0"

students/eowyn/session11/Mailroom/mailroom/donor.py

@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+import sys
+import copy
+from textwrap import dedent
+
+
+class Donor():
+    # Keep track of individual donors and their history of donations
+
+    def __init__(self, name):
+        self.donations = []
+        self.name = ''.join(name)  # should we check input?
+
+    def add_donation(self, amt):
+        self.donations.append(float(amt))
+
+    def generate_letter(self):
+        '''
+        Generate a formatted thank you note to a donor and return
+        the string of the thank you note for printing or writing.
+        '''
+        fs = "Thank you, {0}, for your generosity and recent gift of ${1:.2f}."
+        return fs.format(self.name, self.most_recent_donation)
+
+    def mult_donations(self, factor):
+        self.donations = list(map(lambda x: x * factor, self.donations))
+
+    def filter_donations(self, min_donation, max_donation):
+        if min_donation > max_donation:
+            (min_donation, max_donation) = (max_donation, min_donation)
+        self.donations = list(filter(lambda x: x > min_donation and
+                                     x < max_donation, self.donations))
+
+    @property
+    def sum_donations(self):
+        return sum(self.donations)
+
+    @property
+    def count_donations(self):
+        return len(self.donations)
+
+    @property
+    def most_recent_donation(self):
+        return round(self.donations[-1], 2)
+
+    @property
+    def average_donation(self):
+        return round(self.sum_donations / self.count_donations, 2)

students/eowyn/session11/Mailroom/mailroom/test/test_ffmailroom.py

@@ -0,0 +1,201 @@
+#!/usr/bin/env python
+
+from mailroom.donor import Donor
+from mailroom.transactions import Transactions
+
+def test_donor_init():
+    name = "Ada Lovelace"
+    amt = 345
+    d = Donor(name)
+    d.add_donation(amt)
+    assert d.name == name
+    assert d.donations == [345]
+
+def test_name():
+    name = "Ada Lovelace"
+    amt = 345
+    d = Donor(name)
+    d.add_donation(amt)
+    assert d.name == name
+
+
+def test_create_transactions():
+    name = "Ada Lovelace"
+    amt = 345
+    d = Donor(name)
+    d.add_donation(amt)
+    t = Transactions()
+    t.add_donor(name, amt)
+    assert t.get_donor(name).name == name
+
+
+def test_add_donors_to_transactions():
+    name = "Ada Lovelace"
+    amt = 345
+    d = Donor(name)
+    d.add_donation(amt)
+    name2 = "Marge Simpson"
+    amt2 = 500
+    d2 = Donor(name2)
+    d2.add_donation(amt2)
+    t = Transactions()
+    t.add_donor(name, amt)
+    t.add_donor(name2, amt2)
+    assert t.get_donor(name).name == name
+    assert t.get_donor(name2).name == name2
+    assert t.get_donor(name).most_recent_donation == amt
+    assert t.get_donor(name2).most_recent_donation == amt2
+
+
+
+def test_add_donation():
+    name = "Ada Lovelace"
+    amt = 345
+    d = Donor(name)
+    d.add_donation(amt)
+    amt2 = 400
+    d.add_donation(amt2)
+    assert d.count_donations == 2
+    assert d.sum_donations == 745
+    assert d.most_recent_donation == 400
+    assert d.average_donation == 372.50
+
+
+def test_new_donor():
+    name = "Ada Lovelace"
+    amt = 345
+    d = Donor(name)
+    d.add_donation(amt)
+    name2 = "Marge Simpson"
+    amt2 = 500
+    d2 = Donor(name2)
+    d2.add_donation(amt2)
+    t = Transactions()
+    t.add_donor(name, amt)
+    assert t.get_donor(name2) is None
+    t.add_donor(name2, amt2)
+    assert t.get_donor(name2).name == name2
+    assert t.get_donor(name2).most_recent_donation == amt2
+
+
+def test_list_names():
+    name = "Ada Lovelace"
+    amt = 345
+    d = Donor(name)
+    d.add_donation(amt)
+    name2 = "Marge Simpson"
+    amt2 = 500
+    d2 = Donor(name2)
+    d2.add_donation(amt2)
+    t = Transactions()
+    t.add_donor(name, amt)
+    t.add_donor(name2, amt2)
+    result = 'Donor Names:\n' + name + '\n' + name2
+    print(t.list_names())
+    assert t.list_names() == result
+
+
+def test_generate_report_data():
+    name, amt = ("Ada Lovelace", 345)
+    d = Donor(name)
+    d.add_donation(amt)
+    name2, amt2, amt3 = ("Marge Simpson", 500, 1000)
+    d2 = Donor(name2)
+    d2.add_donation(amt2)
+    t = Transactions()
+    t.add_donor(name, amt)
+    t.add_donor(name2, amt2)
+    t.add_donor(name2, amt3)
+    result = [('Marge Simpson', 1500.0, 2, 750.0),
+              ('Ada Lovelace', 345.0, 1, 345.0)]
+    print(t.generate_report_data)
+    assert t.generate_report_data() == result
+
+
+def test_setup_table():
+    t = Transactions()
+    returnval = t.setup_table()
+    assert returnval.startswith("Donor Name")
+    assert "Total Given" in returnval
+    assert "Num Gifts" in returnval
+    assert "Average Gift" in returnval
+
+
+def test_setup_body():
+    name, amt = ("Ada Lovelace", 345)
+    d = Donor(name)
+    d.add_donation(amt)
+    name2, amt2, amt3 = ("Marge Simpson", 500, 1000)
+    d2 = Donor(name2)
+    d2.add_donation(amt2)
+    t = Transactions()
+    t.add_donor(name, amt)
+    t.add_donor(name2, amt2)
+    t.add_donor(name2, amt3)
+    returnval = t.setup_body()
+    nlines = returnval.count('\n')
+    assert name in returnval
+    assert name2 in returnval
+    assert nlines == 2
+
+
+def test_letter_string():
+    name, amt = ("Ada Lovelace", 345)
+    d = Donor(name)
+    d.add_donation(amt)
+    result = "Thank you, Ada Lovelace, for your generosity and recent gift of $345.00."
+    assert d.generate_letter() == result
+
+def test_mult_donations():
+    name, amt, amt2, amt3 = ("Ada Lovelace", 350, 700, 100)
+    d = Donor(name)
+    d.add_donation(amt)
+    d.add_donation(amt2)
+    d.add_donation(amt3)
+    d.mult_donations(2)
+    assert d.donations == [700, 1400, 200]
+
+def test_filter_donations():
+    name, amt, amt2, amt3 = ("Ada Lovelace", 350, 700, 100)
+    d = Donor(name)
+    d.add_donation(amt)
+    d.add_donation(amt2)
+    d.add_donation(amt3)
+    d.filter_donations(600, 800)
+    assert d.donations == [700]
+
+def test_filter_correct_donations():
+    name, amt, amt2, amt3 = ("Ada Lovelace", 350, 700, 100)
+    d = Donor(name)
+    d.add_donation(amt)
+    d.add_donation(amt2)
+    d.add_donation(amt3)
+    d.filter_donations(800, 600)  # max and min clearly swapped
+    assert d.donations == [700]
+
+def test_total_donations():
+    name, amt, amt2, amt3 = ("Ada Lovelace", 350, 700, 100)
+    d = Donor(name)
+    d.add_donation(amt)
+    d.add_donation(amt2)
+    d.add_donation(amt3)
+    t = Transactions()
+    t.add_donor(name, amt)
+    t.add_donor(name, amt2)
+    t.add_donor(name, amt3)
+    assert t.total_donations == 1150
+
+def test_challenge():
+    name, amt = ("Ada Lovelace", 345)
+    d = Donor(name)
+    d.add_donation(amt)
+    name2, amt2, amt3 = ("Marge Simpson", 500, 1000)
+    d2 = Donor(name2)
+    d2.add_donation(amt2)
+    t = Transactions()
+    t.add_donor(name, amt)
+    t.add_donor(name2, amt2)
+    t.add_donor(name2, amt3)
+    result = t.challenge(2, 400, 600)
+    assert result == 500
+