Add a factory to build the submission

opentech/apply/funds/tests/factories/models.py

@@ -5,6 +5,7 @@ import wagtail_factories
 
 from opentech.apply.funds.models import (
     AbstractRelatedForm,
+    ApplicationSubmission,
     ApplicationForm,
     FundType,
     FundForm,
@@ -23,6 +24,7 @@ __all__ = [
     'FundTypeFactory',
     'FundFormFactory',
     'ApplicationFormFactory',
+    'ApplicationSubmissionFactory',
     'RoundFactory',
     'RoundFormFactory',
     'LabFactory',
@@ -30,6 +32,15 @@ __all__ = [
 ]
 
 
+def build_form(prefix=''):
+    if prefix:
+        prefix += '__'
+    return {
+        f'{prefix}form_fields__{i}__{field}__': ''
+        for i, field in enumerate(blocks.CustomFormFieldsFactory.factories.keys())
+    }
+
+
 class FundTypeFactory(wagtail_factories.PageFactory):
     class Meta:
         model = FundType
@@ -43,10 +54,7 @@ class FundTypeFactory(wagtail_factories.PageFactory):
     @factory.post_generation
     def forms(self, create, extracted, **kwargs):
         if create:
-            fields = {
-                f'form__form_fields__{i}__{field}__': ''
-                for i, field in enumerate(blocks.CustomFormFieldsFactory.factories.keys())
-            }
+            fields = build_form(prefix='form')
             fields.update(**kwargs)
             for _ in range(len(self.workflow_class.stage_classes)):
                 # Generate a form based on all defined fields on the model
@@ -109,3 +117,39 @@ class LabFormFactory(AbstractRelatedFormFactory):
     class Meta:
         model = LabForm
     lab = factory.SubFactory(LabFactory, parent=None)
+
+
+class ApplicationSubmissionFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = ApplicationSubmission
+
+    form_fields = blocks.CustomFormFieldsFactory
+    page = factory.SubFactory(FundTypeFactory)
+    round = factory.SubFactory(RoundFactory)
+
+    @classmethod
+    def _generate(cls, strat, params):
+        params.update(**build_form())
+        return super()._generate(strat, params)
+
+    @classmethod
+    def _create(cls, model, *args, **kwargs):
+        # Make sure we have form_data so no error
+        kwargs['form_data'] = {}
+        return super()._create(model, *args, **kwargs)
+
+    @factory.post_generation
+    def form_data(self, create, extracted, **kwargs):
+        if not extracted:
+            # Ids are added but are not available in the cached version
+            self.refresh_from_db()
+            form_data = {}
+            for field in self.form_fields:
+                try:
+                    answer = kwargs[field.block_type]
+                except KeyError:
+                    answer = ''
+                form_data[field.id] = answer
+
+            self.form_data = form_data
+            self.save()

opentech/apply/funds/tests/test_models.py

@@ -14,6 +14,7 @@ from opentech.apply.funds.workflow import SingleStage
 
 from .factories import (
     ApplicationFormFactory,
+    ApplicationSubmissionFactory,
     CustomFormFieldsFactory,
     FundTypeFactory,
     LabFactory,
@@ -311,3 +312,10 @@ class TestFormSubmission(TestCase):
         # "Thank you for your submission" and "Account Creation"
         self.assertEqual(len(mail.outbox), 2)
         self.assertEqual(mail.outbox[0].to[0], self.email)
+
+
+class TestApplicationSubmission(TestCase):
+    def test_can_get_required_block_names(self):
+        email = 'test@test.com'
+        submission = ApplicationSubmissionFactory(form_data__email=email)
+        self.assertEqual(submission.email, email)