nsj-rest-lib2 0.0.12__py3-none-any.whl → 0.0.13__py3-none-any.whl

nsj_rest_lib2/compiler/property_compiler.py

@@ -117,6 +117,7 @@ class EDLPropertyCompiler:
                         entity_models,
                         properties_structure,
                         ast_dto_attributes,
+                        ast_entity_attributes,
                         related_imports,
                         relations_dependencies,
                         pkey,
@@ -353,6 +354,7 @@ class EDLPropertyCompiler:
         entity_models: dict[str, EntityModel],
         properties_structure: PropertiesCompilerStructure,
         ast_dto_attributes: list[ast.stmt],
+        ast_entity_attributes: list[ast.stmt],
         related_imports: list[tuple[str, str, str]],
         relations_dependencies: list[RelationDependency],
         pkey: str,
@@ -418,6 +420,7 @@ class EDLPropertyCompiler:
             self._build_ast_1_1(
                 properties_structure,
                 ast_dto_attributes,
+                ast_entity_attributes,
                 pkey,
                 related_dto_class_name,
                 related_entity_class_name,
@@ -490,6 +493,7 @@ class EDLPropertyCompiler:
         self,
         properties_structure: PropertiesCompilerStructure,
         ast_dto_attributes: list[ast.stmt],
+        ast_entity_attributes: list[ast.stmt],
         pkey: str,
         related_dto_class_name: str,
         related_entity_class_name: str,
@@ -539,7 +543,18 @@ class EDLPropertyCompiler:
                     ),
                 )
             )
+        else:
+            # Adicionando propriedade, para o campo de relação, no DTO (quando for o dono da relação)
+            ast_dto_attributes.append(
+                self._build_dto_property_ast(relation_column, PrimitiveTypes.UUID)
+            )
+
+            # Adicionando propriedade, para o campo de relação, no Entity (quando for o dono da relação)
+            ast_entity_attributes.append(
+                self._build_entity_property_ast(relation_column, PrimitiveTypes.UUID)
+            )
 
