Index: openacs-4/packages/proctoring-support/proctoring-support.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/proctoring-support/proctoring-support.info,v
diff -u -r1.1.2.26 -r1.1.2.27
--- openacs-4/packages/proctoring-support/proctoring-support.info	10 Feb 2022 13:16:36 -0000	1.1.2.26
+++ openacs-4/packages/proctoring-support/proctoring-support.info	10 Feb 2022 16:31:03 -0000	1.1.2.27
@@ -10,7 +10,7 @@
     <inherit-templates-p>f</inherit-templates-p>
     <auto-mount>proctoring</auto-mount>
 
-    <version name="3.2.0" url="http://openacs.org/repository/download/apm/proctoring-support-3.2.0.apm">
+    <version name="3.2.1" url="http://openacs.org/repository/download/apm/proctoring-support-3.2.1.apm">
         <owner url="mailto:apisano@wu.ac.at">Antonio Pisano</owner>
         <summary>Set of tools to implement proctoring of user interaction</summary>
         <vendor url="https://www.wu.ac.at/">Wirtschaftsuniversität Wien</vendor>
@@ -21,7 +21,7 @@
 No real UI is provided by the package itself. Other packages must integrate the provided includes.</description>
         <maturity>0</maturity>
 
-        <provides url="proctoring-support" version="3.2.0"/>
+        <provides url="proctoring-support" version="3.2.1"/>
         <requires url="acs-templating" version="5.10.0"/>
         <requires url="xotcl-core" version="5.10.0"/>
 
Index: openacs-4/packages/proctoring-support/lib/proctoring-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/proctoring-support/lib/proctoring-display.tcl,v
diff -u -r1.1.2.6 -r1.1.2.7
--- openacs-4/packages/proctoring-support/lib/proctoring-display.tcl	10 Feb 2022 09:32:58 -0000	1.1.2.6
+++ openacs-4/packages/proctoring-support/lib/proctoring-display.tcl	10 Feb 2022 16:31:03 -0000	1.1.2.7
@@ -73,14 +73,8 @@
 
 if {$delete_p && [llength $user_id] >= 1} {
     foreach u $user_id {
-        ::xo::dc dml -prepare {integer integer} delete_artifacts {
-            delete from proctoring_object_artifacts
-            where object_id = :object_id
-              and user_id = :u
-        }
-        set folder [::proctoring::folder \
-                        -object_id $object_id -user_id $u]
-        file delete -force -- $folder
+        ::proctoring::artifact::delete \
+            -object_id $object_id -user_id $u
     }
     ad_returnredirect $base_url
     ad_script_abort
@@ -180,11 +174,7 @@
     set delete_confirm [_ xowiki.delete_all_confirm]
 
     if {$delete_p} {
-        ::xo::dc dml -prepare integer delete_artifacts {
-            delete from proctoring_object_artifacts
-            where object_id = :object_id
-        }
-        file delete -force -- $folder
+        ::proctoring::artifact::delete -object_id $object_id
         ad_returnredirect $base_url
         ad_script_abort
     }
Index: openacs-4/packages/proctoring-support/tcl/proctoring-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/proctoring-support/tcl/proctoring-procs.tcl,v
diff -u -r1.1.2.17 -r1.1.2.18
--- openacs-4/packages/proctoring-support/tcl/proctoring-procs.tcl	10 Feb 2022 13:54:33 -0000	1.1.2.17
+++ openacs-4/packages/proctoring-support/tcl/proctoring-procs.tcl	10 Feb 2022 16:31:03 -0000	1.1.2.18
@@ -337,3 +337,24 @@
                 artifact_id $artifact_id \
                 file $file_path]
 }
