resolve conflict

.github/workflows/flask.yml

@@ -49,6 +49,10 @@ jobs:
         python -m pip install --upgrade pip
         pip install flake8 pytest coverage
         pip install -r requirements.txt
+        pip install -e .
+        mkdir bin
+        wget https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz
+        tar xf geckodriver-v0.30.0-linux64.tar.gz -C bin/
 
     - name: Prepare database
       env:
@@ -62,6 +66,17 @@ jobs:
         psql -h "localhost" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "CREATE EXTENSION citext SCHEMA public;"
         psql -h "localhost" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "CREATE EXTENSION pg_trgm SCHEMA public;"
 
+    - name: Selenium tests
+      env:
+        SECRET_KEY: 'f00046306835001b55c230092e3a7990485beda0bc3bf732088d1ba1b5b74110e22e3f9ec3a24890272554b37d4'
+        DB_DATABASE: dh_test
+        FLASK_APP: examples/app.py
+        dhi: dbtest
+      run: |
+        alembic -x inventory=dbtest upgrade head
+        dh dummy --yes
+        flask run & pytest tests/test_selenium.py
+
     - name: Lint with flake8
       run: |
         # stop the build if:

CHANGELOG.md

@@ -8,9 +8,12 @@ ml).
 ## master
 
 ## testing
+- [add] #281 add selenium test.
 - [add] #305 add button download iso Workbench.
-- [add] #306 add link for download json snapshot
+- [add] #306 add link for download json snapshot.
+- [add] #308 add sentry.
 - [changed] #302 add system uuid for check the identity of one device.
+- [fixed] #309 column lifecycle status is always empty.
 
 ## [2.2.0] - 2022-06-24
 - [changed] #304 change anchor of link devices lots.
@@ -157,3 +160,17 @@ First server render HTML version. Completely rewrites views of angular JS client
 - [added] #83 add owner_id in all kind of device
 - [fixed] #89 save json on disk only for shapshots
 - [fixed] #91 The most old time allow is 1970-01-01
+
+
+# Release notes
+
+## [2.2.1]
+The pr #302 involves some changes in the deployment process
+For to do the deployment you need to do run the script extract_uuids.sh before to run alembic.
+This is the correct secuence if the schema of you proyect is *dbtest*
+```
+git pull
+sh examples/extract_uuids.sh
+alembic -x inventory=dbtest upgrade head
+```
+If you forget to run this script the migration is do it but not modify any device data.

ereuse_devicehub/resources/documents/device_row.py

@@ -1,13 +1,18 @@
 """ This file frame a correct row for csv report """
 
 from collections import OrderedDict
+
 from flask import url_for
 
-from ereuse_devicehub.resources.enums import Severity
-from ereuse_devicehub.resources.device import models as d, states
 from ereuse_devicehub.resources.action import models as da
-from ereuse_devicehub.resources.action.models import (BenchmarkDataStorage, RateComputer,
+from ereuse_devicehub.resources.action.models import (
-                                                      TestDataStorage)
+    BenchmarkDataStorage,
+    RateComputer,
+    TestDataStorage,
+)
+from ereuse_devicehub.resources.device import models as d
+from ereuse_devicehub.resources.device import states
+from ereuse_devicehub.resources.enums import Severity
 
 
 class DeviceRow(OrderedDict):
@@ -40,20 +45,20 @@ class DeviceRow(OrderedDict):
         software = ''
         if snapshot:
             software = "{software} {version}".format(
-                software=snapshot.software.name, version=snapshot.version)
+                software=snapshot.software.name, version=snapshot.version
+            )
         # General information about device
         self['DHID'] = device.devicehub_id
         self['DocumentID'] = self.document_id
         self['Public Link'] = '{url}{id}'.format(
-            url=url_for('Device.main', _external=True),
+            url=url_for('Device.main', _external=True), id=device.devicehub_id
-            id=device.devicehub_id)
+        )
         self['Lots'] = ', '.join([x.name for x in self.device.lots])
         self['Tag 1 Type'] = self['Tag 1 ID'] = self['Tag 1 Organization'] = ''
         self['Tag 2 Type'] = self['Tag 2 ID'] = self['Tag 2 Organization'] = ''
         self['Tag 3 Type'] = self['Tag 3 ID'] = self['Tag 3 Organization'] = ''
         for i, tag in zip(range(1, 3), device.tags):
