Fix errors (circular imports)

lemarche/utils/apis/api_brevo.py

@@ -6,8 +6,6 @@
 from huey.contrib.djhuey import task
 from sib_api_v3_sdk.rest import ApiException
 
-from lemarche.siaes.models import Siae
-from lemarche.users.models import User
 from lemarche.utils.urls import get_object_admin_url, get_object_share_url
 
 
@@ -27,7 +25,7 @@ def get_api_client():
     return sib_api_v3_sdk.ApiClient(config)
 
 
-def create_contact(user: User, list_id: int):
+def create_contact(user, list_id: int):
     api_client = get_api_client()
     api_instance = sib_api_v3_sdk.ContactsApi(api_client)
     new_contact = sib_api_v3_sdk.CreateContact(
@@ -51,7 +49,7 @@ def create_contact(user: User, list_id: int):
         logger.error(f"Exception when calling Brevo->ContactsApi->create_contact: {e}")
 
 
-def remove_contact_from_list(user: User, list_id: int):
+def remove_contact_from_list(user, list_id: int):
     api_client = get_api_client()
     api_instance = sib_api_v3_sdk.ContactsApi(api_client)
     contact_emails = sib_api_v3_sdk.RemoveContactFromList(emails=[user.email])
@@ -67,7 +65,7 @@ def remove_contact_from_list(user: User, list_id: int):
             logger.error(f"Exception when calling Brevo->ContactsApi->remove_contact_from_list: {e}")
 
 
-def create_or_update_company(siae: Siae):
+def create_or_update_company(siae):
     """
     Brevo docs:
     - Python library: https://github.com/sendinblue/APIv3-python-library/blob/master/docs/CompaniesApi.md

lemarche/utils/apis/api_hubspot.py

@@ -6,9 +6,6 @@
 from hubspot import Client
 from hubspot.crm.contacts import ApiException, SimplePublicObject, SimplePublicObjectInput
 
-from lemarche.tenders.models import Tender
-from lemarche.users.models import User
-
 
 # from huey.contrib.djhuey import task
 
@@ -85,7 +82,7 @@ def add_to_contacts(
         logger.info("Hubspot: not add contact to the crm (STAGING or TEST environment detected)")
 
 
-def add_user_to_crm(user: User):
+def add_user_to_crm(user):
     result = add_to_contacts(
         email=user.email,
         company=user.company_name,
@@ -100,7 +97,7 @@ def add_user_to_crm(user: User):
 
 
 # @task
-def create_deal_from_tender(tender: Tender):
+def create_deal_from_tender(tender):
     tender_author_hubspot_contact_id = tender.author.hubspot_contact_id
     if not tender_author_hubspot_contact_id:
         user_added_in_crm = add_user_to_crm(tender.author)

lemarche/utils/apis/api_mailjet.py

@@ -5,8 +5,7 @@
 from huey.contrib.djhuey import task
 
 from lemarche.users import constants as user_constants
-from lemarche.users.models import User
-from lemarche.utils.emails import EMAIL_SUBJECT_PREFIX
+from lemarche.utils.constants import EMAIL_SUBJECT_PREFIX
 
 
 logger = logging.getLogger(__name__)
@@ -36,17 +35,17 @@ def get_default_client(params={}):
     return client
 
 
-def get_mailjet_cl_on_signup(user: User, source: str = user_constants.SOURCE_SIGNUP_FORM):
-    if user.kind == user.KIND_SIAE:
+def get_mailjet_cl_on_signup(user, source: str = user_constants.SOURCE_SIGNUP_FORM):
+    if user.kind == user_constants.KIND_SIAE:
         return settings.MAILJET_NL_CL_SIAE_ID
-    elif user.kind == user.KIND_BUYER:
+    elif user.kind == user_constants.KIND_BUYER:
         if source == user_constants.SOURCE_SIGNUP_FORM:
             return settings.MAILJET_NL_CL_BUYER_ID
         elif source == user_constants.SOURCE_TALLY_FORM:
             return settings.MAILJET_NL_CL_BUYER_TALLY_ID
         elif source == user_constants.SOURCE_TENDER_FORM:
             return settings.MAILJET_NL_CL_BUYER_TENDER_ID
-    elif user.kind == user.KIND_PARTNER:
+    elif user.kind == user_constants.KIND_PARTNER:
         if user.partner_kind == user_constants.PARTNER_KIND_FACILITATOR:
             return settings.MAILJET_NL_CL_PARTNER_FACILITATORS_ID
         elif user.partner_kind in (

lemarche/utils/constants.py

@@ -1,3 +1,6 @@
+from django.conf import settings
+
+
 EMPTY_CHOICE = (("", ""),)
 
 ADMIN_FIELD_HELP_TEXT = "Champ renseigné par un ADMIN"
@@ -261,3 +264,6 @@ def format_district(post_code, department):
     # Could use ordinal from humanize but it would be overkill
     number = int(post_code) - (int(department) * 1000)
     return "1er" if number == 1 else f"{number}e"
+
+
+EMAIL_SUBJECT_PREFIX = f"[{settings.BITOUBI_ENV.upper()}] " if settings.BITOUBI_ENV != "prod" else ""

lemarche/utils/emails.py

@@ -5,11 +5,8 @@
 from huey.contrib.djhuey import task
 
 from lemarche.users import constants as user_constants
-from lemarche.users.models import User
 from lemarche.utils.apis import api_brevo, api_hubspot, api_mailjet
-
-
-EMAIL_SUBJECT_PREFIX = f"[{settings.BITOUBI_ENV.upper()}] " if settings.BITOUBI_ENV != "prod" else ""
+from lemarche.utils.constants import EMAIL_SUBJECT_PREFIX
 
 
 def anonymize_email(email):
@@ -29,7 +26,7 @@ def whitelist_recipient_list(recipient_list):
     return [email for email in recipient_list if (email and email.endswith("beta.gouv.fr"))]
 
 
-def add_to_contact_list(user: User, type: str, source: str = user_constants.SOURCE_SIGNUP_FORM):
+def add_to_contact_list(user, type: str, source: str = user_constants.SOURCE_SIGNUP_FORM):
     """Add user to contactlist
 
     Args:

lemarche/www/pages/tasks.py

@@ -2,7 +2,8 @@
 from django.core.mail import EmailMessage, send_mail
 from django.template.loader import render_to_string
 
-from lemarche.utils.emails import EMAIL_SUBJECT_PREFIX, whitelist_recipient_list
+from lemarche.utils.constants import EMAIL_SUBJECT_PREFIX
+from lemarche.utils.emails import whitelist_recipient_list
 
 
 # TODO: make async (celery)