Se soluciono efocs

api/api_v2/modules/edocs/services.py

@@ -9,11 +9,7 @@ from .controllers import edocs_rest_controller, edocs_vu_controller
 
 logger = logging.getLogger("app.api")
 
-soap_headers = {
-    'Content-Type': 'text/xml; charset=utf-8',
-    'SOAPAction': 'http://www.ventanillaunica.gob.mx/ventanilla/EdocumentosService/consultarEdocumento',
-    'Accept-Encoding': 'gzip,deflate',
-}
+
 
 # --- FUNCIONES AUXILIARES ---
 
@@ -77,14 +73,22 @@ def _get_file_name(**kwargs) -> str:
 # --- FUNCIONES DE SERVICIO ---
 
 async def obtener_edoc(**kwargs):
-    soap_xml = edocs_vu_controller.generate_edoc_template(**kwargs)
-
+    credencial = kwargs.get('credencial', {})
+    usuario = credencial.get('user', '')
+    password = credencial.get('password', '')
+    numero_documento = kwargs['edoc'].get('numero_edocument', '')
+    soap_headers = {
+        'Content-Type': 'text/xml; charset=utf-8',
+        'SOAPAction': 'http://tempuri.org/IServicioEdocument/GetDocumento'
+    }
+    soap_xml = edocs_vu_controller.generate_edocument_template(username=usuario, password=password, idEDocument=numero_documento)
+    print(soap_xml)
     response = await edocs_vu_controller.make_request_async(
-        "ventanilla-edocs-HA/EdocumentosServiceWS?wsdl",
+        "Ventanilla-HA/ServicioEdocument/ServicioEdocument.svc",
         data=soap_xml,
         headers=soap_headers
     )
-
+    print(response.text)
     if response is None:
         raise Exception("No se obtuvo respuesta del servicio SOAP.")
 
@@ -94,11 +98,11 @@ async def obtener_edoc(**kwargs):
     if soap_error(response):
         raise Exception("Respuesta SOAP contiene error de VUCEM.")
 
-    edoc_base64 = _extract_edoc_data(response.text)
+    edoc_base64 = extract_pdf_bytes_from_xml_content(response.text)
     if edoc_base64 is None:
         raise Exception("No se pudo extraer el documento de la respuesta SOAP.")
 
-    pdf_bytes = _decode_base64_content(edoc_base64)
+    pdf_bytes = edoc_base64['pdf_bytes']
     if not pdf_bytes:
         raise HTTPException(status_code=500, detail="No se pudo decodificar el documento")
 
@@ -186,3 +190,44 @@ async def obtener_edocs_masivo(**kwargs):
         "total_documentos": len(numeros_documentos),
         "message": "La orquestación de descarga masiva ha sido registrada."
     }
+
+
+def extract_pdf_bytes_from_xml_content(xml_content: str):
+    """
+    Extrae el PDF y metadatos desde un string XML.
+    """
+    root = ET.fromstring(xml_content)
+    file_elem = root.find('.//File')
+    if file_elem is None:
+        for elem in root.iter():
+            if elem.tag.endswith('File') and elem.text:
+                file_elem = elem
+                break
+    if file_elem is not None and file_elem.text and file_elem.text.strip():
+        base64_data = file_elem.text.strip().replace('\n', '').replace('\r', '')
+        pdf_bytes = base64.b64decode(base64_data)
+        cadena_original = None
+        sello_digital = None
+        cadena_elem = root.find('.//CadenaOriginal')
+        if cadena_elem is None:
+            for elem in root.iter():
+                if elem.tag.endswith('CadenaOriginal') and elem.text:
+                    cadena_elem = elem
+                    break
+        if cadena_elem is not None and cadena_elem.text:
+            cadena_original = cadena_elem.text.strip()
+        sello_elem = root.find('.//SelloDigital')
+        if sello_elem is None:
+            for elem in root.iter():
+                if elem.tag.endswith('SelloDigital') and elem.text:
+                    sello_elem = elem
+                    break
+        if sello_elem is not None and sello_elem.text:
+            sello_digital = sello_elem.text.strip()
+        return {
+            "pdf_bytes": pdf_bytes,
+            "cadena_original": cadena_original,
+            "sello_digital": sello_digital
+        }
+    else:
+        raise ValueError("No se encontró el tag <File> con contenido válido. Verifique que el XML contiene el tag <File> con datos base64.")