nsj-rest-lib2 0.0.27__tar.gz → 0.0.30__tar.gz

{nsj_rest_lib2-0.0.27 → nsj_rest_lib2-0.0.30}/PKG-INFO

@@ -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 → nsj_rest_lib2-0.0.30}/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-0.0.27 → nsj_rest_lib2-0.0.30}/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-0.0.27 → nsj_rest_lib2-0.0.30}/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-0.0.27 → nsj_rest_lib2-0.0.30}/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 → nsj_rest_lib2-0.0.30}/nsj_rest_lib2.egg-info/PKG-INFO

@@ -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 → nsj_rest_lib2-0.0.30}/nsj_rest_lib2.egg-info/requires.txt

@@ -1,4 +1,4 @@
-nsj-rest-lib<5.0.0,>=4.9.0
+nsj-rest-lib<6.0.0,>=5.1.3
 redis<7.0.0,>=6.4.0
 nsj-multi-database-lib<3.0.0,>=2.0.1
 pydantic<3.0.0,>=2.11.9

{nsj_rest_lib2-0.0.27 → nsj_rest_lib2-0.0.30}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = nsj_rest_lib2
-version = 0.0.27
+version = 0.0.30
 author = Nasajon Sistemas
 author_email = contact.dev@nasajon.com.br
 description = Biblioteca para permitir a distribuição de rotas dinâmicas numa API, configuradas por meio de EDLs declarativos (em formato JSON).
@@ -21,7 +21,7 @@ package_dir =
 packages = find:
 python_requires = >=3.4
 install_requires = 
-	nsj-rest-lib>=4.9.0,<5.0.0
+	nsj-rest-lib>=5.1.3,<6.0.0
 	redis>=6.4.0,<7.0.0
 	nsj-multi-database-lib>=2.0.1,<3.0.0
 	pydantic>=2.11.9,<3.0.0