+        # Adicionando a propriedade em si do relacionamento, no DTO
         ast_attr = ast.AnnAssign(
             target=ast.Name(id=CompilerStrUtil.to_snake_case(pkey), ctx=ast.Store()),
             annotation=ast.Name(
@@ -556,6 +571,52 @@ class EDLPropertyCompiler:
 
         ast_dto_attributes.append(ast_attr)
 
+    def _build_dto_property_ast(
+        self,
+        name: str,
+        type: PrimitiveTypes | str,
+        keywords: list[ast.keyword] = [],
+    ):
+        if isinstance(type, PrimitiveTypes):
+            type_str = TypeUtil.property_type_to_python_type(type)
+        else:
+            type_str = type
+
+        return ast.AnnAssign(
+            target=ast.Name(
+                id=CompilerStrUtil.to_snake_case(name),
+                ctx=ast.Store(),
+            ),
+            annotation=ast.Name(
+                id=type_str,
+                ctx=ast.Load(),
+            ),
+            value=ast.Call(
+                func=ast.Name(id="DTOField", ctx=ast.Load()),
+                args=[],
+                keywords=keywords,
+            ),
+            simple=1,
+        )
+
+    def _build_entity_property_ast(
+        self,
+        name: str,
+        type: PrimitiveTypes,
+    ):
+        return ast.AnnAssign(
+            target=ast.Name(
+                id=CompilerStrUtil.to_snake_case(name),
+                ctx=ast.Store(),
+            ),
+            annotation=ast.Name(
+                id=TypeUtil.property_type_to_python_type(type),
+                ctx=ast.Load(),
+            ),
+            value=ast.Constant(value=None),
+            simple=1,
+        )
+
     def _compile_simple_property(
         self,
         properties_structure,
@@ -766,35 +827,11 @@ class EDLPropertyCompiler:
         else:
             prop_type = TypeUtil.property_type_to_python_type(prop.type)
 
-        ast_attr = ast.AnnAssign(
-            target=ast.Name(id=CompilerStrUtil.to_snake_case(pkey), ctx=ast.Store()),
-            annotation=ast.Name(
-                id=prop_type,
-                ctx=ast.Load(),
-            ),
-            value=ast.Call(
-                func=ast.Name(id="DTOField", ctx=ast.Load()),
-                args=[],
-                keywords=keywords,
-            ),
-            simple=1,
-        )
-
+        ast_attr = self._build_dto_property_ast(pkey, prop_type, keywords)
         ast_dto_attributes.append(ast_attr)
 
         # Entity
-        ast_entity_attr = ast.AnnAssign(
-            target=ast.Name(
-                id=CompilerStrUtil.to_snake_case(entity_field_name),
-                ctx=ast.Store(),
-            ),
-            annotation=ast.Name(
-                id=TypeUtil.property_type_to_python_type(prop.type),
-                ctx=ast.Load(),
-            ),
-            value=ast.Constant(value=None),
-            simple=1,
-        )
+        ast_entity_attr = self._build_entity_property_ast(entity_field_name, prop.type)
 
         ast_entity_attributes.append(ast_entity_attr)
 

{nsj_rest_lib2-0.0.12.dist-info → nsj_rest_lib2-0.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nsj_rest_lib2
-Version: 0.0.12
+Version: 0.0.13
 Summary: Biblioteca para permitir a distribuição de rotas dinâmicas numa API, configuradas por meio de EDLs declarativos (em formato JSON).
 Home-page: https://github.com/Nasajon/nsj_rest_lib2
 Author: Nasajon Sistemas

{nsj_rest_lib2-0.0.12.dist-info → nsj_rest_lib2-0.0.13.dist-info}/RECORD

@@ -9,7 +9,7 @@ nsj_rest_lib2/compiler/compiler_structures.py,sha256=2bM4_7lG1fytDGxJl6SU9pLsbsp
 nsj_rest_lib2/compiler/dto_compiler.py,sha256=4e9_8EsNSHPCUEmiuEPdudj9_tFuw2O4ZTv6EYwJrGc,5333
 nsj_rest_lib2/compiler/entity_compiler.py,sha256=zLXO6USY4Rr0Hnk4wGep5K8DiHxJv-W-BBz_-g4OhCA,4307
 nsj_rest_lib2/compiler/model.py,sha256=QDBoM26qoZdiNcykl1nvXCrFDhg-6Q__QzVq6uY1QzE,1460
-nsj_rest_lib2/compiler/property_compiler.py,sha256=kr9Pi0kkIrvgEmxrmV_NEQuqekM1h6-jqvF85nZTUcY,29808
+nsj_rest_lib2/compiler/property_compiler.py,sha256=AvJYY5vbmlodGjgyuCx6u17x0Qv3nEsAdMmBcSQP2f4,31153
 nsj_rest_lib2/compiler/edl_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nsj_rest_lib2/compiler/edl_model/ai_entity_edl.py,sha256=664QBDcOgVnyfwtUOXO1W7AKaZhueBG335x5DuogruY,7644
 nsj_rest_lib2/compiler/edl_model/api_model.py,sha256=pH0Uiq_64AGvkHqwY44TrulWWZXbi6M0EKJWUhSqKj0,837
@@ -28,7 +28,7 @@ nsj_rest_lib2/controller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 nsj_rest_lib2/controller/dynamic_controller.py,sha256=XMqxe1NW-NE5XwomXb4pSNdALQHpP74Hc26R4fnmXqg,15194
 nsj_rest_lib2/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nsj_rest_lib2/service/entity_loader.py,sha256=KVLFQSqj4DL-K-T29ksJE2or9QkekFmyAGUIKjQX6Qk,15372
-nsj_rest_lib2-0.0.12.dist-info/METADATA,sha256=CTk1vS9FJ_U2e6-Vz38wj3Ba2efwuKPW-iDpHlosHzk,1361
-nsj_rest_lib2-0.0.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nsj_rest_lib2-0.0.12.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
-nsj_rest_lib2-0.0.12.dist-info/RECORD,,
+nsj_rest_lib2-0.0.13.dist-info/METADATA,sha256=mR2ZDZ5jbP18qsS288vSwD0tWDPOhibp_iyP-CrQ0Hk,1361
+nsj_rest_lib2-0.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nsj_rest_lib2-0.0.13.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
+nsj_rest_lib2-0.0.13.dist-info/RECORD,,