dorsale 3.9.1 → 3.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76ebbb416c39796db8712d68bb5952b6a9805904
-  data.tar.gz: e2a2fa91cab07ed102a24bdb0fc9240e1a940a92
+  metadata.gz: 5358e48332086ea75f9a49b3578793b5d16967a4
+  data.tar.gz: 12a4d387aa03f2b70f1461b9961b1e8cc034800a
 SHA512:
-  metadata.gz: bd88080f00eaa88ee7e464d60e6377359e88af977807e9f616679d620ec38b35ae0c7b4034dc64cafb93d8fe726e611c737bff2c085de7363e4774542a278c9b
-  data.tar.gz: 416f512d565db0c0d0a7878006b822fee869acc2ea4b7aa9df05a377102eb86e4a6ccd1d3b2cb52d3b76adad3114a696753598442a6ec6ade2b733e247e05cf1
+  metadata.gz: eb146a34700533fc56964b13a83249d901233c4c3d746ca51454796e3c70bcd1c0013b513805ef47e622dc8732b001f5e2935fbfdadef1ed24d16dbb695bd34a
+  data.tar.gz: e8a441114f93b6074e80d298b29c1a362686e5c5fc07a78af43e05bc77f09abf83f7893e0c561c475fec365367b604909787d96273ce32faf51e4e9e5fb084eb

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next version
 
+## 3.9.2
+
+- CustomerVault : Add secondary emails + uniqueness validation
+
 ## 3.9.1
 
 - Add tags to tasks

data/app/controllers/dorsale/customer_vault/people_controller.rb

@@ -137,6 +137,7 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
       :short_name,
       :avatar,
       :email,
+      :secondary_emails_str,
       :phone,
       :mobile,
       :fax,

data/app/models/dorsale/customer_vault/person.rb

@@ -46,9 +46,47 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
     )
   }
 
+  scope :having_email, -> (email) { where("email = :e OR :e = ANY (secondary_emails)", e: email) }
+
   after_initialize  :build_address, if: proc { new_record? && address.nil? }
   before_validation :build_address, if: proc { address.nil? }
 
+  def taken_emails
+    taken_emails = {}
+    ([email] + secondary_emails).select(&:present?).each do |e|
+      person = Dorsale::CustomerVault::Person.where.not(id: id).having_email(e).first
+      taken_emails[e] = person if person.present?
+    end
+    taken_emails
+  end
+
+  validate :validate_taken_emails
+
+  def validate_taken_emails
+    return if taken_emails.empty?
+
+    if taken_emails.keys.include?(email)
+      errors.add(:email, :taken)
+    end
+
+    if (taken_emails.keys & secondary_emails).any?
+      errors.add(:secondary_emails, :taken)
+      errors.add(:secondary_emails_str, :taken)
+    end
+  end
+
+  def email=(incoming_email)
+    super(incoming_email.to_s.strip.presence)
+  end
+
+  def secondary_emails_str
+    secondary_emails.join("\n")
+  end
+
+  def secondary_emails_str=(emails)
+    self.secondary_emails = emails.strip.split
+  end
+
   def person_type
     self.class.to_s.demodulize.downcase.to_sym
   end

data/app/views/dorsale/customer_vault/people/_context_general.html.slim

@@ -8,6 +8,7 @@
     = info person, :title
 
   = info person, :email,  helper: :email_link
+  = info person, :secondary_emails, person.secondary_emails.map { |e| email_link(e) }.join(tag(:br)).html_safe
   = info person, :phone,  helper: :tel_link
   = info person, :mobile, helper: :tel_link
   = info person, :fax,    helper: :tel_link

data/app/views/dorsale/customer_vault/people/_emails_errors.html.slim

@@ -0,0 +1,5 @@
+.row
+  .col-md-3
+  .col-md-9: ul
+    - person.taken_emails.each do |email, person|
+      li = t("messages.email_taken_by", email: email, person: link_to_object(person, target: "_blank")).html_safe

data/app/views/dorsale/customer_vault/people/_form.html.slim

@@ -36,6 +36,9 @@
     .panel-heading: .panel-title = t("customer_vault.contact_informations")
     .panel-body
       = f.input :email
+      = f.input :secondary_emails_str, as: :text, input_html: {rows: 2}
+      - if @person.errors.key?(:email) || @person.errors.key?(:secondary_emails)
+        = render "emails_errors", person: @person
       = f.input :phone
       = f.input :mobile
       = f.input :fax

data/config/locales/customer_vault.en.yml

@@ -17,6 +17,7 @@ en:
   messages:
     no_people: "No people find."
     no_activity: "No recent activity."
+    email_taken_by: "%{email} is taken by %{person}"
 
     corporations:
       create_ok    : "Corporation created."
