Un modelo - One model

docker/entrypoint.sh

@@ -17,7 +17,7 @@ else
       python manage.py runserver 0.0.0.0:8000
       ;;
     "celery-beat")
-      celery -A hope.apps.core.celery beat -l INFO --scheduler hope.apps.core.models:CustomDatabaseScheduler
+      celery -A hope.apps.core.celery beat -l INFO --scheduler hope.models.custom_model_entry:CustomDatabaseScheduler
       ;;
     "celery-worker")
       watchmedo auto-restart --directory=./ --pattern=*.py --recursive -- celery -A hope.apps.core.celery worker -E -l info --max-tasks-per-child=4 --concurrency=4

manage.py

@@ -22,7 +22,7 @@ def run_dev() -> None:
         processes.append(start(f"{sys.executable} manage.py runserver 127.0.0.1:8080"))
         processes.append(
             start(
-                f"{sys.executable} -m celery -A hope.apps.core.celery beat -l INFO --scheduler hope.apps.core.models:CustomDatabaseScheduler"
+                f"{sys.executable} -m celery -A hope.apps.core.celery beat -l INFO --scheduler hope.models.custom_model_entry:CustomDatabaseScheduler"
             )
         )
         processes.append(

src/frontend/src/containers/pages/accountability/surveys/CreateSurveyPage.tsx

@@ -452,7 +452,7 @@ const CreateSurveyPage = (): ReactElement => {
           }
         }}
       >