-            self['Tag {} Type'.format(
+            self['Tag {} Type'.format(i)] = 'unamed' if tag.provider else 'named'
-                i)] = 'unamed' if tag.provider else 'named'
             self['Tag {} ID'.format(i)] = tag.id
             self['Tag {} Organization'.format(i)] = tag.org.name
 
@@ -79,8 +84,7 @@ class DeviceRow(OrderedDict):
             self['Allocate state'] = device.allocated_status.type
 
         try:
-            self['Lifecycle state'] = device.last_action_of(
+            self['Lifecycle state'] = device.last_action_of(*states.Status.actions()).t
-                *states.Trading.actions()).t
         except LookupError:
             self['Lifecycle state'] = ''
         if isinstance(device, d.Computer):
@@ -155,10 +159,12 @@ class DeviceRow(OrderedDict):
             self['{} {} Serial Number'.format(ctype, i)] = ''
         else:
             self['{} {} Manufacturer'.format(ctype, i)] = none2str(
-                component.manufacturer)
+                component.manufacturer
+            )
             self['{} {} Model'.format(ctype, i)] = none2str(component.model)
             self['{} {} Serial Number'.format(ctype, i)] = none2str(
-                component.serial_number)
+                component.serial_number
+            )
 
         if ctype == d.Processor.t:
             self.get_processor(ctype, i, component)
@@ -178,12 +184,10 @@ class DeviceRow(OrderedDict):
             self['{} {} Number of cores'.format(ctype, i)] = ''
             self['{} {} Speed (GHz)'.format(ctype, i)] = ''
             self['Benchmark {} {} (points)'.format(ctype, i)] = ''
-            self['Benchmark ProcessorSysbench {} {} (points)'.format(
+            self['Benchmark ProcessorSysbench {} {} (points)'.format(ctype, i)] = ''
-                ctype, i)] = ''
             return
 
-        self['{} {} Number of cores'.format(
+        self['{} {} Number of cores'.format(ctype, i)] = none2str(component.cores)
-            ctype, i)] = none2str(component.cores)
         self['{} {} Speed (GHz)'.format(ctype, i)] = none2str(component.speed)
 
         benchmark = get_action(component, 'BenchmarkProcessor')
@@ -194,11 +198,11 @@ class DeviceRow(OrderedDict):
 
         sysbench = get_action(component, 'BenchmarkProcessorSysbench')
         if not sysbench:
-            self['Benchmark ProcessorSysbench {} {} (points)'.format(
+            self['Benchmark ProcessorSysbench {} {} (points)'.format(ctype, i)] = ''
-                ctype, i)] = ''
             return
-        self['Benchmark ProcessorSysbench {} {} (points)'.format(
+        self[
-            ctype, i)] = sysbench.rate
+            'Benchmark ProcessorSysbench {} {} (points)'.format(ctype, i)
+        ] = sysbench.rate
 
     def get_ram(self, ctype, i, component):
         """Particular fields for component Ram Module."""
@@ -244,21 +248,23 @@ class DeviceRow(OrderedDict):
         software = ''
         if snapshot:
             software = "{software} {version}".format(
-                software=snapshot.software.name, version=snapshot.version)
+                software=snapshot.software.name, version=snapshot.version
+            )
 
         self['{} {} Size (MB)'.format(ctype, i)] = none2str(component.size)
 
         component_actions = sorted(component.actions, key=lambda x: x.created)
