more

bukowa · bukowa · commit 72fa80200a1e · 2020-07-15T03:24:44.000+02:00
diff --git a/bukdjango_multiform/views.py b/bukdjango_multiform/views.py
@@ -1,19 +1,27 @@
 from django import forms
 from django.http import HttpResponseBadRequest
+from django.utils.decorators import method_decorator
 from django.utils.functional import cached_property
 from django.views.generic import TemplateView
 
 
 class NewMultiForm(type):
 
-    def __init__(cls, name, bases, clsdict):
-        super().__init__(name, bases, clsdict)
-
-        if clsdict.get('multiforms'):
-            clsdict.setdefault('multiform_field_name', 'formtype')
-            field_name = clsdict.get('multiform_field_name')
-            for k, v in clsdict['multiforms'].items():
-                clsdict['multiforms'][k]['class'] = type(
+    def __new__(mcs, name, bases, attrs):
+        new_class = super().__new__(mcs, name, bases, attrs)
+
+        multiforms = {}
+        for base in reversed(new_class.__mro__):
+            if hasattr(base, 'multiforms'):
+                multiforms.update(base.multiforms)
+                for k, v in base.multiforms.items():
+                    if v is None and k in multiforms:
+                        multiforms.pop(k)
+
+        if multiforms:
+            field_name = attrs.get('multiform_field_name', 'formtype')
+            for k, v in multiforms.items():
+                multiforms[k]['class'] = type(
                     v['class'].__name__,
                     (v['class'],),
                     {field_name: forms.CharField(
@@ -22,7 +30,13 @@ def __init__(cls, name, bases, clsdict):
                     )}
                 )
 
+        new_class.multiforms = multiforms
+
+        return new_class
 
+
+# todo before post we should decorate
+# todo for ex. login required or other checks per form
 class MultiFormMixin(metaclass=NewMultiForm):
 
     multiforms = {}
@@ -61,6 +75,18 @@ def form_params(self):
             self.form_name
         )
 
+    @cached_property
+    def form_checks(self):
+        return self.multiforms.get(
+            self.form_name
+        ).get('checks', None)
+
+    @cached_property
+    def form_save(self):
+        return self.multiforms.get(
+            self.form_name
+        ).get('save', False)
+
     def get_form_kwargs(self, name, params, **kwargs):
         if attrs := params.get('attrs'):
             for attr in attrs:
@@ -72,25 +98,18 @@ def get_form_kwargs(self, name, params, **kwargs):
             kwargs.update(func(**kwargs))
         return kwargs
 
-
-class MultiFormTemplateView(MultiFormMixin, TemplateView):
-
-    def get_context_data(self, **kwargs):
-        ctx = super().get_context_data(**kwargs)
-        for k, v in self.multiforms.items():
-            if not kwargs.get(k):
-                ctx[k] = v['class'](
-                    **self.get_form_kwargs(
-                        name=k, params=v,
-                    )
-                )
-        return ctx
-
     def post(self, request, *args, **kwargs):
 
         if not self.form_params:
             return HttpResponseBadRequest()
 
