amochka 0.4.6__tar.gz → 0.4.7__tar.gz

{amochka-0.4.6 → amochka-0.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amochka
-Version: 0.4.6
+Version: 0.4.7
 Summary: Python library for working with amoCRM API with ETL capabilities
 Author-email: Timur <timurdt@gmail.com>
 License: MIT

{amochka-0.4.6 → amochka-0.4.7}/amochka/__init__.py

@@ -2,7 +2,7 @@
 amochka: Библиотека для работы с API amoCRM.
 """
 
-__version__ = "0.4.6"
+__version__ = "0.4.7"
 
 from .client import AmoCRMClient, CacheConfig
 from .errors import (

{amochka-0.4.6 → amochka-0.4.7}/amochka.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amochka
-Version: 0.4.6
+Version: 0.4.7
 Summary: Python library for working with amoCRM API with ETL capabilities
 Author-email: Timur <timurdt@gmail.com>
 License: MIT

{amochka-0.4.6 → amochka-0.4.7}/etl/loaders.py

@@ -415,12 +415,26 @@ class PostgresLoader:
         result = cursor.fetchone()
         return result[0] if result else None
 
-    def load_transformed_contact(self, cursor, transformed: TransformedContact) -> int:
+    def load_transformed_contact(
+        self,
+        cursor,
+        transformed: TransformedContact,
+        user_id_map: Optional[Dict[int, int]] = None,
+    ) -> int:
         """Загружает полностью трансформированный контакт."""
         contacts_id = self.upsert_contact(cursor, transformed.contact)
 
         # Факты по контакту
         transformed.contact_facts["contacts_id"] = contacts_id
+
+        # Преобразуем users_id из amoCRM ID во внутренний ID (если найден).
+        # Если пользователя нет в маппинге — оставляем внешний ID как есть.
+        if user_id_map:
+            amo_user_id = transformed.contact_facts.get("users_id")
+            if amo_user_id is not None:
+                internal_user_id = user_id_map.get(amo_user_id)
+                if internal_user_id is not None:
+                    transformed.contact_facts["users_id"] = internal_user_id
         registered_id = self._get_or_create_date_id(cursor, transformed.contact_facts.get("created_date"))
 
         cursor.execute(

{amochka-0.4.6 → amochka-0.4.7}/etl/run_etl.py

@@ -134,6 +134,7 @@ def sync_leads_with_contacts(
             with conn.cursor() as cursor:
                 # Проверяем какие контакты уже есть в БД
                 existing_contacts = loader.build_contact_id_map(cursor, mybi_account_id)
+                user_id_map = loader.build_user_id_map(cursor, mybi_account_id)
                 missing_contact_ids = contact_ids - set(existing_contacts.keys())
 
                 if missing_contact_ids:
@@ -141,7 +142,7 @@ def sync_leads_with_contacts(
 
                     for contact in extractor.iter_contacts(contact_ids=list(missing_contact_ids)):
                         transformed = contact_transformer.transform(contact)
-                        loader.load_transformed_contact(cursor, transformed)
+                        loader.load_transformed_contact(cursor, transformed, user_id_map)
                         contacts_loaded += 1
 
                         if contacts_loaded % batch_size == 0:
@@ -292,6 +293,7 @@ def sync_contacts(
 
     with loader.connection() as conn:
         with conn.cursor() as cursor:
+            user_id_map = loader.build_user_id_map(cursor, mybi_account_id)
             for i, contact in enumerate(contacts_iter):
                 contact_id = contact.get("id")
 
@@ -301,7 +303,7 @@ def sync_contacts(
                     continue
 
                 transformed = contact_transformer.transform(contact)
-                loader.load_transformed_contact(cursor, transformed)
+                loader.load_transformed_contact(cursor, transformed, user_id_map)
                 loaded_count += 1
 
                 # Отслеживаем максимальный updated_at

{amochka-0.4.6 → amochka-0.4.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "amochka"
-version = "0.4.6"
+version = "0.4.7"
 description = "Python library for working with amoCRM API with ETL capabilities"
 readme = "README.md"
 authors = [