-        {({ submitForm, setValues, values, setFieldValue, errors }) => (
+        {({ submitForm, setValues, values, errors }) => (
           <>
             <PageHeader
               title={`${'New Survey'} > ${matchCategory(category)}`}

src/frontend/src/restgenerated/index.ts

@@ -239,7 +239,6 @@ export type { PaymentPlanSupportingDocument as PaymentPlanSupportingDocumentCame
 export { PaymentRecordDeliveryTypeEnum as PaymentRecordDeliveryTypeEnumCamelCase } from './models/PaymentRecordDeliveryTypeEnum';
 export { PaymentStatusEnum as PaymentStatusEnumCamelCase } from './models/PaymentStatusEnum';
 export type { PaymentVerificationDetails as PaymentVerificationDetailsCamelCase } from './models/PaymentVerificationDetails';
-export { PaymentVerificationDetailsStatusEnum as PaymentVerificationDetailsStatusEnumCamelCase } from './models/PaymentVerificationDetailsStatusEnum';
 export type { PaymentVerificationPlan as PaymentVerificationPlanCamelCase } from './models/PaymentVerificationPlan';
 export type { PaymentVerificationPlanActivate as PaymentVerificationPlanActivateCamelCase } from './models/PaymentVerificationPlanActivate';
 export type { PaymentVerificationPlanCreate as PaymentVerificationPlanCreateCamelCase } from './models/PaymentVerificationPlanCreate';
@@ -248,6 +247,7 @@ export type { PaymentVerificationPlanImport as PaymentVerificationPlanImportCame
 export type { PaymentVerificationPlanList as PaymentVerificationPlanListCamelCase } from './models/PaymentVerificationPlanList';
 export { PaymentVerificationPlanSamplingEnum as PaymentVerificationPlanSamplingEnumCamelCase } from './models/PaymentVerificationPlanSamplingEnum';
 export { PaymentVerificationPlanStatusEnum as PaymentVerificationPlanStatusEnumCamelCase } from './models/PaymentVerificationPlanStatusEnum';
+export { PaymentVerificationStatusEnum as PaymentVerificationStatusEnumCamelCase } from './models/PaymentVerificationStatusEnum';
 export type { PaymentVerificationSummary as PaymentVerificationSummaryCamelCase } from './models/PaymentVerificationSummary';
 export { PaymentVerificationSummaryStatusEnum as PaymentVerificationSummaryStatusEnumCamelCase } from './models/PaymentVerificationSummaryStatusEnum';
 export type { PDUDataCreate as PDUDataCreateCamelCase } from './models/PDUDataCreate';

src/frontend/src/restgenerated/models/PaymentVerificationDetails.ts

@@ -2,11 +2,11 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { PaymentVerificationDetailsStatusEnum } from './PaymentVerificationDetailsStatusEnum';
+import type { PaymentVerificationStatusEnum } from './PaymentVerificationStatusEnum';
 export type PaymentVerificationDetails = {
     readonly id: string;
     receivedAmount?: string | null;
-    status?: PaymentVerificationDetailsStatusEnum;
+    status?: PaymentVerificationStatusEnum;
     paymentVerificationPlanUnicefId: string;
     verificationChannel: string;
     readonly adminUrl: string | null;

src/frontend/src/restgenerated/models/PaymentVerificationDetailsStatusEnum.ts → src/frontend/src/restgenerated/models/PaymentVerificationStatusEnum.ts

@@ -8,7 +8,7 @@
  * * `RECEIVED` - RECEIVED
  * * `RECEIVED_WITH_ISSUES` - RECEIVED WITH ISSUES
  */
-export enum PaymentVerificationDetailsStatusEnum {
+export enum PaymentVerificationStatusEnum {
     NOT_RECEIVED = 'NOT_RECEIVED',
     PENDING = 'PENDING',
     RECEIVED = 'RECEIVED',

src/frontend/src/restgenerated/services/RestService.ts

@@ -1143,10 +1143,6 @@ export class RestService {
         });
     }
     /**
-     * Mixin to allow using the same viewset for both internal and external endpoints.
-     *
-     * If the request is authenticated with a token, it will use the HOPEPermission and check permission assigned to
-     * variable token_permission.
      * @returns AreaList
      * @throws ApiError
      */
@@ -1193,10 +1189,6 @@ export class RestService {
         });
     }
     /**
-     * Mixin to allow using the same viewset for both internal and external endpoints.
-     *
-     * If the request is authenticated with a token, it will use the HOPEPermission and check permission assigned to
-     * variable token_permission.
      * @returns AreaTree
      * @throws ApiError
      */

src/hope/admin/account.py

@@ -4,14 +4,7 @@
 from django.http import HttpRequest
 
 from hope.admin.utils import HOPEModelAdminBase
-from hope.apps.core.models import BusinessArea
-from hope.apps.payment.models import (
-    Account,
-    AccountType,
-    DeliveryMechanism,
-    DeliveryMechanismConfig,
-)
-from hope.apps.program.models import Program
+from hope.models import Account, AccountType, BusinessArea, DeliveryMechanism, DeliveryMechanismConfig, Program
 
 
 @admin.register(Account)

src/hope/admin/account_filters.py

@@ -7,9 +7,8 @@
 from django.db.models import Q, QuerySet
 from django.http import HttpRequest
 
-from hope.apps.account import models as account_models
 from hope.apps.account.permissions import Permissions
-from hope.apps.core.models import BusinessArea
+from hope.models import BusinessArea, Role
 
 logger = logging.getLogger(__name__)
 
@@ -61,7 +60,7 @@ class IncompatibleRoleFilter(SimpleListFilter):
     parameter_name = "role"
 
     def lookups(self, request: HttpRequest, model_admin: "ModelAdmin[Any]") -> list:
-        types = account_models.Role.objects.values_list("id", "name")
+        types = Role.objects.values_list("id", "name")
         return list(types.order_by("name").distinct())
 
     def queryset(self, request: HttpRequest, queryset: QuerySet) -> QuerySet:

src/hope/admin/account_forms.py

@@ -10,10 +10,8 @@
 from django.forms.utils import ErrorList
 from django.utils.translation import gettext_lazy as _
 
-from hope.apps.account import models as account_models
-from hope.apps.account.models import Partner, Role
 from hope.apps.account.permissions import Permissions
-from hope.apps.core.models import BusinessArea
+from hope.models import BusinessArea, IncompatibleRoles, Partner, Role, RoleAssignment, User
 
 logger = logging.getLogger(__name__)
 
@@ -26,7 +24,7 @@ class RoleAdminForm(forms.ModelForm):
     )
 
     class Meta:
-        model = account_models.Role
+        model = Role
         fields = (
             "name",
             "subsystem",
@@ -37,11 +35,11 @@ class Meta:
 
 
 class RoleAssignmentAdminForm(forms.ModelForm):
-    role = forms.ModelChoiceField(account_models.Role.objects.order_by("name"))
+    role = forms.ModelChoiceField(Role.objects.order_by("name"))
     business_area = forms.ModelChoiceField(BusinessArea.objects.filter(is_split=False))
 
     class Meta:
-        model = account_models.RoleAssignment
+        model = RoleAssignment
         fields = (
             "business_area",
             "user",
@@ -60,11 +58,11 @@ def clean(self) -> None:
         user = self.cleaned_data["user"]
         business_area = self.cleaned_data["business_area"]
 
-        account_models.IncompatibleRoles.objects.validate_user_role(user, business_area, role)
+        IncompatibleRoles.objects.validate_user_role(user, business_area, role)
 
 
 class RoleAssignmentInlineFormSet(forms.BaseInlineFormSet):
-    model = account_models.RoleAssignment
+    model = RoleAssignment
 
     def add_fields(self, form: "forms.Form", index: int | None) -> None:
         super().add_fields(form, index)
@@ -81,10 +79,8 @@ def clean(self) -> None:
                 business_area = form.cleaned_data["business_area"]
                 role = form.cleaned_data["role"]
                 incompatible_roles = list(
-                    account_models.IncompatibleRoles.objects.filter(role_one=role).values_list("role_two", flat=True)
-                ) + list(
-                    account_models.IncompatibleRoles.objects.filter(role_two=role).values_list("role_one", flat=True)
-                )
+                    IncompatibleRoles.objects.filter(role_one=role).values_list("role_two", flat=True)
+                ) + list(IncompatibleRoles.objects.filter(role_two=role).values_list("role_one", flat=True))
                 error_forms = [
                     form_two.cleaned_data["role"].name
                     for form_two in self.forms
@@ -101,7 +97,7 @@ def clean(self) -> None:
 
 class HopeUserCreationForm(UserCreationForm):
     class Meta:
-        model = account_models.User
+        model = User
         fields = ()
         field_classes = {"username": UsernameField, "email": forms.EmailField}
 

src/hope/admin/account_mixins.py

@@ -18,7 +18,7 @@
 import requests
 from requests import RequestException, Response
 
-from hope.apps.account.models import User
+from hope.models import User
 
 logger = logging.getLogger(__name__)
 

src/hope/admin/activity_log.py

@@ -7,7 +7,7 @@
 from django.db.models.query import QuerySet
 from django.http import HttpRequest
 
-from hope.apps.activity_log.models import LogEntry
+from hope.models import LogEntry
 
 
 @admin.register(LogEntry)

src/hope/admin/api_log_entry.py

@@ -5,7 +5,7 @@
 from django.http import HttpRequest
 from smart_admin.modeladmin import SmartModelAdmin
 
-from hope.api.models import APILogEntry
+from hope.models import APILogEntry
 
 
 @admin.register(APILogEntry)

src/hope/admin/api_token.py

@@ -14,15 +14,13 @@
 from django.urls import reverse
 from smart_admin.modeladmin import SmartModelAdmin
 
-from hope.api.models import APIToken
-from hope.apps.account.models import ChoiceArrayField
-from hope.apps.core.models import BusinessArea
+from hope.apps.account.fields import ChoiceArrayField
 from hope.apps.utils.security import is_root
+from hope.models import APIToken, BusinessArea
 
 if TYPE_CHECKING:
     from uuid import UUID
 
-
 TOKEN_INFO_EMAIL = """
 Dear {friendly_name},
 

src/hope/admin/beneficiary_group.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 
 from hope.admin.utils import HOPEModelAdminBase, LastSyncDateResetMixin
-from hope.apps.program.models import BeneficiaryGroup
+from hope.models import BeneficiaryGroup
 
 
 @admin.register(BeneficiaryGroup)

src/hope/admin/business_area.py

@@ -23,21 +23,17 @@
 import requests
 
 from hope.admin.utils import HOPEModelAdminBase, LastSyncDateResetMixin
-from hope.apps.account.models import Partner, RoleAssignment
 from hope.apps.administration.widgets import JsonWidget
-from hope.apps.core.models import BusinessArea
 from hope.apps.core.services.rapid_pro.api import RapidProAPI
-from hope.apps.household.models import DocumentType
 from hope.apps.payment.forms import AcceptanceProcessThresholdForm
-from hope.apps.payment.models import AcceptanceProcessThreshold
 from hope.apps.utils.security import is_root
+from hope.models import AcceptanceProcessThreshold, BusinessArea, DocumentType, Partner, RoleAssignment
 
 if TYPE_CHECKING:
     from uuid import UUID
 
-    from django.contrib.admin import ModelAdmin
-    from django.db.models.query import QuerySet
-
+    from django.contrib.admin.options import ModelAdmin
+    from django.db.models import QuerySet
 
 logger = logging.getLogger(__name__)
 

src/hope/admin/changelog.py

@@ -3,8 +3,8 @@
 from django.db import models
 
 from hope.admin.utils import HOPEModelAdminBase
-from hope.apps.changelog.models import Changelog
 from hope.apps.changelog.widget import HTMLEditor
+from hope.models import Changelog
 
 
 class ChangelogAdminForm(forms.ModelForm):

src/hope/admin/country_code.py

@@ -5,11 +5,10 @@
 from django.http import HttpRequest
 
 from hope.admin.utils import HOPEModelAdminBase
-from hope.apps.core.models import CountryCodeMap
+from hope.models import CountryCodeMap
 
 if TYPE_CHECKING:
-    from django.db.models.query import QuerySet
-
+    from django.db.models import QuerySet
 
 logger = logging.getLogger(__name__)
 

src/hope/admin/data_collecting_type.py

@@ -5,7 +5,7 @@
 from django.contrib import admin
 
 from hope.apps.core.forms import DataCollectingTypeForm
-from hope.apps.core.models import DataCollectingType
+from hope.models import DataCollectingType
 
 logger = logging.getLogger(__name__)
 

src/hope/admin/deduplication_engine_similarity_pair.py

@@ -4,7 +4,7 @@
 from django.contrib import admin
 
 from hope.admin.utils import HOPEModelAdminBase
-from hope.apps.registration_data.models import DeduplicationEngineSimilarityPair
+from hope.models import DeduplicationEngineSimilarityPair
 
 logger = logging.getLogger(__name__)
 

src/hope/admin/document.py

@@ -14,7 +14,7 @@
     SoftDeletableAdminMixin,
 )
 from hope.apps.core.utils import AutoCompleteFilterTemp
-from hope.apps.household.models import FOSTER_CHILD, Document, DocumentType, Individual
+from hope.models import FOSTER_CHILD, Document, DocumentType, Individual
 
 logger = logging.getLogger(__name__)
 

src/hope/admin/entitlement_card.py

@@ -4,7 +4,7 @@
 from django.contrib import admin
 
 from hope.admin.utils import HOPEModelAdminBase
-from hope.apps.household.models import EntitlementCard
+from hope.models import EntitlementCard
 
 logger = logging.getLogger(__name__)
 

src/hope/admin/feedback.py

@@ -2,7 +2,7 @@
 from django.contrib import admin
 
 from hope.admin.utils import HOPEModelAdminBase
-from hope.apps.accountability.models import Feedback
+from hope.models import Feedback
 
 
 @admin.register(Feedback)

src/hope/admin/financial_institution.py

@@ -2,7 +2,7 @@
 from django.contrib import admin
 
 from hope.admin.utils import HOPEModelAdminBase
-from hope.apps.payment.models import FinancialInstitution, FinancialInstitutionMapping
+from hope.models import FinancialInstitution, FinancialInstitutionMapping
 
 
 class FinancialInstitutionMappingInline(admin.TabularInline):

src/hope/admin/flexible_attribute.py

@@ -11,11 +11,10 @@
 from jsoneditor.forms import JSONEditor
 
 from hope.admin.utils import SoftDeletableAdminMixin
-from hope.apps.core.models import FlexibleAttribute
+from hope.models import FlexibleAttribute
 
 if TYPE_CHECKING:
-    from django.db.models.query import QuerySet
-
+    from django.db.models import QuerySet
 
 logger = logging.getLogger(__name__)
 

src/hope/admin/flexible_attribute_choice.py

@@ -6,7 +6,7 @@
 from jsoneditor.forms import JSONEditor
 
 from hope.admin.utils import SoftDeletableAdminMixin
-from hope.apps.core.models import FlexibleAttributeChoice
+from hope.models import FlexibleAttributeChoice
 
 logger = logging.getLogger(__name__)
 

src/hope/admin/flexible_attribute_group.py

@@ -9,7 +9,7 @@
 from mptt.admin import MPTTModelAdmin
 
 from hope.admin.utils import SoftDeletableAdminMixin
-from hope.apps.core.models import FlexibleAttribute, FlexibleAttributeGroup
+from hope.models import FlexibleAttribute, FlexibleAttributeGroup
 
 logger = logging.getLogger(__name__)
 

src/hope/admin/fsp.py

@@ -10,7 +10,7 @@
 from django.utils.html import format_html
 
 from hope.admin.utils import HOPEModelAdminBase
-from hope.apps.payment.models import (
+from hope.models import (
     FinancialServiceProvider,
     FinancialServiceProviderXlsxTemplate,
     FspNameMapping,