trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #185 from eReuse/bugfix/#2357 

get_status docuemnts in metrics
This commit is contained in:
cayop 2021-11-23 11:43:17 +01:00 committed by GitHub
parent b117a4b267 1cdd7d39b4
commit fd57c794e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ereuse_devicehub/resources/device/metrics.py
View File

@ -208,9 +208,11 @@ class TradeMetrics(MetricsMix):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.document = kwargs.pop('document') self.document = kwargs.pop('document')
self.actions = copy.copy(self.document.actions) self.actions = copy.copy(self.document.actions)
self.reversed_actions = copy.copy(self.document.actions)
self.hid = self.document.file_hash self.hid = self.document.file_hash
self.devicehub_id = '' self.devicehub_id = ''
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.reversed_actions.reverse()
def get_metrics(self): def get_metrics(self):
self.last_trade = next(x for x in self.actions if x.t == 'Trade') self.last_trade = next(x for x in self.actions if x.t == 'Trade')
@ -219,7 +221,7 @@ class TradeMetrics(MetricsMix):
row['type'] = 'Trade-Document' row['type'] = 'Trade-Document'
row['action_type'] = 'Trade-Document' row['action_type'] = 'Trade-Document'
if self.document.total_weight: if self.document.total_weight or self.document.weight:
row['type'] = 'Trade-Container' row['type'] = 'Trade-Container'
row['action_type'] = 'Trade-Container' row['action_type'] = 'Trade-Container'
@ -235,10 +237,31 @@ class TradeMetrics(MetricsMix):
elif self.document.owner == self.last_trade.user_to: elif self.document.owner == self.last_trade.user_to:
row['action_create_by'] = 'Receiver' row['action_create_by'] = 'Receiver'
self.get_status(row)
self.rows.append(row) self.rows.append(row)
return self.rows return self.rows
def get_status(self, row):
"""
We want to know if receiver or supplier do some action that change the status
of the container.
"""
if not (self.document.total_weight and self.document.weight):
return ''
for ac in self.reversed_actions:
if ac.type not in ['Use', 'Refurbish', 'Recycling', 'Management']:
continue
if ac.author == self.last_trade.user_from:
row['status_supplier'] = ac.type
row['status_supplier_created'] = ac.created
if ac.author == self.last_trade.user_to:
row['status_receiver'] = ac.type
row['status_receiver_created'] = ac.created
return ''
def get_confirms(self): def get_confirms(self):
""" """
if the action is one trade action, is possible than have a list of confirmations. if the action is one trade action, is possible than have a list of confirmations.

6
tests/test_metrics.py
View File

@ -257,11 +257,13 @@ def test_metrics_action_status_for_containers(user: UserClient, user2: UserClien
accept='text/csv', accept='text/csv',
query=[('filter', {'type': ['Computer']})]) query=[('filter', {'type': ['Computer']})])
body1 = ';bbbbbbbb;test.pdf;Trade-Container;foo@foo.com;foo2@foo.com;Supplier;False;;;;;150.0;' body1 = ';bbbbbbbb;test.pdf;Trade-Container;foo@foo.com;foo2@foo.com;Supplier;False;Recycling;;'
body2 = ';;0;0;Trade-Container;0;0' body2 = ';;150.0;'
body3 = ';;0;0;Trade-Container;0;0'
assert len(csv_str.split('\n')) == 4 assert len(csv_str.split('\n')) == 4
assert body1 in csv_str.split('\n')[-2] assert body1 in csv_str.split('\n')[-2]
assert body2 in csv_str.split('\n')[-2] assert body2 in csv_str.split('\n')[-2]
assert body3 in csv_str.split('\n')[-2]
@pytest.mark.mvp @pytest.mark.mvp