@@ -98,6 +99,8 @@ en:
         individuals: "Individuals"
         origin: "Origin"
         activity_type: "Activity type"
+        secondary_emails: "Secondary e-mails"
+        secondary_emails_str: "Secondary e-mails"
 
       dorsale/customer_vault/individual:
         <<: *customer_vault_person_attributes

data/config/locales/customer_vault.fr.yml

@@ -17,6 +17,7 @@ fr:
   messages:
     no_people: "Aucune personne trouvée."
     no_activity: "Aucune activité récente."
+    email_taken_by: "%{email} est déjà pris par %{person}"
 
     corporations:
       create_ok    : "La personne a été créée."
@@ -97,6 +98,8 @@ fr:
         individuals: "Individus"
         origin: "Origine"
         activity_type: "Type d'activité"
+        secondary_emails: "E-mails secondaires"
+        secondary_emails_str: "E-mails secondaires"
 
       dorsale/customer_vault/individual:
         <<: *customer_vault_person_attributes

data/db/migrate/20171115171425_dorsale_customer_vault_people_add_secondary_emails.rb

@@ -0,0 +1,9 @@
+class DorsaleCustomerVaultPeopleAddSecondaryEmails < ActiveRecord::Migration[5.0]
+  def change
+    change_table :dorsale_customer_vault_people do |t|
+      t.string :secondary_emails, array: true, default: [], null: false
+    end
+
+    add_index :dorsale_customer_vault_people, :secondary_emails, using: "gin"
+  end
+end

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.9.1"
+  VERSION = "3.9.2"
 end

data/spec/models/dorsale/customer_vault/person_spec.rb

@@ -62,4 +62,51 @@ RSpec.describe ::Dorsale::CustomerVault::Person, type: :model do
       expect(corporation.address).to be_present
     end
   end # describe "address"
+
+  describe "emails" do
+    it "should strip email" do
+      individual = create(:customer_vault_individual, email: " myemail@example.org ")
+      expect(individual.email).to eq "myemail@example.org"
+    end
+
+    it "should create an array of strings without blank characters" do
+      test_individual = create(:customer_vault_individual, email: "primary@example.org")
+      test_individual.secondary_emails_str = " first@example.org \n second@example.org "
+      expect(test_individual.secondary_emails).to eq ["first@example.org", "second@example.org"]
+    end
+
+    it "should return one object in the scope" do
+      individual = create(:customer_vault_individual,
+        :email            => "primary@example.org",
+        :secondary_emails => ["first@example.org"],
+      )
+
+      individual2 = Dorsale::CustomerVault::Person.having_email("primary@example.org")
+      expect(individual2).to eq [individual]
+
+      individual3 = Dorsale::CustomerVault::Person.having_email("first@example.org")
+      expect(individual3).to eq [individual]
+    end
+
+    it "should check whether a new email address already is in the database" do
+      individual = create(:customer_vault_individual,
+        :email            => "primary@example.org",
+        :secondary_emails => ["first@example.org", "second@example.org"],
+      )
+
+      individual2 = create(:customer_vault_individual)
+      individual2.email = "primary@example.org"
+      expect(individual2).to be_invalid
+      expect(individual2.errors).to have_key :email
+      expect(individual2.errors).to_not have_key :secondary_emails
+      expect(individual2.errors).to_not have_key :secondary_emails_str
+
+      individual3 = create(:customer_vault_individual)
+      individual3.secondary_emails << "first@example.org"
+      expect(individual3).to be_invalid
+      expect(individual3.errors).to have_key :secondary_emails
+      expect(individual3.errors).to have_key :secondary_emails_str
+      expect(individual3.errors).to_not have_key :email
+    end
+  end # describe "emails"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.9.1
+  version: 3.9.2
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -734,6 +734,7 @@ files:
 - app/views/dorsale/customer_vault/people/_context_related_people.slim
 - app/views/dorsale/customer_vault/people/_context_social.html.slim
 - app/views/dorsale/customer_vault/people/_data_context.html.slim
+- app/views/dorsale/customer_vault/people/_emails_errors.html.slim
 - app/views/dorsale/customer_vault/people/_filters.html.slim
 - app/views/dorsale/customer_vault/people/_form.html.slim
 - app/views/dorsale/customer_vault/people/_index_actions.html.slim
@@ -858,6 +859,7 @@ files:
 - db/migrate/20171023080507_migrate_people_comments_to_events.rb
 - db/migrate/20171023133219_customer_vault_events_add_contact_type.rb
 - db/migrate/20171024075514_customer_vault_contact_type_default_value.rb
+- db/migrate/20171115171425_dorsale_customer_vault_people_add_secondary_emails.rb
 - features/access.feature
 - features/billing_machine_invoices.feature
 - features/billing_machine_multiple_vat.feature