Merge pull request #5719 from nyaruka/reorg_contacts_app

Reorganize contacts app like orgs app with views as a package
nyaruka · Nov 29, 2024 · e808754 · e808754
2 parents 36b6029 + f37bb76
commit e808754
Show file tree

Hide file tree

Showing 9 changed files with 2,042 additions and 2,024 deletions.
diff --git a/temba/contacts/tests.py b/temba/contacts/tests.py
diff --git a/temba/contacts/views/__init__.py b/temba/contacts/views/__init__.py
@@ -0,0 +1 @@
+from .views import ContactCRUDL, ContactFieldCRUDL, ContactGroupCRUDL, ContactImportCRUDL  # noqa
diff --git a/temba/contacts/forms.py → temba/contacts/views/forms.py b/temba/contacts/forms.py → temba/contacts/views/forms.py
@@ -8,7 +8,7 @@
 from temba.utils import languages
 from temba.utils.fields import InputWidget, SelectMultipleWidget, SelectWidget, TembaMultipleChoiceField
 
-from .models import URN, Contact, ContactGroup, ContactURN
+from ..models import URN, Contact, ContactGroup, ContactURN
 
 
 class CreateContactForm(forms.ModelForm):

diff --git a/temba/contacts/omnibox.py → temba/contacts/views/omnibox.py b/temba/contacts/omnibox.py → temba/contacts/views/omnibox.py
@@ -5,7 +5,7 @@
 from temba import mailroom
 from temba.utils.models.es import IDSliceQuerySet
 
-from .models import Contact, ContactGroup, ContactGroupCount
+from ..models import Contact, ContactGroup, ContactGroupCount
 
 SEARCH_ALL_GROUPS = "g"
 SEARCH_STATIC_GROUPS = "s"

diff --git a/temba/contacts/views/tests.py b/temba/contacts/views/tests.py
diff --git a/temba/contacts/views.py → temba/contacts/views/views.py b/temba/contacts/views.py → temba/contacts/views/views.py
@@ -45,8 +45,8 @@
 from temba.utils.models.es import IDSliceQuerySet
 from temba.utils.views.mixins import ComponentFormMixin, ContextMenuMixin, ModalFormMixin, NonAtomicMixin, SpaMixin
 
+from ..models import URN, Contact, ContactExport, ContactField, ContactGroup, ContactGroupCount, ContactImport
 from .forms import ContactGroupForm, CreateContactForm, UpdateContactForm
-from .models import URN, Contact, ContactExport, ContactField, ContactGroup, ContactGroupCount, ContactImport
 from .omnibox import omnibox_query, omnibox_serialize
 
 logger = logging.getLogger(__name__)

diff --git a/temba/triggers/tests.py b/temba/triggers/tests.py
@@ -8,7 +8,7 @@
 
 from temba.channels.models import Channel
 from temba.contacts.models import ContactGroup
-from temba.contacts.omnibox import omnibox_serialize
+from temba.contacts.views.omnibox import omnibox_serialize
 from temba.flows.models import Flow
 from temba.schedules.models import Schedule
 from temba.tests import CRUDLTestMixin, TembaTest

diff --git a/temba/triggers/types.py b/temba/triggers/types.py
@@ -6,7 +6,7 @@
 
 from temba.channels.models import Channel
 from temba.contacts.models import ContactURN
-from temba.contacts.omnibox import omnibox_deserialize
+from temba.contacts.views.omnibox import omnibox_deserialize
 from temba.flows.models import Flow
 from temba.schedules.views import ScheduleFormMixin
 from temba.utils.fields import JSONField, OmniboxChoice, SelectWidget, TembaChoiceField

diff --git a/temba/triggers/views.py b/temba/triggers/views.py
@@ -11,7 +11,7 @@
 from temba.channels.models import Channel
 from temba.channels.types.android import AndroidType
 from temba.contacts.models import ContactGroup, ContactURN
-from temba.contacts.omnibox import omnibox_serialize
+from temba.contacts.views.omnibox import omnibox_serialize
 from temba.flows.models import Flow
 from temba.formax import FormaxMixin, FormaxSectionMixin
 from temba.orgs.views.base import BaseListView, BaseMenuView