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

fixing metrics

This commit is contained in:
Cayo Puigdefabregas 2021-11-02 12:47:23 +01:00
parent 7d7b948f8b
commit c34cbb5c26
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,26 +65,26 @@ class Metrics(MetricsMix):
If exist one trade before this action, then modify the trade action If exist one trade before this action, then modify the trade action
else, create one row new. else, create one row new.
""" """
if not self.last_trade:
# If not exist one trade, the status is of the Receive
self.action_create_by = 'Receiver'
self.status_receiver = self.act.type self.status_receiver = self.act.type
self.status_supplier = '' self.status_supplier = ''
if self.act.author != self.act.rol_user: row = self.get_template_row()
# It is neccesary exist one trade action before row['status_receiver_created'] = self.act.created
self.rows.append(row)
return
if self.last_trade['trade_supplier'] == self.act.rol_user.email:
self.last_trade['status_supplier'] = self.act.type self.last_trade['status_supplier'] = self.act.type
self.last_trade['status_supplier_created'] = self.act.created self.last_trade['status_supplier_created'] = self.act.created
return return
self.action_create_by = 'Receiver' if self.last_trade['trade_receiver'] == self.act.rol_user.email:
if self.last_trade:
# if exist one trade action before
self.last_trade['status_receiver'] = self.act.type self.last_trade['status_receiver'] = self.act.type
self.last_trade['status_receiver_created'] = self.act.created self.last_trade['status_receiver_created'] = self.act.created
return return
# If not exist any trade action for this device
row = self.get_template_row()
row['status_receiver_created'] = self.act.created
self.rows.append(row)
def get_snapshot(self): def get_snapshot(self):
""" """
If there are one snapshot get the last lifetime for to do a calcul of time of use. If there are one snapshot get the last lifetime for to do a calcul of time of use.

13
tests/test_metrics.py
View File

@ -156,6 +156,10 @@ def test_complet_metrics_with_trade(user: UserClient, user2: UserClient):
res=Lot, res=Lot,
item='{}/devices'.format(lot['id']), item='{}/devices'.format(lot['id']),
query=devices) query=devices)
action = {'type': ma.Refurbish.t, 'devices': [snap1['device']['id']]}
user.post(action, res=ma.Action)
request_post = { request_post = {
'type': 'Trade', 'type': 'Trade',
'devices': [snap1['device']['id'], snap2['device']['id']], 'devices': [snap1['device']['id'], snap2['device']['id']],
@ -169,19 +173,22 @@ def test_complet_metrics_with_trade(user: UserClient, user2: UserClient):
user.post(res=ma.Action, data=request_post) user.post(res=ma.Action, data=request_post)
action = {'type': ma.Refurbish.t, 'devices': [snap1['device']['id']]} action = {'type': ma.Use.t, 'devices': [snap1['device']['id']]}
action_use, _ = user.post(action, res=ma.Action) action_use, _ = user.post(action, res=ma.Action)
csv_str, _ = user.get(res=documents.DocumentDef.t, csv_str, _ = user.get(res=documents.DocumentDef.t,
item='actions/', item='actions/',
accept='text/csv', accept='text/csv',
query=[('filter', {'type': ['Computer']})]) query=[('filter', {'type': ['Computer']})])
body1_lenovo = 'O48N2;desktop-lenovo-9644w8n-0169622-00:1a:6b:5e:7f:10;;Trade;foo@foo.com;foo2@foo.com;Supplier;False;Refurbish;Use;' body1_lenovo = 'O48N2;desktop-lenovo-9644w8n-0169622-00:1a:6b:5e:7f:10;;Trade;foo@foo.com;'
body1_lenovo += 'foo2@foo.com;Supplier;False;Refurbish;Use;'
body2_lenovo = ';;0;0;Trade;0;0\n' body2_lenovo = ';;0;0;Trade;0;0\n'
body1_acer = 'J2MA2;laptop-acer-aohappy-lusea0d010038879a01601-00:26:c7:8e:cb:8c;;Trade;foo@foo.com;foo2@foo.com;Supplier;False;;Use;;;0;' body1_acer = 'J2MA2;laptop-acer-aohappy-lusea0d010038879a01601-00:26:c7:8e:cb:8c;;Trade;'
body1_acer += 'foo@foo.com;foo2@foo.com;Supplier;False;;Use;;;0;'
body2_acer = ';;0;0;Trade;0;4692.0\n' body2_acer = ';;0;0;Trade;0;4692.0\n'
# import pdb; pdb.set_trace()
assert body1_lenovo in csv_str assert body1_lenovo in csv_str
assert body2_lenovo in csv_str assert body2_lenovo in csv_str
assert body1_acer in csv_str assert body1_acer in csv_str