nsj-rest-lib2 0.0.27__py3-none-any.whl → 0.0.30__py3-none-any.whl

nsj_rest_lib2/compiler/dto_compiler.py

@@ -41,6 +41,11 @@ class DTOCompiler:
         imports = [
             # import datetime
             ast.Import(names=[ast.alias(name="datetime", asname=None)]),
+            # import dateutil
+            ast.ImportFrom(module="dateutil.relativedelta", 
+                           names=[ast.alias(name="relativedelta")], 
+                           level=0),
+            
             # import enum
             ast.Import(names=[ast.alias(name="enum", asname=None)]),
             # import uuid
@@ -81,10 +86,10 @@ class DTOCompiler:
                 names=[ast.alias(name="EntityRelationOwner", asname=None)],
                 level=0,
             ),
-            # from nsj_rest_lib.descriptor.dto_object_field import DTOObjectField
+            # from nsj_rest_lib.descriptor.dto_object_field import DTOOneToOneField
             ast.ImportFrom(
-                module="nsj_rest_lib.descriptor.dto_object_field",
-                names=[ast.alias(name="DTOObjectField", asname=None)],
+                module="nsj_rest_lib.descriptor.dto_one_to_one_field",
+                names=[ast.alias(name="DTOOneToOneField", asname=None), ast.alias(name="OTORelationType", asname=None) ],
                 level=0,
             ),
             # from nsj_rest_lib.descriptor import DTOAggregator
@@ -94,6 +99,7 @@ class DTOCompiler:
                 level=0,
             ),
         ]
