From 3151970fbdeb8bd460eacc96e2e7e2858fff6837 Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@nexb.com>
Date: Tue, 9 Jul 2024 18:26:55 +0400
Subject: [PATCH] Fix failing tests #45

Signed-off-by: tdruez <tdruez@nexb.com>
---
 component_catalog/models.py            |  1 -
 component_catalog/tests/test_models.py | 15 ++++++++-------
 component_catalog/tests/test_views.py  |  2 +-
 dje/models.py                          |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/component_catalog/models.py b/component_catalog/models.py
index eaa05d2e..91821df6 100644
--- a/component_catalog/models.py
+++ b/component_catalog/models.py
@@ -2424,7 +2424,6 @@ def get_purldb_entries(self, user, max_request_call=0, timeout=10):
             if packages_data := purldb.find_packages(payload, timeout):
                 return packages_data
 
-
     def update_from_purldb(self, user):
         """
         Find this Package in the PurlDB and update empty fields with PurlDB data
diff --git a/component_catalog/tests/test_models.py b/component_catalog/tests/test_models.py
index 84ed1af4..9fd882cc 100644
--- a/component_catalog/tests/test_models.py
+++ b/component_catalog/tests/test_models.py
@@ -1664,22 +1664,22 @@ def test_package_model_update_from_data(self):
         self.assertEqual([], updated_fields)
 
         new_data = {
-            "name": "new name",
-            "version": "1.0",
+            "filename": "new_filename",
+            "notes": "Some notes",
             "unknown_field": "value",
         }
         updated_fields = package.update_from_data(self.user, data=new_data)
-        self.assertEqual(["version"], updated_fields)
+        self.assertEqual(["notes"], updated_fields)
         package.refresh_from_db()
         # Already has a value, not updated
-        self.assertEqual("name", package.name)
+        self.assertEqual("package.zip", package.filename)
         # Empty field, updated
-        self.assertEqual(new_data["version"], package.version)
+        self.assertEqual(new_data["notes"], package.notes)
 
         updated_fields = package.update_from_data(self.user, data=new_data, override=True)
-        self.assertEqual(["name"], updated_fields)
+        self.assertEqual(["filename"], updated_fields)
         package.refresh_from_db()
-        self.assertEqual(new_data["name"], package.name)
+        self.assertEqual(new_data["filename"], package.filename)
 
     @mock.patch("component_catalog.models.collect_package_data")
     def test_package_model_create_from_url(self, mock_collect):
@@ -2555,6 +2555,7 @@ def test_package_model_update_from_purldb(self, mock_get_purldb_entries):
             "sha1",
             "sha256",
             "copyright",
+            "declared_license_expression",
             "license_expression",
         ]
         self.assertEqual(expected, updated_fields)
diff --git a/component_catalog/tests/test_views.py b/component_catalog/tests/test_views.py
index d930555e..f4e4874b 100644
--- a/component_catalog/tests/test_views.py
+++ b/component_catalog/tests/test_views.py
@@ -3474,7 +3474,7 @@ def test_component_catalog_package_add_view_create_proper(self):
     @mock.patch("dejacode_toolkit.purldb.PurlDB.request_get")
     @mock.patch("dejacode_toolkit.purldb.PurlDB.is_configured")
     def test_component_catalog_package_add_view_initial_data(
-            self, mock_is_configured, mock_request_get
+        self, mock_is_configured, mock_request_get
     ):
         self.client.login(username=self.super_user.username, password="secret")
         add_url = reverse("component_catalog:package_add")
diff --git a/dje/models.py b/dje/models.py
index c9f8b37e..5bda6463 100644
--- a/dje/models.py
+++ b/dje/models.py
@@ -779,7 +779,7 @@ def update_from_data(self, user, data, override=False):
 
         if updated_fields:
             self.last_modified_by = user
-            self.save(update_fields=updated_fields)
+            self.save(update_fields=[*updated_fields, "last_modified_by"])
 
         return updated_fields