Client: Seems unnecessary and is getting in the way of things

app/controllers/spaces_controller.rb

@@ -10,7 +10,6 @@ def edit
 
   def create
     skip_policy_scope
-    authorize(Client)
     authorize(Space)
 
     space = Space::Factory.create(space_params)

app/models/blueprint.rb

@@ -4,8 +4,11 @@
 class Blueprint
   attr_accessor :attributes
 
-  def initialize(attributes)
+  attr_writer :space
+
+  def initialize(attributes, space: nil)
     @attributes = attributes
+    self.space = space
   end
 
   def find_or_create!
@@ -68,19 +71,11 @@ def set_members
   end
 
   def space
-    @space ||= attributes[:space] || client.spaces.find_or_create_by!(name: space_attributes[:name])
-  end
-
-  def client
-    @client ||= Client.find_or_create_by!(name: client_attributes[:name])
-  end
-
-  def client_attributes
-    attributes[:client]
+    @space ||= Space.find_or_create_by!(name: space_attributes[:name])
   end
 
   def space_attributes
-    client_attributes[:space]
+    attributes
   end
 
   # Normally, merge will clobber keys with values if there is a key with a nil

app/models/space.rb

@@ -6,11 +6,6 @@ class Space < ApplicationRecord
   include WithinLocation
   THEME_OPTIONS = %w[purple_mountains desert_dunes].freeze
 
-  # Which client owns the space
-  belongs_to :client
-
-  accepts_nested_attributes_for :client
-
   # The fully-qualified domain to enter the space.
   # Spaces without a branded_domain are still accessible via their slug.
   # The branded_domain must be unique to ensure we don't accidentally place

app/models/space/factory.rb

@@ -8,8 +8,7 @@ def self.create(space_attributes)
 
     if blueprint_name.present?
       Blueprint.new(
-        client: {name: space.client.name,
-                 space: Blueprint::BLUEPRINTS[blueprint_name]},
+        Blueprint::BLUEPRINTS[blueprint_name],
         space: space
       ).find_or_create!
     end

app/models/system_test_space.rb

@@ -12,16 +12,12 @@ def self.prepare
 
     Space.find_by(name: "System Test")&.destroy
 
-    Blueprint.new(client: {name: "System Test",
-                           space: DEFAULT_SPACE_CONFIG.merge(
-                             name: "System Test Branded Domain",
-                             branded_domain: "system-test.zinc.local"
-                           )}).find_or_create!
+    Blueprint.new(DEFAULT_SPACE_CONFIG.merge(
+      name: "System Test Branded Domain",
+      branded_domain: "system-test.zinc.local"
+    )).find_or_create!
 
-    Blueprint.new(client: {name: "System Test",
-                           space: DEFAULT_SPACE_CONFIG
-                              .merge(name: "System Test")})
-      .find_or_create!
+    Blueprint.new(DEFAULT_SPACE_CONFIG.merge(name: "System Test")).find_or_create!
   end
 
   DEFAULT_SPACE_CONFIG = Blueprint::BLUEPRINTS[:system_test]

app/policies/person_policy.rb

@@ -14,7 +14,7 @@ def show?
   alias_method :create?, :show?
 
   def permitted_attributes(_params)
-    [:name, :slug, :theme, :blueprint, client_attributes: [:name]]
+    [:name, :slug, :theme, :blueprint]
   end
 
   class Scope < ApplicationScope

app/policies/space_policy.rb

@@ -23,7 +23,7 @@ def destroy?
   alias_method :create?, :destroy?
 
   def permitted_attributes(_params)
-    [:name, :slug, :theme, :entrance_id, :blueprint, client_attributes: [:name]]
+    [:name, :slug, :theme, :entrance_id, :blueprint]
   end
 
   class Scope < ApplicationScope

db/migrate/20230302024315_drop_client.rb

@@ -0,0 +1,5 @@
+class DropClient < ActiveRecord::Migration[7.0]
+  def change
+    drop_table :clients
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_02_27_232512) do
+ActiveRecord::Schema[7.0].define(version: 2023_03_02_024315) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -72,13 +72,6 @@
     t.index ["person_id"], name: "index_authentication_methods_on_person_id"
   end
 
-  create_table "clients", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.string "name"
-    t.string "slug"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
   create_table "friendly_id_slugs", force: :cascade do |t|
     t.string "slug", null: false
     t.integer "sluggable_id", null: false

features/lib/Space.js

@@ -9,8 +9,7 @@ class Space {
       space: {
         name: this.name,
         slug: this.slug,
-        blueprint: "system_test",
-        clientAttributes: { name: this.name },
+        blueprint: "system_test"
       },
     };
   }

spec/factories/space.rb

