Fix GetCatalog

This commit is contained in:
Ivan Vazhenin
2023-03-26 13:14:52 +03:00
parent 15ee28cb0c
commit 65c0b561a7
7 changed files with 54 additions and 15 deletions

View File

@@ -53,7 +53,7 @@ class Catalog:
return ET.tostring(collections, encoding='unicode', xml_declaration=True)
def date_to_string(self, date):
return ''
return str(date.timestamp())
def write_collections(self, collections, date):
collection = ET.SubElement(collections, self.COLLECTION_TAG_NAME, {
@@ -70,7 +70,3 @@ class Catalog:
def write_chart(self, charts, chart):
ch = ET.SubElement(charts, self.CHART_TAG_NAME)

View File

@@ -27,4 +27,4 @@ def get_catalog():
"""
)
result = client.execute(query)
return result['getClassifier']
return result['getCatalog']

View File

@@ -1,5 +1,5 @@
import xml.etree.ElementTree as ET
from messages import Messages
from requests.messages import Messages
class RequestXmlService:
@@ -11,7 +11,7 @@ class RequestXmlService:
SOURCE_REQUEST_ID_ATTRIBUTE_NAME: str = 'source_parcel_id'
RESULT_CODE_ATTRIBUTE_NAME: str = 'result_code'
RESULT_MESSAGE_ATTRIBUTE_NAME: str = 'result_message'
HEADER_XPATH: str = '/' + REQUEST_NODE_NAME + '/' + HEADER_NODE_NAME
HEADER_XPATH: str = HEADER_NODE_NAME
def get_request_uuid(self, document: ET.Element) -> str:
return self.get_header_attribute(document, self.REQUEST_ID_ATTRIBUTE_NAME)
@@ -27,7 +27,7 @@ class RequestXmlService:
def get_header_attribute(self, document: ET.Element, attribute_name: str) -> str:
header = self.get_header_node(document)
if not header:
if header is None:
raise Exception(Messages.MISSING_TAG.value)
result = header.get(attribute_name)
return result.strip() if result else ''
@@ -51,6 +51,8 @@ class RequestXmlService:
def set_result(self, document: ET.Element, result_code: int, result_message: str):
result = document.find(self.RESULT_NODE_NAME)
if result is None:
result = ET.SubElement(document, self.RESULT_NODE_NAME)
result.set(self.RESULT_CODE_ATTRIBUTE_NAME, str(result_code))
result.set(self.RESULT_MESSAGE_ATTRIBUTE_NAME, result_message)