Add created amd updated fields to MonitoredVariable (#269)

* Add created amd updated fields to MonitoredVariable

* Fix migration conflict

* Fix stored procedure to include created and updated fields

* Revert

* Minor issue fix

* Fix systemtests: Update test_setInstrumentPVs.py to use current database schema

Author: darshdinger

src/webmon_app/reporting/pvmon/admin.py

@@ -21,7 +21,8 @@ class PVNameAdmin(admin.ModelAdmin):
 
 
 class MonitoredVariableAdmin(admin.ModelAdmin):
-    list_display = ("id", "instrument", "pv_name", "rule_name")
+    list_display = ("id", "instrument", "pv_name", "rule_name", "created", "updated")
+    readonly_fields = ("created", "updated")
 
 
 admin.site.register(PVName, PVNameAdmin)

src/webmon_app/reporting/pvmon/migrations/0004_add_created_updated_to_monitoredvariable.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.23 on 2025-09-10 12:00
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("pvmon", "0003_pv_timestamp_pvcache_timestamp_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="monitoredvariable",
+            name="created",
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="monitoredvariable",
+            name="updated",
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]

src/webmon_app/reporting/pvmon/models.py

@@ -77,3 +77,5 @@ class MonitoredVariable(models.Model):
     instrument = models.ForeignKey(Instrument, on_delete=models.CASCADE)
     pv_name = models.ForeignKey(PVName, null=True, blank=True, on_delete=models.CASCADE)
     rule_name = models.CharField(max_length=50, default="", blank=True)
+    created = models.DateTimeField(auto_now_add=True)
+    updated = models.DateTimeField(auto_now=True)

src/webmon_app/reporting/pvmon/sql/stored_procs.sql

@@ -175,32 +175,45 @@ BEGIN
         RAISE EXCEPTION 'Instrument % does not exist', instrument;
     END IF;
 
-    -- Delete the existing monitored variables for this instrument
+    -- Delete monitored variables for this instrument that are NOT in the input list
     DELETE
     FROM pvmon_monitoredvariable
-    WHERE instrument_id = n_instrument;
+    WHERE instrument_id = n_instrument
+    AND pv_name_id NOT IN (
+        SELECT id
+        FROM pvmon_pvname
+        WHERE name = ANY(pvs)
+    );
 
     -- Insert the new monitored variables without duplicates
     FOREACH n_pv_name IN ARRAY pvs
     LOOP
         SELECT id INTO n_pv_id FROM pvmon_pvname WHERE name = n_pv_name;
         IF n_pv_id IS NOT NULL THEN
-            INSERT INTO pvmon_monitoredvariable (instrument_id, pv_name_id, rule_name)
-              SELECT pvmon_pvcache.instrument_id, pvmon_pvcache.name_id, ''
-              FROM pvmon_pvcache
-              WHERE pvmon_pvcache.instrument_id = n_instrument AND pvmon_pvcache.name_id = n_pv_id
-              UNION
-              SELECT pvmon_pvstringcache.instrument_id, pvmon_pvstringcache.name_id, ''
-              FROM pvmon_pvstringcache
-              WHERE pvmon_pvstringcache.instrument_id = n_instrument AND pvmon_pvstringcache.name_id = n_pv_id;
+            -- Only insert if not already present
+            SELECT COUNT(*) INTO n_count
+            FROM pvmon_monitoredvariable
+            WHERE instrument_id = n_instrument AND pv_name_id = n_pv_id;
+
+            IF n_count = 0 THEN
+                INSERT INTO pvmon_monitoredvariable (instrument_id, pv_name_id, rule_name, created, updated)
+                  SELECT pvmon_pvcache.instrument_id, pvmon_pvcache.name_id, '', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP
+                  FROM pvmon_pvcache
+                  WHERE pvmon_pvcache.instrument_id = n_instrument AND pvmon_pvcache.name_id = n_pv_id
+                  UNION
+                  SELECT pvmon_pvstringcache.instrument_id, pvmon_pvstringcache.name_id, '', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP
+                  FROM pvmon_pvstringcache
+                  WHERE pvmon_pvstringcache.instrument_id = n_instrument AND pvmon_pvstringcache.name_id = n_pv_id;
+            END IF;
         END IF;
     END LOOP;
     SELECT count(*)
       INTO n_count
-      FROM pvmon_monitoredvariable;
+      FROM pvmon_monitoredvariable
+      WHERE instrument_id = n_instrument;
     IF n_count = 0 THEN
-      INSERT INTO pvmon_monitoredvariable (instrument_id, rule_name)
-      VALUES (n_instrument, '');
+      INSERT INTO pvmon_monitoredvariable (instrument_id, rule_name, created, updated)
+      VALUES (n_instrument, '', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
     END IF;
 END;
 $$ LANGUAGE plpgsql VOLATILE

src/webmon_app/reporting/tests/test_pvmon/test_models.py

@@ -145,6 +145,28 @@ def test_rule_name_max_length(self):
         max_len = pv._meta.get_field("rule_name").max_length
         self.assertEqual(max_len, 50)
 
+    def test_created_field_exists(self):
+        pv = MonitoredVariable.objects.get(id=1)
+        self.assertTrue(hasattr(pv, "created"))
+        self.assertIsNotNone(pv.created)
+
+    def test_updated_field_exists(self):
+        pv = MonitoredVariable.objects.get(id=1)
+        self.assertTrue(hasattr(pv, "updated"))
+        self.assertIsNotNone(pv.updated)
+
+    def test_created_auto_now_add(self):
+        # Test that created field has auto_now_add=True
+        pv = MonitoredVariable.objects.get(id=1)
+        created_field = pv._meta.get_field("created")
+        self.assertTrue(created_field.auto_now_add)
+
+    def test_updated_auto_now(self):
+        # Test that updated field has auto_now=True
+        pv = MonitoredVariable.objects.get(id=1)
+        updated_field = pv._meta.get_field("updated")
+        self.assertTrue(updated_field.auto_now)
+
 
 if __name__ == "__main__":
     pytest.main()

tests/test_setInstrumentPVs.py

@@ -52,7 +52,7 @@ def insert_test_data(cls):
         for each in pv_ids:
             cursor.execute(
                 "INSERT INTO pvmon_pvcache (instrument_id, name_id, value, status, timestamp) "
-                "VALUES (%s, %s, 0.0, 0, '2025-08-28 14:30:00');",
+                "VALUES (%s, %s, 0.0, 0, CURRENT_TIMESTAMP);",
                 [inst_id, each],
             )
             clean_pv_ids.append((inst_id[0], each[0]))
@@ -63,7 +63,7 @@ def insert_test_data(cls):
         for each in stringpv_ids:
             cursor.execute(
                 "INSERT INTO pvmon_pvstringcache (instrument_id, name_id, value, status, timestamp)"
-                "VALUES (%s, %s, 'test_string_value', 0, '2025-08-28 14:30:00');",
+                "VALUES (%s, %s, 'test_string_value', 0, CURRENT_TIMESTAMP);",
                 [inst_id, each],
             )
             clean_pv_ids.append((inst_id[0], each[0]))