@@ -2,17 +2,12 @@
 
 FactoryBot.define do
   factory :space do
-    client
     sequence(:name) { |n| "#{Faker::Book.title} #{n}" }
 
     trait :default do
       slug { Neighborhood.config.default_space_slug }
     end
 
-    trait :with_client_attributes do
-      client_attributes { attributes_for(:client) }
-    end
-
     trait :with_members do
       transient do
         member_count { 4 }

spec/models/blueprint_spec.rb

@@ -4,22 +4,17 @@
 
 RSpec.describe Blueprint do
   EXAMPLE_CONFIG = {
-    client: {
-      name: "Client A",
-      space: {
-        name: "Client A's Space",
-        members: [{email: "client-a@example.com"}],
-        rooms: [{
-          name: "Room A",
-          access_level: :unlocked,
-          publicity_level: :listed,
-          furniture_placements: {
-            markdown_text_block: {content: "Obi Swan Kenobi"}
-          }
-        }],
-        utility_hookups: []
+    name: "Client A's Space",
+    members: [{email: "client-a@example.com"}],
+    rooms: [{
+      name: "Room A",
+      access_level: :unlocked,
+      publicity_level: :listed,
+      furniture_placements: {
+        markdown_text_block: {content: "Obi Swan Kenobi"}
       }
-    }
+    }],
+    utility_hookups: []
   }.freeze
   describe "#find_or_create" do
     it "respects the Space's current settings" do
@@ -41,7 +36,7 @@
     it "Updates a given space" do
       space = create(:space)
 
-      Blueprint.new(EXAMPLE_CONFIG.merge(space: space)).find_or_create!
+      Blueprint.new(EXAMPLE_CONFIG, space: space).find_or_create!
 
       expect(space.rooms.count).to be(1)
     end

spec/models/room_spec.rb

@@ -5,9 +5,8 @@
 
   describe ".slug" do
     it "creates unique slugs by space scope" do
-      client = Client.create(name: "test")
-      space_1 = client.spaces.create(name: "space1")
-      space_2 = client.spaces.create(name: "space2")
+      space_1 = Space.create(name: "space1")
+      space_2 = Space.create(name: "space2")
       space_1_room = space_1.rooms.create(name: "room1", publicity_level: :listed)
       space_2_room = space_2.rooms.create(name: "room1", publicity_level: :listed)
 
@@ -18,8 +17,7 @@
 
   describe ".listed" do
     it "does not include rooms whose publicity level is unlisted" do
-      client = Client.create(name: "test")
-      space = client.spaces.create(name: "space")
+      space = Space.create(name: "space")
       listed_room = space.rooms.create(publicity_level: :listed, name: "Listed Room")
       unlisted_room = space.rooms.create(publicity_level: :unlisted, name: "Unlisted Room")
 

spec/models/space/factory_spec.rb

@@ -5,8 +5,8 @@
 RSpec.describe Space::Factory do
   describe ".create" do
     it "creates a Space from the given attributes" do
-      attributes = attributes_for(:space, :with_client_attributes)
-      space = Space::Factory.create(attributes)
+      attributes = attributes_for(:space)
+      space = described_class.create(attributes)
 
       expect(space).to be_persisted
       expect(space.name).to eq(attributes[:name])
@@ -17,15 +17,15 @@
     it "upserts if a Space has the provided name already" do
       existing_space = create(:space)
 
-      attributes = attributes_for(:space, :with_client_attributes,
+      attributes = attributes_for(:space,
         name: existing_space.name)
-      space = Space::Factory.create(attributes)
+      space = described_class.create(attributes)
 
       expect(space).to eql(existing_space)
     end
 
     it "applies the blueprint if it's provided" do
-      space = Space::Factory.create(attributes_for(:space, :with_client_attributes,
+      space = described_class.create(attributes_for(:space,
         blueprint: :system_test))
 
       expect(space.rooms).to be_present

spec/requests/spaces_controller_request_spec.rb

@@ -45,7 +45,7 @@
       let(:Authorization) { encode_authorization_token(api_key) }
       let(:body) { {space: attributes} }
       response "201", "space created" do
-        let(:attributes) { attributes_for(:space, :with_client_attributes) }
+        let(:attributes) { attributes_for(:space) }
         run_test! do |_response|
           space = Space.find_by(name: attributes[:name])
           expect(space.rooms).to be_empty
@@ -55,7 +55,7 @@
       end
 
       context "with a blueprint" do
-        let(:attributes) { attributes_for(:space, :with_client_attributes, blueprint: :system_test) }
+        let(:attributes) { attributes_for(:space, blueprint: :system_test) }
 
         response "201", "space created from the blueprint" do
           run_test! do |_response|