Merge pull request #77 from openimis/feature/test-empty-db

Feature/test empty db

Author: zikani03

invoice/services/invoicePayments.py

@@ -40,7 +40,7 @@ def payment_received(self, invoice_payment: InvoicePayment, payment_status: Invo
 
                 self._update_invoice_status(invoice_payment.invoice, Invoice.Status.PAID)
 
-                invoice_payment.invoice.save(username=self.user.username)
+                invoice_payment.invoice.save(user=self.user)
                 return self.save_instance(invoice_payment)
         except Exception as exc:
             return output_exception(model_name="InvoicePayment", method="payment_received", exception=exc)
@@ -52,7 +52,7 @@ def payment_refunded(self, invoice_payment):
                 self._update_payment_status(invoice_payment, InvoicePayment.PaymentStatus.REFUNDED)
                 self._update_invoice_status(invoice_payment.invoice, Invoice.Status.SUSPENDED)
 
-                invoice_payment.invoice.save(username=self.user.username)
+                invoice_payment.invoice.save(user=self.user)
                 return self.save_instance(invoice_payment)
         except Exception as exc:
             return output_exception(model_name="InvoicePayment", method="payment_refunded", exception=exc)
@@ -65,7 +65,7 @@ def payment_cancelled(self, invoice_payment):
                 self._update_payment_status(invoice_payment.invoice, InvoicePayment.PaymentStatus.CANCELLED)
                 self._update_invoice_status(invoice_payment.invoice, Invoice.Status.SUSPENDED)
 
-                invoice_payment.invoice.save(username=self.user.username)
+                invoice_payment.invoice.save(user=self.user)
                 return self.save_instance(invoice_payment)
         except Exception as exc:
             return output_exception(model_name="InvoicePayment", method="payment_refunded", exception=exc)

invoice/services/paymentInvoice.py

@@ -35,15 +35,15 @@ def create_with_detail(self, payment_invoice: dict, payment_detail: DetailPaymen
         try:
             with transaction.atomic():
                 payment = PaymentInvoice(**payment_invoice)
-                payment.save(username=self.user.username)
+                payment.save(user=self.user)
                 payment_detail.payment = payment
                 payment_detail.subject = self._get_generic_object(
                     payment_detail.subject_id,
                     payment_detail.subject_type
                 )
                 if 'reconciliation' in payment.json_ext:
                     payment_detail.reconcilation_id = payment.json_ext['reconciliation']['id']
-                payment_detail.save(username=self.user.username)
+                payment_detail.save(user=self.user)
                 dict_repr = model_representation(payment)
                 dict_repr['payment_detail_uuid'] = payment_detail.uuid
                 return output_result_success(dict_representation=dict_repr)
@@ -115,7 +115,7 @@ def _update_detail(self, detail_collection, status):
         for detail in detail_collection:
             if detail.status != status:
                 detail.status = status
-                detail.save(username=self.user.username)
+                detail.save(user=self.user)
 
     @classmethod
     def _get_generic_object(cls, subject_id, subject_type):

invoice/tests/services/invoice.py

@@ -245,7 +245,7 @@ def test_invoice_match_items_no_subject_valid_line_item(self):
             response = self.insuree_service.create(payload)
             invoice = Invoice.objects.filter(code=payload['code']).get()
             invoice.subject = None
-            invoice.save(username=self.user.username)
+            invoice.save(user=self.user)
             invoice_line_item = create_test_invoice_line_item(invoice=invoice, line_item=self.policy, user=self.user)
 
             output = self.insuree_service.invoice_match_items(invoice)
@@ -264,9 +264,9 @@ def test_invoice_match_items_no_subject_id_invalid_no_line_item(self):
             invoice = Invoice.objects.filter(code=payload['code']).get()
             invoice_line_item = create_test_invoice_line_item(invoice=invoice, line_item=self.policy, user=self.user)
             invoice.subject = None
-            invoice.save(username=self.user.username)
+            invoice.save(user=self.user)
             invoice_line_item.line = None
-            invoice_line_item.save(username=self.user.username)
+            invoice_line_item.save(user=self.user)
 
             output = self.insuree_service.invoice_match_items(invoice)
             expected_output = {

invoice/tests/services/invoiceLineItem.py

@@ -93,7 +93,7 @@ def setUpClass(cls):
 
         cls.policy_holder = create_test_policy_holder()
         cls.contract = create_test_contract(cls.policy_holder)
-        cls.user = User.objects.filter(username='admin').first()
+        cls.user = User.objects.filter(username='Admin').first()
         cls.insuree = create_test_insuree(with_family=True)
         cls.line_item_service = InvoiceLineItemService(cls.user)
         cls.invoice = create_test_invoice(cls.contract, cls.insuree)

invoice/tests/services/invoicePayment.py

@@ -6,6 +6,7 @@
 from product.test_helpers import create_test_product
 
 from core.forms import User
+from core.test_helpers import create_test_interactive_user
 from django.test import TestCase
 
 from invoice.models import Invoice, InvoicePayment
@@ -53,10 +54,9 @@ class ServiceTestInvoicePayments(TestCase):
     def setUpClass(cls):
         super(ServiceTestInvoicePayments, cls).setUpClass()
         cls.maxDiff = None
-        if not User.objects.filter(username='admin_invoice').exists():
-            User.objects.create_superuser(username='admin_invoice', password='S\/pe®Pąßw0rd™')
+        
 
-        cls.user = User.objects.filter(username='admin_invoice').first()
+        cls.user = create_test_interactive_user(username='admin_invoice')
         cls.invoice_payment_service = InvoicePaymentsService(cls.user)
 
         cls.policy_holder = create_test_policy_holder()
@@ -79,7 +79,7 @@ def test_ref_received(self):
             payload['status'] = InvoicePayment.PaymentStatus.ACCEPTED
 
             payment = self._create_payment(payload)
-            payment.save(username=self.user.username)
+            payment.save(user=self.user)
 
             out = self.invoice_payment_service.ref_received(payment, 'code_ext1')
             expected = self.BASE_EXPECTED_SUCCESS_RESPONSE.copy()

invoice/tests/services/paymentInvoice.py

@@ -137,13 +137,13 @@ def test_payment_cancelled(self):
     def _create_payment(self, payment, payment_detail):
         payment = PaymentInvoice(**payment)
         payment.invoice = self.invoice
-        payment.save(username=self.user.username)
+        payment.save(user=self.user)
         payload_detail = DEFAULT_TEST_DETAIL_PAYMENT_INVOICE_PAYLOAD.copy()
         payload_detail['subject'] = self.invoice
         payload_detail['subject_type'] = ContentType.objects.get_for_model(self.invoice)
         payment_detail = DetailPaymentInvoice(**payload_detail)
         payment_detail.payment = payment
-        payment_detail.save(username=self.user.username)
+        payment_detail.save(user=self.user)
         return payment, payment_detail
 
     def _assert_output_valid(self, out, payment, expected):