Add domain name support

app/models/application_record.rb

@@ -5,12 +5,4 @@ class ApplicationRecord < ActiveRecord::Base
   self.implicit_order_column = :created_at
 
   alias_attribute :_id, :id
-
-  def all_tags=(names)
-    tag_set = []
-    names.map do |name|
-      tag_set << Tag.where(name: name.strip).first_or_create!
-    end
-    self.tags = tag_set
-  end
 end

app/models/concerns/searchable_concern.rb

@@ -62,14 +62,6 @@ def self.other_attributes(attributes = [])
       end
     end
 
-    def self.other_attributes(attributes = [])
-      singleton_class.instance_eval do
-        define_method(:other_search_fields) do
-          attributes
-        end
-      end
-    end
-
     # Add default accessors
     SEARCHABLE_FIELD_GROUPS.each do |field_group|
       next if respond_to? field_group

app/models/domain_name.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class DomainName < ActiveRecord::Base
+  has_many :domain_registrations, dependent: :destroy
+  has_many :organizations, through: :domain_registrations
+end

app/models/domain_registration.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class DomainRegistration < ActiveRecord::Base
+  belongs_to :domain_name
+  belongs_to :organization
+end

app/models/organization.rb

@@ -4,7 +4,7 @@ class Organization < ApplicationRecord
   include SearchableConcern
   boolean_attributes [:shared_tickets]
   fulltext_attributes %i[url external_id name details]
-  join_attributes %i[tags]
+  join_attributes %i[domain_names tags]
 
   include UuidConcern
   uuid_attributes [:external_id]
@@ -15,9 +15,9 @@ class Organization < ApplicationRecord
   has_many :taggings, as: :taggable, dependent: :destroy
   has_many :tags, through: :taggings
 
+  has_many :domain_registrations, dependent: :destroy
+  has_many :domain_names, through: :domain_registrations
+
   # Disable single-table inheritance
   self.inheritance_column = :ignore_the_type_column
-
-  def domain_names=(_placeholder)
-  end
 end

app/models/tagging.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-
 class Tagging < ActiveRecord::Base
   belongs_to :tag
   belongs_to :taggable, polymorphic: true

db/migrate/20200215114849_create_organizations_tickets_and_users.rb

@@ -22,9 +22,9 @@ def up
       t.text :description
       t.integer :priority, limit: 2, null: false, default: 3
       t.integer :status, limit: 2, null: false, default: 1
-      t.references :submitter, foreign_key: { to_table: :users }, null: false
-      t.references :assignee, foreign_key: { to_table: :users }
-      t.references :organization, foreign_key: true
+      t.references :submitter, foreign_key: false, null: false
+      t.references :assignee, foreign_key: false
+      t.references :organization, foreign_key: false
       t.boolean :has_incidents, null: false, default: false
       t.datetime :due_at
       t.integer :via, limit: 2, null: false, default: 1

db/migrate/20200217224235_create_domain_names_and_domain_registrations.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class CreateDomainNamesAndDomainRegistrations < ActiveRecord::Migration[6.0]
+  def change
+    create_table :domain_names do |t|
+      t.string :name, null: false
+      t.timestamps null: false
+    end
+
+    create_table :domain_registrations do |t|
+      t.references :domain_name, foreign_key: true
+      t.references :organization, foreign_key: true
+      t.timestamps null: false
+    end
+  end
+end

db/schema.rb

@@ -10,7 +10,22 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_02_17_014028) do
+ActiveRecord::Schema.define(version: 2020_02_17_224235) do
+
+  create_table "domain_names", force: :cascade do |t|
+    t.string "name", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
+  create_table "domain_registrations", force: :cascade do |t|
+    t.integer "domain_name_id"
+    t.integer "organization_id"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["domain_name_id"], name: "index_domain_registrations_on_domain_name_id"
+    t.index ["organization_id"], name: "index_domain_registrations_on_organization_id"
+  end
 
   create_table "organizations", force: :cascade do |t|
     t.string "url"
@@ -83,9 +98,8 @@
     t.index ["organization_id"], name: "index_users_on_organization_id"
   end
 
+  add_foreign_key "domain_registrations", "domain_names"
+  add_foreign_key "domain_registrations", "organizations"
   add_foreign_key "taggings", "tags"