-        erasures = [a for a in component_actions if a.type in [
+        erasures = [
-            'EraseBasic', 'EraseSectors', 'DataWipe']]
+            a
+            for a in component_actions
+            if a.type in ['EraseBasic', 'EraseSectors', 'DataWipe']
+        ]
         erasure = erasures[-1] if erasures else None
         if not erasure:
             self['Erasure {} {}'.format(ctype, i)] = none2str(component.hid)
             serial_number = none2str(component.serial_number)
-            self['Erasure {} {} Serial Number'.format(
+            self['Erasure {} {} Serial Number'.format(ctype, i)] = serial_number
-                ctype, i)] = serial_number
+            self['Erasure {} {} Size (MB)'.format(ctype, i)] = none2str(component.size)
-            self['Erasure {} {} Size (MB)'.format(
-                ctype, i)] = none2str(component.size)
             self['Erasure {} {} Software'.format(ctype, i)] = ''
             self['Erasure {} {} Result'.format(ctype, i)] = ''
             self['Erasure {} {} Certificate URL'.format(ctype, i)] = ''
@@ -272,15 +278,13 @@ class DeviceRow(OrderedDict):
         elif hasattr(erasure, 'type') and erasure.type == 'DataWipe':
             self['Erasure {} {}'.format(ctype, i)] = none2str(component.hid)
             serial_number = none2str(component.serial_number)
-            self['Erasure {} {} Serial Number'.format(
+            self['Erasure {} {} Serial Number'.format(ctype, i)] = serial_number
-                ctype, i)] = serial_number
+            self['Erasure {} {} Size (MB)'.format(ctype, i)] = none2str(component.size)
-            self['Erasure {} {} Size (MB)'.format(
+            self['Erasure {} {} Software'.format(ctype, i)] = erasure.document.software
-                ctype, i)] = none2str(component.size)
-            self['Erasure {} {} Software'.format(
-                ctype, i)] = erasure.document.software
             self['Erasure {} {} Result'.format(ctype, i)] = get_result(erasure)
-            self['Erasure {} {} Certificate URL'.format(
+            self['Erasure {} {} Certificate URL'.format(ctype, i)] = (
-                ctype, i)] = erasure.document.url and erasure.document.url.to_text() or ''
+                erasure.document.url and erasure.document.url.to_text() or ''
+            )
             self['Erasure {} {} Type'.format(ctype, i)] = ''
             self['Erasure {} {} Method'.format(ctype, i)] = ''
             self['Erasure {} {} Elapsed (hours)'.format(ctype, i)] = ''
@@ -291,10 +295,8 @@ class DeviceRow(OrderedDict):
         else:
             self['Erasure {} {}'.format(ctype, i)] = none2str(component.hid)
             serial_number = none2str(component.serial_number)
-            self['Erasure {} {} Serial Number'.format(
+            self['Erasure {} {} Serial Number'.format(ctype, i)] = serial_number
-                ctype, i)] = serial_number
+            self['Erasure {} {} Size (MB)'.format(ctype, i)] = none2str(component.size)
-            self['Erasure {} {} Size (MB)'.format(
-                ctype, i)] = none2str(component.size)
             self['Erasure {} {} Software'.format(ctype, i)] = software
 
             result = get_result(erasure)
@@ -302,20 +304,16 @@ class DeviceRow(OrderedDict):
             self['Erasure {} {} Certificate URL'.format(ctype, i)] = ''
             self['Erasure {} {} Type'.format(ctype, i)] = erasure.type
             self['Erasure {} {} Method'.format(ctype, i)] = erasure.method
-            self['Erasure {} {} Elapsed (hours)'.format(
+            self['Erasure {} {} Elapsed (hours)'.format(ctype, i)] = format(
-                ctype, i)] = format(erasure.elapsed)
+                erasure.elapsed
-            self['Erasure {} {} Date'.format(
+            )
-                ctype, i)] = format(erasure.created)
+            self['Erasure {} {} Date'.format(ctype, i)] = format(erasure.created)
             steps = ','.join((format(x) for x in erasure.steps))
             self['Erasure {} {} Steps'.format(ctype, i)] = steps