+        
 
         for import_ in related_imports:
             imports.append(

nsj_rest_lib2/compiler/edl_model/primitives.py

@@ -25,6 +25,7 @@ class PrimitiveTypes(enum.Enum):
     EMAIL = "email"
     DATE = "date"
     DATETIME = "datetime"
+    DURATION = "duration"
 
 
 PropertyType = Union[PrimitiveTypes, ExternalRefType, InternalRefType]
@@ -43,6 +44,7 @@ MAPPING_PRIMITIVE_TYPES_TO_PYTHON = {
     PrimitiveTypes.EMAIL: "str",
     PrimitiveTypes.DATE: "datetime.date",
     PrimitiveTypes.DATETIME: "datetime.datetime",
+    PrimitiveTypes.DURATION: "relativedelta"
 }
 
 BasicTypes = int | bool | float | str

nsj_rest_lib2/compiler/entity_compiler.py

@@ -24,6 +24,10 @@ class EntityCompiler:
         imports = [
             # import datetime
             ast.Import(names=[ast.alias(name="datetime", asname=None)]),
+            # import dateutil
+            ast.ImportFrom(module="dateutil.relativedelta", 
+                           names=[ast.alias(name="relativedelta")], 
+                           level=0),
             # import uuid
             ast.Import(names=[ast.alias(name="uuid", asname=None)]),
             # from nsj_rest_lib.entity.entity_base import EntityBase

nsj_rest_lib2/compiler/property_compiler.py

@@ -559,7 +559,7 @@ class EDLPropertyCompiler:
         related_entity_class_name: str,
         prop: PropertyMetaModel,
     ):
-        # Propriedade do property descriptor
+        # Keywords for DTOOneToOneField
         keywords = [
             ast.keyword(
                 arg="entity_type",
@@ -615,32 +615,13 @@ class EDLPropertyCompiler:
         if properties_structure.required and pkey in properties_structure.required:
             keywords.append(ast.keyword(arg="not_null", value=ast.Constant(True)))
 
+        # 'resume' now belongs to the inner DTOField (matches desired format)
         if (
             properties_structure.main_properties
             and pkey in properties_structure.main_properties
         ):
             keywords.append(ast.keyword(arg="resume", value=ast.Constant(True)))
 
-        resume_fields = properties_structure.main_resume_fields.get(pkey)
-        if resume_fields:
-            keywords.append(
-                ast.keyword(
-                    arg="resume_fields",
-                    value=ast.List(
-                        elts=[ast.Constant(value=field) for field in resume_fields],
-                        ctx=ast.Load(),
-                    ),
-                )
-            )
-
-        if prop.validator:
-            keywords.append(
-                ast.keyword(
-                    arg="validator",
-                    value=ast.Name(prop.validator, ctx=ast.Load()),
-                )
-            )
-
         # Resolvendo a coluna usada no relacionamento
         if (
             not properties_structure.entity_properties
@@ -659,13 +640,28 @@ class EDLPropertyCompiler:
         if "/" in relation_column:
             owner_relation = True
             relation_column = relation_column.split("/")[-1]
+        
 
-        # TODO Verificar, porque desconfio que o apontamento para a coluna de relacionamento
-        # para o caso do relacionamento OTHER, não é suportado pelo RestLib (acho que, quando
-        # o dono é OTHER, o RestLib sempre aponta para a PK da entidade corrente).
+        if ('#' in str(properties_structure.properties[pkey].type)):
+            relationTypeAttr = 'COMPOSITION'
+        else:
+            relationTypeAttr = 'AGGREGATION'
+            
+        keywords.append(
+            ast.keyword(
+                arg="relation_type",
+                value=ast.Attribute(
+                    value=ast.Name(id="OTORelationType", ctx=ast.Load()),
+                    attr=relationTypeAttr,
+                    ctx=ast.Load(),
+                ),
+            )
+        )
+            
+        # Build the inner field descriptor with the entity column mapping
         keywords.append(
             ast.keyword(
-                arg="relation_field",
+                arg="entity_field",
                 value=ast.Constant(value=relation_column),
             )
         )
@@ -682,22 +678,18 @@ class EDLPropertyCompiler:
                 )
             )
         else:
-            dto_property_name = f"relation_1_1_self_column_{relation_column}"
-            # 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(
-                    dto_property_name,
-                    PrimitiveTypes.UUID,
-                    keywords=[
-                        ast.keyword(
-                            arg="entity_field",
-                            value=ast.Constant(value=relation_column),
-                        ),
-                    ],
+            # Dono da relação: informa explicitamente como SELF e garante o atributo na Entity
+            keywords.append(
+                ast.keyword(
+                    arg="entity_relation_owner",
+                    value=ast.Attribute(
+                        value=ast.Name(id="EntityRelationOwner", ctx=ast.Load()),
+                        attr="SELF",
+                        ctx=ast.Load(),
+                    ),
                 )
             )
-
-            # Adicionando propriedade, para o campo de relação, no Entity (quando for o dono da relação)
+            # Adicionando propriedade no Entity para a coluna de relação
             ast_entity_attributes.append(
                 self._build_entity_property_ast(relation_column, PrimitiveTypes.UUID)
             )
@@ -710,7 +702,7 @@ class EDLPropertyCompiler:
                 ctx=ast.Load(),
             ),
             value=ast.Call(
-                func=ast.Name(id="DTOObjectField", ctx=ast.Load()),
+                func=ast.Name(id="DTOOneToOneField", ctx=ast.Load()),
                 args=[],
                 keywords=keywords,
             ),

{nsj_rest_lib2-0.0.27.dist-info → nsj_rest_lib2-0.0.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nsj_rest_lib2
-Version: 0.0.27
+Version: 0.0.30
 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
@@ -12,7 +12,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.4
 Description-Content-Type: text/markdown
-Requires-Dist: nsj-rest-lib<5.0.0,>=4.9.0
+Requires-Dist: nsj-rest-lib<6.0.0,>=5.1.3
 Requires-Dist: redis<7.0.0,>=6.4.0
 Requires-Dist: nsj-multi-database-lib<3.0.0,>=2.0.1
 Requires-Dist: pydantic<3.0.0,>=2.11.9

{nsj_rest_lib2-0.0.27.dist-info → nsj_rest_lib2-0.0.30.dist-info}/RECORD

@@ -6,12 +6,12 @@ nsj_rest_lib2/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 nsj_rest_lib2/compiler/ai_compiler.py,sha256=shAtN4T0ai_52qh15L3mK1QbeC6glHOR6C3J3gj14II,9029
 nsj_rest_lib2/compiler/compiler.py,sha256=8avORndGTPOlQO3-s8PkC3fsfCLsUzBW4Qfq-UaueEE,30403
 nsj_rest_lib2/compiler/compiler_structures.py,sha256=a_DF_nU4VgCt0sWJI03Ky6fPHvoIM0cjMkwQb_dYv6Q,1437
-nsj_rest_lib2/compiler/dto_compiler.py,sha256=ksZ2eYd_urrs6HBNK1m5_LhQhhq7i60GfSzD-AaF0fU,6743
-nsj_rest_lib2/compiler/entity_compiler.py,sha256=-mDA1-dHKYp0umQi1A4GbA0F1hlaC-gQRqj69vkADC4,6536
+nsj_rest_lib2/compiler/dto_compiler.py,sha256=Fs6VysuAjBgct7_Wc0sugvx7z9tfnlZcSrBu0l0Pyp0,7019
+nsj_rest_lib2/compiler/entity_compiler.py,sha256=LeGEBxsjAmZZog2gh4vjUX1aFp9JSVgHHOdTkY0aH-s,6733
 nsj_rest_lib2/compiler/function_compiler.py,sha256=t5e_NoDB0IckiIEuYLsvk2lPSwrcrjL91s4LTQkpRqA,18085
 nsj_rest_lib2/compiler/function_model.py,sha256=iSKMlCSZDWlP_aTdlcbYQhsEAIMH-XbSJUU0-KNtLCs,2066
 nsj_rest_lib2/compiler/model.py,sha256=8UxzTvcNgZQdLwC592o8ZMVPhG3AloBCg5q2V72Up8U,1688
-nsj_rest_lib2/compiler/property_compiler.py,sha256=7cShFGtbZwSamyS9frSd_CebdmTmWLxpFDsq6vUqj80,47894
+nsj_rest_lib2/compiler/property_compiler.py,sha256=uoC5GoEP8EQ6kG1FmTJ08Y3nxy4tVopgh3dSy4pOrWQ,47463
 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=7RpZkUGROZmTBh2psgTG_b3e4xxjc3uBr1EYb-wiAkc,3810
@@ -20,7 +20,7 @@ nsj_rest_lib2/compiler/edl_model/entity_model.py,sha256=Yc6wvjsiwacmz796mZIU-i9h
 nsj_rest_lib2/compiler/edl_model/entity_model_base.py,sha256=eRn0pirIPHvniqGpT0xE-mmgqz5RIVtqghxcnfxKNdQ,4345
 nsj_rest_lib2/compiler/edl_model/entity_model_root.py,sha256=VinsxFlNyCaKKk37ZzcbmWaWgoUP2-dZBG61Ke7NvVs,231
 nsj_rest_lib2/compiler/edl_model/index_model.py,sha256=cXWlu0hxtro5vvYoirkDW4R3PCnBW5oCCWjRJ6AX5zE,508
-nsj_rest_lib2/compiler/edl_model/primitives.py,sha256=y6wvz76R995BHVAW9z2Kywd7sUIF4uwvk0-O2H_Zd1w,1613
+nsj_rest_lib2/compiler/edl_model/primitives.py,sha256=vn4qVkISW6npOdvL-WWYMmZ1LZdhaUNKc91Spcxh7Kk,1684
 nsj_rest_lib2/compiler/edl_model/property_meta_model.py,sha256=ciphkgdTtfPfLpeMQpcf3GXQ_qx7xl1tzgeUoJBjPBU,3871
 nsj_rest_lib2/compiler/edl_model/repository_model.py,sha256=OmtUzSq2LKmM76VXefGrKwg8xtVFCutt3JNH2nv42qU,1821
 nsj_rest_lib2/compiler/edl_model/trait_property_meta_model.py,sha256=NtMVZeOPu3LJwXI-8tCOLVuQiGua_0t7kL1h9gL7HuM,657
@@ -33,7 +33,7 @@ nsj_rest_lib2/controller/dynamic_controller.py,sha256=UJtlr0_A6bGJ1gD24oj3481tCb
 nsj_rest_lib2/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nsj_rest_lib2/service/entity_config_writer.py,sha256=DC8M4BYKfaOkNty1YFmAmWiNvENjvmiUqDKgsAV3eNc,4688
 nsj_rest_lib2/service/entity_loader.py,sha256=I8Ua2CPCxxUovHJn8SSRz0bYfmdFqfWj-JQfNTBBypc,17842
-nsj_rest_lib2-0.0.27.dist-info/METADATA,sha256=Ieb8bMrd9ypQX8OSyrIPy26k9mAGM-8y5TyQ3mUtzcs,1094
-nsj_rest_lib2-0.0.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nsj_rest_lib2-0.0.27.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
-nsj_rest_lib2-0.0.27.dist-info/RECORD,,
+nsj_rest_lib2-0.0.30.dist-info/METADATA,sha256=NWU_fMsjaCq6_K3Wk7KG2D56sQbX65zo6qqpl4T5xbo,1094
+nsj_rest_lib2-0.0.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nsj_rest_lib2-0.0.30.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
+nsj_rest_lib2-0.0.30.dist-info/RECORD,,