amochka 0.4.6__py3-none-any.whl → 0.4.7__py3-none-any.whl

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.dist-info → amochka-0.4.7.dist-info}/METADATA

@@ -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.dist-info → amochka-0.4.7.dist-info}/RECORD

@@ -1,15 +1,15 @@
-amochka/__init__.py,sha256=Rt8W0zW4TY7QnhVG6I4qTL12mEtKdkyqrRdWUrOQGeY,925
+amochka/__init__.py,sha256=1IrHrHoIJWMJgXlmxVzX93HXxTgDL7agZRR7GeP6AiY,925
 amochka/client.py,sha256=zQUy6DhoQfLDnO9q7CxXd28cjLQmwE15MtTGsGYYVSs,91571
 amochka/errors.py,sha256=Rg4U9srjboQwgU3wwhAed0p3vGcc0ZhuyKHIDhYFnp8,1371
 amochka/etl.py,sha256=tzdGPRGxR49aSAjLksic-FqechvDUTfK8ZUUJGuIU7M,8960
 etl/__init__.py,sha256=bp9fPqbKlOc7xzs27diHEvysy1FgBrwlpX6GnR6GL9U,255
 etl/config.py,sha256=BvaGn5BSGMIfvUNNsnap04iy3BHyMOuRX81G7EiLUfE,9032
 etl/extractors.py,sha256=PqjzlmUa8FLZa1z85mP6Y0-s_TH3REqW58632JzRKUc,13047
-etl/loaders.py,sha256=x8PcDQoq2kjbd52H2VzKKz5vHzyD6DXSsb9X0foPX_U,31941
-etl/run_etl.py,sha256=LxKQLE_yUPkg7kaFmmMxrdggz27puS1VdV9NTna9e4Q,26665
+etl/loaders.py,sha256=AA4XDCbre-Y8SrIji5Sk8olW9WvREM9CMuuknFVe5j0,32589
+etl/run_etl.py,sha256=6ieidJiiXOILI1hzFzCCyVjUHX6wCJ-D6556NUqKOxw,26847
 etl/transformers.py,sha256=OwYJ_9l3oqvy2Y3-umXjAGweOIqlfRI0iSiCFPrcQ8E,17867
 etl/migrations/001_create_tables.sql,sha256=YrSaZjpofC1smjYx0bM4eHQumboruIBY3fwRDlJLLSo,15749
-amochka-0.4.6.dist-info/METADATA,sha256=xbYEJTNgE5RsqN8UPudtOrs4gKnXzuF27hmR3wcco1s,7530
-amochka-0.4.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-amochka-0.4.6.dist-info/top_level.txt,sha256=grRX8aLFG-yYKPsAqCD6sUBmdLSQeOMHsc9Dl6S7Lzo,12
-amochka-0.4.6.dist-info/RECORD,,
+amochka-0.4.7.dist-info/METADATA,sha256=W_0rYdYd14YBxn0hp625NmZJtVzPVOY-ERR9hdKsrBQ,7530
+amochka-0.4.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+amochka-0.4.7.dist-info/top_level.txt,sha256=grRX8aLFG-yYKPsAqCD6sUBmdLSQeOMHsc9Dl6S7Lzo,12
+amochka-0.4.7.dist-info/RECORD,,

{amochka-0.4.6.dist-info → amochka-0.4.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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(

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