+        if self.form_checks:
+            for check in self.form_checks:
+                if response := check(
+                    request, *args, **kwargs,
+                ):
+                    return response
+
         form = self.form_class(
             **self.get_form_kwargs(
                 name=self.form_name,
@@ -105,19 +124,35 @@ def post(self, request, *args, **kwargs):
 
         return self.form_invalid(form)
 
-    def post_response(self, form):
-        return self.render_to_response(
-            context=self.get_context_data(**{
-                self.form_name: form,
-            })
-        )
-
     def form_valid(self, form):
         if handler := self.valid_handle:
             return handler(form=form)
+        if self.form_save:
+            form.save()
         return self.post_response(form)
 
     def form_invalid(self, form):
         if handler := self.invalid_handle:
             return handler(form=form)
         return self.post_response(form)
+
+
+class MultiFormTemplateView(MultiFormMixin, TemplateView):
+
+    def get_context_data(self, **kwargs):
+        ctx = super().get_context_data(**kwargs)
+        for k, v in self.multiforms.items():
+            if not kwargs.get(k):
+                ctx[k] = v['class'](
+                    **self.get_form_kwargs(
+                        name=k, params=v,
+                    )
+                )
+        return ctx
+
+    def post_response(self, form):
+        return self.render_to_response(
+            context=self.get_context_data(**{
+                self.form_name: form,
+            })
+        )
diff --git a/tests/forms.py b/tests/forms.py
@@ -1,6 +1,10 @@
 from django import forms
 
 
+class FormSavedException(Exception):
+    pass
+
+
 class Form1(forms.Form):
     field1 = forms.CharField(widget=forms.TextInput())
     field2 = forms.CharField(widget=forms.TextInput())
@@ -16,8 +20,15 @@ def clean_field1(self):
                 'Error! Wrong Value!'
             )
 
+    def save(self):
+        raise FormSavedException()
+
 
 class Form2(forms.Form):
     field1 = forms.CharField(widget=forms.TextInput(), required=True)
     field2 = forms.CharField(widget=forms.TextInput(), required=True)
 
+    def save(self):
+        raise FormSavedException()
+
+
diff --git a/tests/templates/index.html b/tests/templates/index.html
@@ -17,6 +17,12 @@
     {% csrf_token %}
     <input type="submit">
 </form>
+form3_ctx<br>
+<form method="post">
+    {{ form3_ctx }}
+    {% csrf_token %}
+    <input type="submit">
+</form>
 
 </body>
 </html>
diff --git a/tests/tests.py b/tests/tests.py
@@ -1,8 +1,119 @@
-from django.test import TestCase, Client
+from django.test import TestCase
+from .forms import FormSavedException
+from .views import MyMultiFormTemplateView4, MyMultiFormTemplateView3
 
 
 class AppTestCase(TestCase):
 
+    def test_save(self):
+        with self.assertRaises(FormSavedException) as err:
+            r = self.client.post(
+                '/decoratorview2/6',
+                data={
+                    'field1': '1',
+                    'field2': 'a',
+                    'formtype': 'form1_ctx'
+                }
+            )
+
+    def test_checks(self):
+        r = self.client.post(
+            '/decoratorview/1',
+            data={
+                'field1': '1',
+                'field2': 'a',
+                'formtype': 'form1_ctx'
+            }
+        )
+        self.assertEqual(
+            r.status_code, 403
+        )
+        self.assertEqual(
+            b'loginplease', r.content,
+        )
+
+    def test_checks2(self):
+        r = self.client.post(
+            '/decoratorview2/5',
+            data={
+                'field1': '1',
+                'field2': 'a',
+                'formtype': 'form1_ctx'
+            }
+        )
+        self.assertEqual(
+            r.status_code, 408
+        )
+        self.assertNotEqual(
+            b'loginplease', r.content,
+        )
+
+    def test_multiclass_post(self):
+        r = self.client.post(
+            '/view4/5',
+            data={
+                'field1': '1',
+                'field2': 'a',
+                'zxc': 'form4_ctx'
+            }
+        )
+        self.assertEqual(
+            r.status_code, 200
+        )
+
+        r = self.client.post(
+            '/view4/5',
+            data={
+                'field1': '1',
+                'field2': 'a',
+                'zxc': 'form2_ctx'
+            }
+        )
+        self.assertEqual(
+            r.status_code, 400
+        )
+
+        r = self.client.post(
+            '/view4/5',
+            data={
+                'field1': '1',
+                'field2': 'a',
+                'zxc': 'form1_ctx'
+            }
+        )
+        self.assertEqual(
+            r.status_code, 200
+        )
+
+    def test_multiclass(self):
+
+        view = MyMultiFormTemplateView3()
+        desired = {
+            'form3_ctx': {
+            },
+            'form1_ctx': {
+            },
+            'form2_ctx': {
+            },
+        }
+        self.assertEqual(
+            view.multiforms.keys(),
+            desired.keys(),
+        )
+
+        view = MyMultiFormTemplateView4()
+        print(view.multiforms)
+        desired = {
+            'form1_ctx': {
+            },
+            'form4_ctx': {
+            },
+        }
+        self.assertEqual(
+            view.multiforms.keys(),
+            desired.keys(),
+        )
+
     def test_render_1(self):
         r = self.client.get('/')
         self.assertEqual(
diff --git a/tests/urls.py b/tests/urls.py
@@ -1,9 +1,12 @@
 from django.urls import path
 
-from .views import MyMultiFormTemplateView1, MyMultiFormTemplateView2
+from .views import DecoratorFormTemplateView3, DecoratorFormTemplateView2, DecoratorFormTemplateView, MyMultiFormTemplateView1, MyMultiFormTemplateView2, MyMultiFormTemplateView4
 
 
 urlpatterns = [
     path('<int:some_kwarg>', MyMultiFormTemplateView1.as_view()),
     path('test', MyMultiFormTemplateView2.as_view()),
+    path('view4/<int:some_kwarg>', MyMultiFormTemplateView4.as_view()),
+    path('decoratorview/<int:some_kwarg>', DecoratorFormTemplateView.as_view()),
+    path('decoratorview2/<int:some_kwarg>', DecoratorFormTemplateView3.as_view())
 ]
diff --git a/tests/views.py b/tests/views.py
