Merge pull request #1 from redocmx/feat/addenda

Feat/addenda

Author: danioso

redocmx/addenda.py

@@ -0,0 +1,20 @@
+from .file import File
+
+class Addenda(File):
+    def __init__(self):
+        super().__init__()
+
+    def replace_values(self, content, options=None):
+        if not options:
+            return content
+
+        for key, value in options.items():
+            content = content.replace(key, value)
+
+        return content
+
+    def get_file_content(self, replace_values):
+        file = self.get_file()
+        file_content = file['content']
+        
+        return self.replace_values(file_content, replace_values)

redocmx/cfdi.py

@@ -1,50 +1,42 @@
 from .pdf import Pdf
 from .service import Service
-from pathlib import Path
+from .file import File
+from .addenda import Addenda
 
-class Cfdi:
+class Cfdi(File):
     def __init__(self):
+        super().__init__()
         self.pdf = None
         self.addenda = None
-        self.file_path = None
-        self.file_content = None
+        self.addenda_replace_values = None
         self.service = Service.get_instance()
 
-    def from_file(self, file_path):
-        self.file_path = file_path
-        return self
+    def set_addenda(self, addenda, replace_values=None):
+        if addenda and not isinstance(addenda, Addenda):
+            raise TypeError('addenda must be an instance of Addenda.')
+        if replace_values and not isinstance(replace_values, dict):
+            raise TypeError('Addenda replace values must be a valid key-value object.')
 
-    def from_string(self, file_content):
-        self.file_content = file_content
-        return self
+        self.addenda = addenda
+        self.addenda_replace_values = replace_values
 
     def to_pdf(self, payload={}):
         if self.pdf:
             return self.pdf
+        
+        if not isinstance(payload, dict):
+            raise TypeError('toPdf function only accepts an object as a parameter.')
 
-        file_content = self._get_xml_content()
-        payload['format'] = 'pdf'
+        file = self.get_file()
 
         if self.addenda:
-            payload['addenda'] = self.addenda
+            addenda_content = self.addenda.get_file_content(self.addenda_replace_values)
+            payload['addenda'] = addenda_content
 
-        result = self.service.cfdis_convert(file_content, payload)
+        payload['format'] = 'pdf'
+
+        result = self.service.cfdis_convert(file['content'], payload)
         self.pdf = Pdf(result)
 
         return self.pdf
 
-    def _get_xml_content(self):
-        if self.file_content:
-            return self.file_content
-        elif self.file_path:
-            path = Path(self.file_path)
-            if not path.exists() or not path.is_file():
-                raise FileNotFoundError(f"Failed to read XML content from file: {self.file_path}. The file does not exist.")
-            return path.read_text()
-        else:
-            raise ValueError("XML content for the CFDI must be provided.")
-
-    def set_addenda(self, addenda):
-        if not isinstance(addenda, str):
-            raise TypeError("setAddenda function only accepts a string parameter.")
-        self.addenda = addenda

redocmx/file.py

@@ -0,0 +1,29 @@
+from pathlib import Path
+
+class File:
+    def __init__(self):
+        self.file_path = None
+        self.file_content = None
+
+    def from_file(self, file_path):
+        self.file_path = file_path
+        return self
+
+    def from_string(self, file_content):
+        self.file_content = file_content
+        return self
+
+    def get_file(self):
+        if self.file_content:
+            return { 'content': self.file_content }
+
+        elif self.file_path:
+            path = Path(self.file_path)
+            if not path.exists() or not path.is_file():
+                raise FileNotFoundError(f"Failed to read XML content from file: {self.file_path}. The file does not exist.")
+            
+            self.file_content = path.read_text()
+            return { 'content': self.file_content }
+        else:
+          raise ValueError(f"Failed to load file {self.__class__.__name__}, you must use from_file or from_string.")
+

redocmx/redoc.py

@@ -1,5 +1,6 @@
 from .service import Service
 from .cfdi import Cfdi
+from .addenda import Addenda
 
 class RedocmxClient:
     def __init__(self, api_key=None):
@@ -9,3 +10,7 @@ def __init__(self, api_key=None):
     @property
     def cfdi(self):
         return Cfdi()
+    
+    @property
+    def addenda(self):
+        return Addenda()

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='redocmx',
-    version='0.0.1',
+    version='0.0.2',
     author='redoc.mx',
     author_email='soporte@redoc.mx',
     packages=find_packages(),