-            steps_start_time = ','.join(
+            steps_start_time = ','.join((format(x.start_time) for x in erasure.steps))
-                (format(x.start_time) for x in erasure.steps))
+            self['Erasure {} {} Steps Start Time'.format(ctype, i)] = steps_start_time
-            self['Erasure {} {} Steps Start Time'.format(
+            steps_end_time = ','.join((format(x.end_time) for x in erasure.steps))
-                ctype, i)] = steps_start_time
+            self['Erasure {} {} Steps End Time'.format(ctype, i)] = steps_end_time
-            steps_end_time = ','.join((format(x.end_time)
-                                       for x in erasure.steps))
-            self['Erasure {} {} Steps End Time'.format(
-                ctype, i)] = steps_end_time
 
         benchmark = get_action(component, 'BenchmarkDataStorage')
         if not benchmark:
@@ -323,9 +321,11 @@ class DeviceRow(OrderedDict):
             self['Benchmark {} {} Writing speed (MB/s)'.format(ctype, i)] = ''
         else:
             self['Benchmark {} {} Read Speed (MB/s)'.format(ctype, i)] = none2str(
-                benchmark.read_speed)
+                benchmark.read_speed
+            )
             self['Benchmark {} {} Writing speed (MB/s)'.format(ctype, i)] = none2str(
-                benchmark.write_speed)
+                benchmark.write_speed
+            )
 
         test_storage = get_action(component, 'TestDataStorage')
         if not test_storage:
@@ -339,14 +339,16 @@ class DeviceRow(OrderedDict):
 
         self['Test {} {} Software'.format(ctype, i)] = software
         self['Test {} {} Type'.format(ctype, i)] = test_storage.length.value
-        self['Test {} {} Result'.format(ctype, i)] = get_result(
+        self['Test {} {} Result'.format(ctype, i)] = get_result(test_storage)
-            test_storage)
         self['Test {} {} Power cycle count'.format(ctype, i)] = none2str(
-            test_storage.power_cycle_count)
+            test_storage.power_cycle_count
+        )
         self['Test {} {} Lifetime (days)'.format(ctype, i)] = none2str(
-            test_storage.lifetime)
+            test_storage.lifetime
+        )
         self['Test {} {} Power on hours'.format(ctype, i)] = none2str(
-            test_storage.power_on_hours)
+            test_storage.power_on_hours
+        )
 
     def get_graphic_card(self, ctype, i, component):
         """Particular fields for component GraphicCard."""
@@ -400,38 +402,35 @@ class StockRow(OrderedDict):
 
 
 def get_result(erasure):
-    """ For the csv is necessary simplify the message of results """
+    """For the csv is necessary simplify the message of results"""
     if hasattr(erasure, 'type') and erasure.type == 'DataWipe':
         if erasure.document.success:
             return 'Success'
         return 'Failure'
 
-
     type_of_results = {
         Severity.Error: 'Failure',
         Severity.Warning: 'Success with Warnings',
         Severity.Notice: 'Success',
-        Severity.Info: 'Success'
+        Severity.Info: 'Success',
     }
     return type_of_results[erasure.severity]
 
 
 def none2str(string):
-    """ convert none to empty str """
+    """convert none to empty str"""
     if string is None:
         return ''
     return format(string)
 
 
-
 def get_action(component, action):
-    """ Filter one action from a component or return None """
+    """Filter one action from a component or return None"""
     result = [a for a in component.actions if a.type == action]
     return result[-1] if result else None
 
 
 class ActionRow(OrderedDict):
-
     def __init__(self, allocate):
         super().__init__()
         # General information about allocates, deallocate and lives
@@ -459,7 +458,6 @@ class ActionRow(OrderedDict):
 
 
 class InternalStatsRow(OrderedDict):
-
     def __init__(self, user, create, actions):
         super().__init__()
         # General information about all internal stats
