Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions dojo/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,13 @@ def calculate_grade(product, *args, **kwargs):
aeval = Interpreter()
aeval(system_settings.product_grade)
grade_product = f"grade_product({critical}, {high}, {medium}, {low})"
product.prod_numeric_grade = aeval(grade_product)
super(Product, product).save()
prod_numeric_grade = aeval(grade_product)
if prod_numeric_grade != product.prod_numeric_grade:
logger.debug("Updating product %s grade from %s to %s", product.id, product.prod_numeric_grade, prod_numeric_grade)
product.prod_numeric_grade = prod_numeric_grade
super(Product, product).save()
else:
logger.debug("Product %s grade %i is up to date", product.id, prod_numeric_grade)


def get_celery_worker_status():
Expand Down
6 changes: 3 additions & 3 deletions unittests/test_importers_performance.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,10 @@ def test_import_reimport_reimport_performance_no_async_with_product_grading(self
DojoSytemSettingsMiddleware.load()

self.import_reimport_performance(
expected_num_queries1=732,
expected_num_queries1=717,
expected_num_async_tasks1=15,
expected_num_queries2=686,
expected_num_queries2=662,
expected_num_async_tasks2=28,
expected_num_queries3=357,
expected_num_queries3=337,
expected_num_async_tasks3=25,
)