-  add_foreign_key "tickets", "organizations"
-  add_foreign_key "tickets", "users", column: "assignee_id"
-  add_foreign_key "tickets", "users", column: "submitter_id"
   add_foreign_key "users", "organizations"
 end

db/seeds.rb

@@ -2,6 +2,14 @@
 
 IMPORT_ENTITIES = [Organization, User, Ticket].freeze
 
+def names_to_models(entity, array)
+  models = []
+  array.map do |name|
+    models << entity.where(name: name.strip).first_or_create!
+  end
+   models
+end
+
 IMPORT_ENTITIES.each do |entity|
 
   if entity.count == 0
@@ -10,8 +18,14 @@
     records = JSON.parse(File.read(path))
 
     records.each do |record|
-      record[:all_tags] = record.delete('tags')
-      entity.create!(record)
+      tags = record.delete('tags')
+      domain_names = record.delete('domain_names')
+
+      record[:tags] = names_to_models(Tag, tags) if tags.present?
+      record[:domain_names] = names_to_models(DomainName, domain_names) if domain_names.present?
+
+      model = entity.new(record)
+      model.save!(validate: false)
       print '.'
     end
 

db/seeds/tickets.json

@@ -1765,7 +1765,7 @@
     "description": "Duis mollit Lorem amet anim ea consequat ullamco. Eiusmod tempor incididunt adipisicing in mollit ut officia eu sint sit amet aute.",
     "priority": "normal",
     "status": "closed",
-    "submitter_id": 55,
+    "submitter_id": 555,
     "assignee_id": 17,
     "organization_id": 114,
     "tags": [
@@ -1927,7 +1927,7 @@
     "status": "closed",
     "submitter_id": 20,
     "assignee_id": 33,
-    "organization_id": 101,
+    "organization_id": 555,
     "tags": [
       "South Dakota",
       "Montana",
@@ -4387,7 +4387,7 @@
     "priority": "urgent",
     "status": "open",
     "submitter_id": 13,
-    "assignee_id": 55,
+    "assignee_id": 555,
     "organization_id": 108,
     "tags": [
       "Minnesota",

test/services/search_entities/organization_test.rb

@@ -96,4 +96,14 @@ def do_setup
 
     assert_includes search.results, tag_org, 'Should find organizations by tag'
   end
+
+  test 'finds_by_domains' do
+    domain_name = 'brawndo.com'
+    domain_org = create_organization!
+    domain_org.domain_names << DomainName.where(name: domain_name).first_or_create!
+    search_params = { domain_names: domain_name }
+    search = SearchEntities.call(Organization, search_params)
+
+    assert_includes search.results, domain_org, 'Should find organizations by tag'
+  end
 end

test/services/search_entities/user_test.rb

@@ -66,6 +66,16 @@ def do_setup
     )
   end
 
+  test 'does_not_find_empty_text_when_unset' do
+    blank_user = create_user!(signature: '')
+    nil_user = create_user!(signature: nil)
+    search_params = {}
+    search = SearchEntities.call(User, search_params)
+
+    refute_includes search.results, blank_user, 'Should not find users by empty text when text is not a parameter'
+    refute_includes search.results, nil_user, 'Should not find users by nil text when text is not a parameter'
+  end
+
   test 'finds_by_boolean_fields' do
     search_params = { active: 'false' }
     search = SearchEntities.call(User, search_params)
@@ -79,12 +89,25 @@ def do_setup
     )
   end
 
+  test 'finds_by_other_fields' do
+    danish_user = create_user!(locale: 'da-DK')
+    search_params = { locale: 'da-DK' }
+    search = SearchEntities.call(User, search_params)
+
+    assert_includes search.results, danish_user, 'Should find users by other value'
+
+    assert(
+      [@url_user, @external_id_user, @name_user, @signature_user].all? do |org|
+        search.results.exclude? org
+      end, 'Should not find users without matching other values'
+    )
+  end
+
   test 'finds_by_combined_fields' do
     search_params = { text: 'sit', active: 'false' }
     search = SearchEntities.call(User, search_params)
 
     assert_includes search.results, @name_user, 'Should find users by text in shared context'
     assert_includes search.results, @inactive_user, 'Should find users by boolean in shared context'
   end
-
 end