P0 gas coses extra

gisce · Sep 26, 2023 · 264184c · 264184c
1 parent 22e24c2
commit 264184c
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 4 deletions.
diff --git a/gestionatr/input/messages/message_gas.py b/gestionatr/input/messages/message_gas.py
@@ -114,6 +114,10 @@
             'A25': 'A2543.xsd',
             'A26': 'A2643.xsd',
     },
+    '29': {
+        'A5': 'A529.xsd',
+        'A6': 'A629.xsd',
+    }
 })
 
 MAIN_MESSAGE_XSD.update({
@@ -204,6 +208,9 @@
     'A443': 'a443',
     'A2543': 'a2543',
     'A2643': 'a2643',
+    # 29
+    'A529': 'a529',
+    'A629': 'a629',
 })
 
 
@@ -242,9 +249,16 @@ def set_tipus(self):
                 self.pas = self.head.codproceso.text
                 self.codproceso = self.pas
             except:
-                msg = u'No se puede identificar el código de proceso ' \
-                      u'o código de paso'
-                raise except_f1('Error', msg)
+                try:
+                    # If per el "P0" (aka A529)
+                    self.tipus = self.head.codproceso.text
+                    self.processcode = self.tipus
+                    self.pas = self.head.tipomensaje.text
+                    self.messagetype = self.pas
+                except:
+                    msg = u'No se puede identificar el código de proceso ' \
+                          u'o código de paso'
+                    raise except_f1('Error', msg)
 
 
     # Funcions relacionades amb la capçalera del XML

diff --git a/gestionatr/output/messages/sw_a5_29.py b/gestionatr/output/messages/sw_a5_29.py
@@ -79,7 +79,25 @@ def __init__(self):
 """
 
 GAS_ENVELOPE_TEMPLATE_CHATGPT = """
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsrps="http://localhost/sctd/wsrps" xmlns:a529="http://localhost/sctd/A529">
+<soapenv:Envelope 
+xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" 
+xmlns:wsrps="http://localhost/sctd/wsrps" 
+xmlns:a529="http://localhost/sctd/A529">
+   <soapenv:Header/>
+   <soapenv:Body>
+      <wsrps:consultaCups>
+         <wsrps:consultaCups>
+{xml_str}
+         </wsrps:consultaCups>
+      </wsrps:consultaCups>
+   </soapenv:Body>
+</soapenv:Envelope>
+"""
+
+GAS_ENVELOPE_TEMPLATE_CHATGPT_v2 = """
+<soapenv:Envelope 
+xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" 
+xmlns:wsrps="http://localhost/sctd/wsrps">
    <soapenv:Header/>
    <soapenv:Body>
       <wsrps:consultaCups>
@@ -116,4 +134,15 @@ def __init__(self):
         'extra_headers': {
         },
     },
+    'reintent4': {
+        'template': GAS_ENVELOPE_TEMPLATE_CHATGPT_v2,
+        'extra_headers': {
+            "soapAction": ""
+        },
+    },
+    'reintent5': {
+        'template': GAS_ENVELOPE_TEMPLATE_CHATGPT_v2,
+        'extra_headers': {
+        },
+    },
 }