@@ -488,13 +486,7 @@ class InternalStatsRow(OrderedDict):
 
     def count_actions(self):
         for ac in self.actions:
-            self.is_snapshot(
+            self.is_snapshot(self.is_deallocate(self.is_live(self.is_allocate(ac))))
-                self.is_deallocate(
-                    self.is_live(
-                        self.is_allocate(ac)
-                    )
-                )
-            )
 
     def is_allocate(self, ac):
         if ac.type == 'Allocate':
@@ -531,9 +523,18 @@ class InternalStatsRow(OrderedDict):
             self['Snapshot (Registers)'] += 1
 
     def quarter(self, month):
-        q = {1: 'Q1', 2: 'Q1', 3: 'Q1',
+        q = {
-             4: 'Q2', 5: 'Q2', 6: 'Q2',
+            1: 'Q1',
-             7: 'Q3', 8: 'Q3', 9: 'Q3',
+            2: 'Q1',
-             10: 'Q4', 11: 'Q4', 12: 'Q4',
+            3: 'Q1',
+            4: 'Q2',
+            5: 'Q2',
+            6: 'Q2',
+            7: 'Q3',
+            8: 'Q3',
+            9: 'Q3',
+            10: 'Q4',
+            11: 'Q4',
+            12: 'Q4',
         }
         return q[int(month)]

examples/app.py

@@ -3,7 +3,11 @@ Example app with minimal configuration.
 
 Use this as a starting point.
 """
+import sentry_sdk
+from decouple import config
 from flask_wtf.csrf import CSRFProtect
+from sentry_sdk.integrations.flask import FlaskIntegration
+from werkzeug.contrib.profiler import ProfilerMiddleware
 
 from ereuse_devicehub.api.views import api
 from ereuse_devicehub.config import DevicehubConfig
@@ -13,6 +17,20 @@ from ereuse_devicehub.labels.views import labels
 from ereuse_devicehub.views import core
 from ereuse_devicehub.workbench.views import workbench
 
+SENTRY_DSN = config('SENTRY_DSN', None)
+if SENTRY_DSN:
+    sentry_sdk.init(
+        dsn=SENTRY_DSN,
+        integrations=[
+            FlaskIntegration(),
+        ],
+        # Set traces_sample_rate to 1.0 to capture 100%
+        # of transactions for performance monitoring.
+        # We recommend adjusting this value in production.
+        traces_sample_rate=1.0,
+    )
+
+
 app = Devicehub(inventory=DevicehubConfig.DB_SCHEMA)
 app.register_blueprint(core)
 app.register_blueprint(devices)
@@ -26,3 +44,7 @@ app.register_blueprint(workbench)
 csrf = CSRFProtect(app)
 # csrf.protect(core)
 # csrf.protect(devices)
+app.config["SQLALCHEMY_RECORD_QUERIES"] = True
+app.config['PROFILE'] = True
+app.wsgi_app = ProfilerMiddleware(app.wsgi_app, restrictions=[30])
+app.run(debug=True)

requirements.txt

@@ -42,6 +42,7 @@ sortedcontainers==2.1.0
 tqdm==4.32.2
 python-decouple==3.3
 python-dotenv==0.14.0
+selenium==4.1.5
 pyjwt==2.4.0
 pint==0.9
 py-dmidecode==0.1.0
@@ -51,3 +52,5 @@ odfpy==1.4.1
 xlrd==2.0.1
 openpyxl==3.0.10
 et_xmlfile==1.1.0
+sentry_sdk==1.6.0
+blinker==1.4

tests/test_selenium.py

@@ -0,0 +1,104 @@
+# Generated by Selenium IDE
+import time
+
+from selenium import webdriver
+from selenium.webdriver.common.action_chains import ActionChains
+from selenium.webdriver.common.by import By
+from selenium.webdriver.firefox.options import Options
+
+
+class TestSelenium:
+    def setup_method(self, method):
+        options = Options()
+        options.add_argument("--headless")
+        self.driver = webdriver.Firefox(
+            options=options, executable_path=r'./bin/geckodriver'
+        )
+        self.vars = {}
+
+    def teardown_method(self, method):
+        self.driver.quit()
+
+    def test_selenium(self):
+        # setup
+        self.driver.get("http://localhost:5000/login/")
+        self.driver.set_window_size(1920, 1063)
+
+        # login
+        self.driver.find_element(By.ID, "yourEmail").click()
+        self.driver.implicitly_wait(3)
+        self.driver.find_element(By.ID, "yourPassword").send_keys("1234")
+        self.driver.find_element(By.ID, "yourEmail").send_keys("user@dhub.com")
+        self.driver.find_element(By.CSS_SELECTOR, ".btn").click()
+        self.driver.implicitly_wait(3)
+
+        # select the first lot and get the ID of it
+        self.driver.find_element(By.LINK_TEXT, "Temporary Lots").click()
+        self.driver.implicitly_wait(3)
+        self.driver.find_element(
+            By.CSS_SELECTOR, "#temporal-lots-nav > li:nth-child(2) span"
+        ).click()
+        self.driver.implicitly_wait(3)
+        lot_id = self.driver.current_url.split("/")[5]
+
+        # go to unassigned
+        self.driver.find_element(By.CSS_SELECTOR, ".nav-item:nth-child(5) span").click()
+        self.driver.implicitly_wait(3)
+
+        # select the first device
+        self.driver.find_element(
+            By.CSS_SELECTOR, "tr:nth-child(1) .deviceSelect"
+        ).click()
+        self.driver.implicitly_wait(3)
+
+        # add to new selenium_lot
+        self.driver.find_element(By.ID, "btnLots").click()
+        self.driver.implicitly_wait(3)
+        self.driver.find_element(By.ID, lot_id).click()
+        self.driver.implicitly_wait(3)
+        self.driver.find_element(By.ID, "ApplyDeviceLots").click()
+        time.sleep(3)
+        element = self.driver.find_element(By.ID, "ApplyDeviceLots")
+        time.sleep(3)
+        actions = ActionChains(self.driver)
+        time.sleep(3)
+        actions.move_to_element(element).perform()
+        time.sleep(3)
+        element = self.driver.find_element(By.CSS_SELECTOR, "body")
+        time.sleep(3)
+        actions = ActionChains(self.driver)
+        time.sleep(3)
+        # actions.move_to_element(element, 0, 0).perform()
+        actions.move_to_element(element).perform()
+        time.sleep(3)
+        self.driver.find_element(By.ID, "SaveAllActions").click()
+        time.sleep(3)
+
+        # go to selenium lot
+        self.driver.find_element(By.LINK_TEXT, "Temporary Lots").click()
+        self.driver.implicitly_wait(3)
+        self.driver.find_element(
+            By.CSS_SELECTOR, "#temporal-lots-nav > li:nth-child(2) span"
+        ).click()
+        self.driver.implicitly_wait(3)
+
+        # select the first device
+        self.driver.find_element(By.CSS_SELECTOR, ".deviceSelect").click()
+
+        # remove to new selenium_lot
+        self.driver.find_element(By.ID, "btnLots").click()
+        self.driver.implicitly_wait(3)
+        self.driver.find_element(By.ID, lot_id).click()
+        self.driver.implicitly_wait(3)
+        self.driver.find_element(By.ID, "ApplyDeviceLots").click()
+        time.sleep(3)
+        self.driver.find_element(By.ID, "SaveAllActions").click()
+        time.sleep(3)
+
+        self.driver.find_element(By.CSS_SELECTOR, ".nav-item:nth-child(5) span").click()
+        self.driver.implicitly_wait(3)
+
+        # logout
+        self.driver.find_element(By.CSS_SELECTOR, ".d-md-block:nth-child(2)").click()
+        self.driver.implicitly_wait(3)
+        self.driver.find_element(By.LINK_TEXT, "Sign Out").click()