plugins tickets, merge-requests: ticketsGet and mergeRequestsGet serialisation:

those methods now return data serialised with `data_format.serialise`
This commit is contained in:
Goffi 2020-07-16 09:07:26 +02:00
commit 95096df52f
2 changed files with 71 additions and 57 deletions

View file

@ -129,14 +129,16 @@ class Get(base.CommandBase):
self, os.getcwd(), "merge requests", meta_map={})
extra = {}
try:
requests_data = await self.host.bridge.mergeRequestsGet(
self.args.service,
self.args.node,
self.args.max,
self.args.items,
"",
extra,
self.profile,
requests_data = data_format.deserialise(
await self.host.bridge.mergeRequestsGet(
self.args.service,
self.args.node,
self.args.max,
self.args.items,
"",
extra,
self.profile,
)
)
except Exception as e:
self.disp(f"can't get merge request: {e}", error=True)
@ -146,7 +148,7 @@ class Get(base.CommandBase):
whitelist = None
else:
whitelist = {"id", "title", "body"}
for request_xmlui in requests_data[0]:
for request_xmlui in requests_data['items']:
xmlui = xmlui_manager.create(self.host, request_xmlui, whitelist=whitelist)
await xmlui.show(values_only=True)
self.disp("")

View file

@ -18,12 +18,13 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from . import base
from sat.core.i18n import _
from sat_frontends.jp import common
from sat_frontends.jp.constants import Const as C
import json
import os
from sat.core.i18n import _
from sat.tools.common import data_format
from sat_frontends.jp import common
from sat_frontends.jp.constants import Const as C
from . import base
__commands__ = ["Ticket"]
@ -50,14 +51,17 @@ class Get(base.CommandBase):
async def start(self):
await common.fill_well_known_uri(self, os.getcwd(), "tickets", meta_map={})
try:
tickets_data = await self.host.bridge.ticketsGet(
self.args.service,
self.args.node,
self.args.max,
self.args.items,
"",
self.getPubsubExtra(),
self.profile,
tickets_data = data_format.deserialise(
await self.host.bridge.ticketsGet(
self.args.service,
self.args.node,
self.args.max,
self.args.items,
"",
self.getPubsubExtra(),
self.profile,
),
type_check=list
)
except Exception as e:
self.disp(f"can't get tickets: {e}", error=True)