+
+ad_proc ::proctoring::artifact::delete {
+    -object_id:required
+    {-user_id ""}
+} {
+    Delete proctoring artifacts.
+
+    @param object_id proctored object id
+    @param user_id user the artifact was collected for.
+} {
+    ::xo::dc dml -prepare {
+        integer text integer
+    } delete {
+        delete from proctoring_object_artifacts
+        where object_id = :object_id
+          and (coalesce(:user_id, '') = '' or user_id = :user_id)
+    }
+    ::proctoring::delete \
+        -object_id $object_id \
+        -user_id $user_id
+}
Index: openacs-4/packages/proctoring-support/tcl/test/proctoring-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/proctoring-support/tcl/test/proctoring-test-procs.tcl,v
diff -u -r1.1.2.13 -r1.1.2.14
--- openacs-4/packages/proctoring-support/tcl/test/proctoring-test-procs.tcl	10 Feb 2022 13:16:36 -0000	1.1.2.13
+++ openacs-4/packages/proctoring-support/tcl/test/proctoring-test-procs.tcl	10 Feb 2022 16:31:03 -0000	1.1.2.14
@@ -268,6 +268,7 @@
     -cats {api smoke} \
     -procs {
         ::proctoring::artifact::store
+        ::proctoring::artifact::delete
     } \
     proctoring_artifact_store {
         Test ::proctoring::artifact::store
@@ -277,25 +278,47 @@
         puts $wfd 1234
         close $wfd
 
-        set object_id [::xo::dc get_value get_object_id {
-            select max(object_id) from acs_objects
+        for {set i 2} {$i <= 4} {incr i} {
+            set file${i} [ad_tmpnam].test
+            file copy $file [set file${i}]
+        }
+
+        # A new test user is at the same time a safe user and a safe
+        # object to test on.
+        set user_info [::acs::test::user::create]
+        set user_id [dict get $user_info user_id]
+        set object_id $user_id
+
+        set another_user_id [::xo::dc get_value get_user_id {
+            select min(user_id) from users
         }]
-        set user_id [::xo::dc get_value get_user_id {
-            select max(user_id) from users
-        }]
+
         set name test
         set type code
         set timestamp [clock scan "2016-09-07" -format %Y-%m-%d]
 
-        aa_section "Initial cleanup"
-        ::xo::dc dml cleanup {
-            delete from proctoring_object_artifacts
-            where name = :name
-              and type = :type
-              and timestamp = to_timestamp(:timestamp)
-              and user_id = :user_id
-              and object_id = :object_id
-        }
+        aa_section "Test full cleanup"
+        ::proctoring::artifact::store \
+            -object_id $object_id \
+            -user_id $user_id \
+            -timestamp $timestamp \
+            -name $name \
+            -type $type \
+            -file $file3
+        ::proctoring::artifact::store \
+            -object_id $object_id \
+            -user_id $another_user_id \
+            -timestamp $timestamp \
+            -name $name \
+            -type $type \
+            -file $file4
+        ::proctoring::artifact::delete \
+            -object_id $object_id
+        aa_false "No artifacts for object '$object_id'" [::xo::dc 0or1row check {
+            select 1 from proctoring_object_artifacts
+            where object_id = :object_id
+            fetch first 1 rows only
+        }]
 
         aa_section "Storing an artifact correctly"
         set artifact [::proctoring::artifact::store \
@@ -321,14 +344,48 @@
         aa_true "File exists" [file exists $file]
         aa_equals "File has the original extension" .test [file extension $file]
 
+        aa_section "Storing another artifact for a different user"
+        set artifact2 [::proctoring::artifact::store \
+                           -object_id $object_id \
+                           -user_id $another_user_id \
+                           -timestamp $timestamp \
+                           -name $name \
+                           -type $type \
+                           -file $file2]
+        aa_true "Entry for '$another_user_id' was created" [::xo::dc 0or1row check {
+            select 1 from proctoring_object_artifacts
+            where object_id = :object_id
+              and user_id = :another_user_id
+            fetch first 1 rows only
+        }]
+
         aa_section "Cleanup"
-        ::xo::dc dml cleanup {
-            delete from proctoring_object_artifacts
-            where artifact_id = :artifact_id
-        }
-        aa_equals "Row was deleted" [db_resultrows] 1
-        file delete -- $file
-        aa_false "File was removed" [file exists $file]
+        ::proctoring::artifact::delete \
+            -object_id $object_id \
+            -user_id $user_id
+        aa_false "No entry for '$user_id' anymore" [::xo::dc 0or1row check {
+            select 1 from proctoring_object_artifacts
+            where object_id = :object_id
+              and user_id = :user_id
+            fetch first 1 rows only
+        }]
+        aa_false "File '$file' was removed" [file exists $file]
+        aa_true "Still entry for '$another_user_id'" [::xo::dc 0or1row check {
+            select 1 from proctoring_object_artifacts
+            where object_id = :object_id
+              and user_id = :another_user_id
+            fetch first 1 rows only
+        }]
+        aa_true "Still file for '$another_user_id'" [file exists [dict get $artifact2 file]]
+        ::proctoring::artifact::delete \
+            -object_id $object_id \
+            -user_id $another_user_id
+        aa_false "Also artifacts for '$another_user_id' deleted." [::xo::dc 0or1row check {
+            select 1 from proctoring_object_artifacts
+            where object_id = :object_id
+            fetch first 1 rows only
+        }]
+        aa_false "File also delete for '$another_user_id'" [file exists [dict get $artifact2 file]]
 
         aa_section "Try to store for an invalid object"
         set broken_object_id [::xo::dc get_value get_broken_object_id {