nsj-rest-lib2 0.0.35__py3-none-any.whl → 0.0.37__py3-none-any.whl

nsj_rest_lib2/service/entity_config_writer.py

@@ -1,13 +1,15 @@
 from __future__ import annotations
 
-import hashlib
 import json
-from typing import Any, Dict, Iterator, Optional
+from typing import Any, Dict
 
 from nsj_rest_lib2.compiler.edl_model.entity_model import EntityModel
 from nsj_rest_lib2.compiler.edl_model.entity_model_base import EntityModelBase
 from nsj_rest_lib2.compiler.model import CompilerResult
-from nsj_rest_lib2.compiler.util.type_naming_util import compile_namespace_keys
+from nsj_rest_lib2.compiler.util.type_naming_util import (
+    build_entity_hash,
+    resolve_namespace_key,
+)
 from nsj_rest_lib2.redis_config import set_redis
 from nsj_rest_lib2.settings import ESCOPO_RESTLIB2
 
@@ -86,6 +88,18 @@ class EntityConfigWriter:
             "source_get_function_type": compiler_result.source_get_function_type,
             "source_list_function_type": compiler_result.source_list_function_type,
             "source_delete_function_type": compiler_result.source_delete_function_type,
+            "retrieve_after_insert": compiler_result.retrieve_after_insert,
+            "retrieve_after_update": compiler_result.retrieve_after_update,
+            "retrieve_after_partial_update": compiler_result.retrieve_after_partial_update,
+            "post_response_dto_class_name": compiler_result.post_response_dto_class_name,
+            "put_response_dto_class_name": compiler_result.put_response_dto_class_name,
+            "patch_response_dto_class_name": compiler_result.patch_response_dto_class_name,
+            "custom_json_post_response": compiler_result.custom_json_post_response,
+            "custom_json_put_response": compiler_result.custom_json_put_response,
+            "custom_json_patch_response": compiler_result.custom_json_patch_response,
+            "custom_json_get_response": compiler_result.custom_json_get_response,
+            "custom_json_list_response": compiler_result.custom_json_list_response,
+            "custom_json_delete_response": compiler_result.custom_json_delete_response,
             "source_dto": compiler_result.dto_code,
             "source_entity": compiler_result.entity_code,
             "entity_hash": entity_hash
@@ -101,21 +115,7 @@ class EntityConfigWriter:
         tenant = getattr(entity_model, "tenant", None)
         grupo_empresarial = getattr(entity_model, "grupo_empresarial", None)
 
-        grupo_key, tenant_key, default_key = compile_namespace_keys(
-            tenant,
-            grupo_empresarial,
-        )
-
-        if (
-            tenant
-            and tenant != 0
-            and grupo_empresarial
-            and str(grupo_empresarial) != "00000000-0000-0000-0000-000000000000"
-        ):
-            return grupo_key
-        if tenant and tenant != 0:
-            return tenant_key
-        return default_key
+        return resolve_namespace_key(tenant, grupo_empresarial)
 
     def _resolve_resource(self, entity_model: EntityModelBase) -> str:
         if not isinstance(entity_model, EntityModel) or not entity_model.api:
@@ -127,29 +127,4 @@ class EntityConfigWriter:
         return entity_model.api.resource
 
     def _build_entity_hash(self, compiler_result: CompilerResult) -> str:
-        hasher = hashlib.sha256()
-
-        for content in self._iter_hash_chunks(
-            compiler_result.dto_code,
-            compiler_result.entity_code,
-            compiler_result.insert_function_name,
-            compiler_result.update_function_name,
-            compiler_result.get_function_name,
-            compiler_result.list_function_name,
-            compiler_result.delete_function_name,
-            compiler_result.source_insert_function,
-            compiler_result.source_update_function,
-            compiler_result.source_get_function_type,
-            compiler_result.source_list_function_type,
-            compiler_result.source_delete_function_type,
-            compiler_result.service_account,
-        ):
-            hasher.update(content)
-
-        return hasher.hexdigest()
-
-    @staticmethod
-    def _iter_hash_chunks(*chunks: Optional[str]) -> Iterator[bytes]:
-        for chunk in chunks:
-            if chunk:
-                yield chunk.encode("utf-8")
+        return build_entity_hash(compiler_result)