Merge branch 'master' into sms_sender_id-for-post-notfications

tests/app/dao/test_annual_billing_dao.py

@@ -0,0 +1,57 @@
+from app.service.utils import get_current_financial_year_start_year
+from app.models import AnnualBilling
+from app.dao.annual_billing_dao import (
+    dao_create_or_update_annual_billing_for_year,
+    dao_get_free_sms_fragment_limit_for_year,
+    dao_get_annual_billing
+)
+
+
+def test_get_sample_service_has_default_free_sms_fragment_limit(notify_db_session, sample_service):
+
+    # when sample_service was created, it automatically create an entry in the annual_billing table
+    free_limit = dao_get_free_sms_fragment_limit_for_year(sample_service.id, get_current_financial_year_start_year())
+
+    assert free_limit.free_sms_fragment_limit == 250000
+    assert free_limit.financial_year_start == get_current_financial_year_start_year()
+    assert free_limit.service_id == sample_service.id
+
+
+def test_dao_update_free_sms_fragment_limit(notify_db_session, sample_service):
+    year = 1999
+    old_limit = 1000
+    new_limit = 9999
+
+    data = AnnualBilling(
+        free_sms_fragment_limit=old_limit,
+        financial_year_start=year,
+        service_id=sample_service.id,
+    )
+
+    dao_create_or_update_annual_billing_for_year(data)
+    data.free_sms_fragment_limit = new_limit
+    dao_create_or_update_annual_billing_for_year(data)
+    new_free_limit = dao_get_free_sms_fragment_limit_for_year(sample_service.id, year)
+
+    assert new_free_limit.free_sms_fragment_limit == new_limit
+
+
+def test_create_then_get_annual_billing(notify_db_session, sample_service):
+    years = [1999, 2001]
+    limits = [1000, 2000]
+
+    for i in [0, 1]:
+        data = AnnualBilling(
+            free_sms_fragment_limit=limits[i],
+            financial_year_start=years[i],
+            service_id=sample_service.id,
+        )
+        dao_create_or_update_annual_billing_for_year(data)
+
+    free_limit = dao_get_annual_billing(sample_service.id)
+    assert len(free_limit) == 3     # sample service already has one entry
+    assert free_limit[0].free_sms_fragment_limit == 1000
+    assert free_limit[0].financial_year_start == 1999
+    assert free_limit[0].service_id == sample_service.id
+    assert free_limit[1].free_sms_fragment_limit == 2000
+    assert free_limit[1].financial_year_start == 2001

tests/app/dao/test_services_dao.py

@@ -104,7 +104,7 @@ def test_cannot_create_two_services_with_same_name(sample_user):
                        email_from="email_from1",
                        message_limit=1000,
                        restricted=False,
-                       created_by=sample_user)
+                       created_by=sample_user,)
 
     service2 = Service(name="service_name",
                        email_from="email_from2",