From 859b79d0dcd53c85bb57e3db888a1af702802987 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 30 Aug 2013 11:20:04 +0200
Subject: Account: Composition to handle User and its identities

We have a lot of things that act upon a user record and one or more of it's identities at the same time:
* Sing up: Create a user and it's initial identity
* Rename:  Change the username and create a new identity, turn old into an alias
* Cancel Account: Remove user and all their identities.

In order to keep the User and Identity behaviour isolated but still have a this logic represented in a sinle place the Account model deals with all these things.

We could have overwritten the User#create, User#update and User#destroy methods instead. But then we would always create identities, even if we only need a user (for example in tests).
---
 users/app/models/account.rb          | 57 ++++++++++++++++++++++++++++++++++++
 users/app/models/account_settings.rb | 36 -----------------------
 users/app/models/signup_service.rb   |  9 ------
 users/app/models/user.rb             |  4 +++
 4 files changed, 61 insertions(+), 45 deletions(-)
 create mode 100644 users/app/models/account.rb
 delete mode 100644 users/app/models/account_settings.rb
 delete mode 100644 users/app/models/signup_service.rb

(limited to 'users/app/models')

diff --git a/users/app/models/account.rb b/users/app/models/account.rb
new file mode 100644
index 0000000..5368a1b
--- /dev/null
+++ b/users/app/models/account.rb
@@ -0,0 +1,57 @@
+#
+# A Composition of a User record and it's identity records.
+#
+class Account
+
+  attr_reader :user
+
+  def initialize(user = nil)
+    @user = user
+  end
+
+  # Returns the user record so it can be used in views.
+  def self.create(attrs)
+    @user = User.create(attrs).tap do |user|
+      Identity.create_for user
+    end
+  end
+
+  def update(attrs)
+    if attrs[:password_verifier].present?
+      update_login(attrs[:login])
+      @user.update_attributes attrs.slice(:password_verifier, :password_salt)
+    end
+    # TODO: move into identity controller
+    update_pgp_key(attrs[:public_key]) if attrs.has_key? :public_key
+    @user.save && save_identities
+    @user.refresh_identity
+  end
+
+  def destroy
+    return unless @user
+    Identity.by_user_id.key(@user.id).each do |identity|
+      identity.destroy
+    end
+    @user.destroy
+  end
+
+  protected
+
+  def update_login(login)
+    return unless login.present?
+    @old_identity = Identity.for(@user)
+    @user.login = login
+    @new_identity = Identity.for(@user) # based on the new login
+    @old_identity.destination = @user.email_address # alias old -> new
+  end
+
+  def update_pgp_key(key)
+    @new_identity ||= Identity.for(@user)
+    @new_identity.set_key(:pgp, key)
+  end
+
+  def save_identities
+    @new_identity.try(:save) && @old_identity.try(:save)
+  end
+
+end
diff --git a/users/app/models/account_settings.rb b/users/app/models/account_settings.rb
deleted file mode 100644
index 27fa227..0000000
--- a/users/app/models/account_settings.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-class AccountSettings
-
-  def initialize(user)
-    @user = user
-  end
-
-  def update(attrs)
-    if attrs[:password_verifier].present?
-      update_login(attrs[:login])
-      @user.update_attributes attrs.slice(:password_verifier, :password_salt)
-    end
-    # TODO: move into identity controller
-    update_pgp_key(attrs[:public_key]) if attrs.has_key? :public_key
-    @user.save && save_identities
-  end
-
-  protected
-
-  def update_login(login)
-    return unless login.present?
-    @old_identity = Identity.for(@user)
-    @user.login = login
-    @new_identity = Identity.for(@user) # based on the new login
-    @old_identity.destination = @user.email_address # alias old -> new
-  end
-
-  def update_pgp_key(key)
-    @new_identity ||= Identity.for(@user)
-    @new_identity.set_key(:pgp, key)
-  end
-
-  def save_identities
-    @new_identity.try(:save) && @old_identity.try(:save)
-  end
-
-end
diff --git a/users/app/models/signup_service.rb b/users/app/models/signup_service.rb
deleted file mode 100644
index f316ca9..0000000
--- a/users/app/models/signup_service.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class SignupService
-
-  def register(attrs)
-    User.create(attrs).tap do |user|
-      Identity.create_for user
-    end
-  end
-
-end
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 8874966..310eecd 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -86,6 +86,10 @@ class User < CouchRest::Model::Base
     @identity ||= Identity.for(self)
   end
 
+  def refresh_identity
+    @identity = Identity.for(self)
+  end
+
   protected
 
   ##
-- 
cgit v1.2.3