Also provide the ability to extract the tenant id from the prefix

lib/apartmentex/prefix_builder.ex

@@ -12,4 +12,8 @@ defmodule Apartmentex.PrefixBuilder do
   def build_prefix(tenant) do
     @schema_prefix <> Integer.to_string(tenant.id)
   end
+
+  def extract_tenant(table_prefix) do
+    String.replace_prefix(table_prefix, @schema_prefix, "")
+  end
 end

test/apartmentex_test.exs

@@ -165,7 +165,7 @@ defmodule Apartmentex.ApartmentexTest do
     prefix = %Note{}
     |> set_tenant(@tenant_id)
     |> Ecto.get_meta(:prefix)
-    assert prefix == "tenant_2"
+    assert prefix == "tenant_#{@tenant_id}"
   end
 
   test ".set_tenant/2 changeset adds the tenant prefix" do
@@ -174,7 +174,7 @@ defmodule Apartmentex.ApartmentexTest do
     |> Map.fetch!(:data)
     |> Ecto.get_meta(:prefix)
 
-    assert prefix == "tenant_2"
+    assert prefix == "tenant_#{@tenant_id}"
   end
 
   test ".set_tenant/2 queryable adds the tenant prefix" do
@@ -184,4 +184,9 @@ defmodule Apartmentex.ApartmentexTest do
 
     assert prefix == "tenant_#{@tenant_id}"
   end
+
+  test ".extract_tenant/1 removes the prefix from the schema" do
+    assert Apartmentex.PrefixBuilder.extract_tenant("tenant_#{@tenant_id}") == "#{@tenant_id}"
+    assert Apartmentex.PrefixBuilder.extract_tenant("tenant_somestring") == "somestring"
+  end
 end

test/lib/apartmentex/repo_test.exs

@@ -8,27 +8,13 @@ end
 
 defmodule Apartmentex.ApartmentexTest do
   use ExUnit.Case
-  import Apartmentex.PrefixBuilder
+  import Apartmentex.RepoAdditions
   alias Apartmentex.{Note,TenantMissingError}
   alias Apartmentex.Test.{TenantedRepo,UntenantedRepo}
 
   @tenant_id 2
   @error_message "No tenant specified in Elixir.Apartmentex.Note"
 
-  def set_tenant(%Ecto.Changeset{} = changeset, tenant) do
-    %{changeset | data: set_tenant(changeset.data, tenant)}
-  end
-
-  def set_tenant(%{__meta__: _} = model, tenant) do
-    Ecto.put_meta(model,  prefix: build_prefix(tenant))
-  end
-
-  def set_tenant(queryable, tenant) do
-    queryable
-    |> Ecto.Queryable.to_query
-    |> Map.put(:prefix, build_prefix(tenant))
-  end
-
   def scoped_note_query do
     Note
     |> Ecto.Queryable.to_query