From 579a22471329c71552bcb4077a0590d60cdec784 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 4 Mar 2017 19:49:54 -0500
Subject: [PATCH] Don't fail if the source user doesn't exist during an
 AgendavMv.

---
 lib/common/agendav_plugin.rb | 10 +++++-----
 lib/mv/plugins/agendav.rb    | 18 +++++++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/lib/common/agendav_plugin.rb b/lib/common/agendav_plugin.rb
index 4c3a5cf..c5e7d77 100644
--- a/lib/common/agendav_plugin.rb
+++ b/lib/common/agendav_plugin.rb
@@ -35,11 +35,11 @@ module AgendavPlugin
 
     connection = PG::Connection.new(@db_hash)
 
-    # There's also an "owner" field in the "shares" table, but it
-    # contains a principal URL and not a bare username. Thus its
-    # format depends on the CalDAV server configuration, and isn't
-    # predictable.
-    sql_query  = 'SELECT username FROM prefs'
+    # There are also "owner" and "with" fields in the "shares" table,
+    # but they contains principal URLs and not a bare username. Thus
+    # their format depends on the CalDAV server configuration, and
+    # isn't predictable.
+    sql_query  = 'SELECT username FROM prefs;'
 
     begin
       connection.query(sql_query) do |result|
diff --git a/lib/mv/plugins/agendav.rb b/lib/mv/plugins/agendav.rb
index 4bf6583..fc2a5d9 100644
--- a/lib/mv/plugins/agendav.rb
+++ b/lib/mv/plugins/agendav.rb
@@ -15,22 +15,30 @@ class AgendavMv
   # Move the user *src* to *dst* within the Agendav database. This
   # should "rename" him in _every_ table where he is referenced.
   #
-  # This can fail is *src* does not exist, or if *dst* already exists
-  # before the move. It should also be an error if the destination
-  # domain doesn't exist. But Agendav doesn't know about domains, so
-  # we let that slide.
+  # This can fail if *dst* already exists before the move. It should
+  # also be an error if the destination domain doesn't exist. But
+  # Agendav doesn't know about domains, so we let that slide.
+  #
+  # If the source user doesn't exist, we do our best. AgenDAV has a
+  # "shares" table that isn't keyed on the username, but rather the
+  # principal URL. And its "prefs" table doesn't contain entries for
+  # users who have default preferences. As a result, we may need to
+  # perform some find/replaces in the "shares" table even if no
+  # corresponding user exists in the "prefs" table (which is how we
+  # tell if a user exists in AgenDAV). Thus it's not a fatal error if
+  # the *src* user doesn't exist.
   #
   # @param src [User] the source user to be moved.
   #
   # @param dst [User] the destination user being moved to.
   #
   def mv_user(src, dst)
-    raise NonexistentUserError.new(src.to_s()) if not user_exists(src)
     raise UserAlreadyExistsError.new(dst.to_s()) if user_exists(dst)
 
     connection = PG::Connection.new(@db_hash)
     begin
       # The "prefs" table uses the normal username as a key...
+      # This should be harmless if the source user does not exist.
       sql_query = 'UPDATE prefs SET username = $1 WHERE username = $2;'
       connection.query(sql_query, [dst.to_s(), src.to_s()])
 
-- 
2.44.2