feat: add banned_until

Author: mentels

lib/supavisor/tenants/tenant.ex

@@ -37,6 +37,7 @@ defmodule Supavisor.Tenants.Tenant do
     field(:jit_api_url, :string)
     field(:banned_at, :utc_datetime)
     field(:ban_reason, :string)
+    field(:banned_until, :utc_datetime)
 
     has_many(:users, User,
       foreign_key: :tenant_external_id,
@@ -137,12 +138,12 @@ defmodule Supavisor.Tenants.Tenant do
   @doc false
   def ban_changeset(tenant, %{"banned" => "true"} = params) do
     tenant
-    |> cast(params, [:ban_reason])
+    |> cast(params, [:ban_reason, :banned_until])
     |> validate_required([:ban_reason])
     |> put_change(:banned_at, DateTime.utc_now() |> DateTime.truncate(:second))
   end
 
   def unban_changeset(tenant, %{"banned" => "false"}) do
-    change(tenant, banned_at: nil, ban_reason: nil)
+    change(tenant, banned_at: nil, ban_reason: nil, banned_until: nil)
   end
 end

lib/supavisor_web/open_api_schemas.ex

@@ -86,6 +86,12 @@ defmodule SupavisorWeb.OpenApiSchemas do
           nullable: true
         },
         ban_reason: %Schema{type: :string, description: "Reason for ban", nullable: true},
+        banned_until: %Schema{
+          type: :string,
+          format: :date_time,
+          description: "Ban expiry timestamp",
+          nullable: true
+        },
         inserted_at: %Schema{type: :string, format: :date_time, readOnly: true},
         updated_at: %Schema{type: :string, format: :date_time, readOnly: true}
       },
@@ -106,6 +112,7 @@ defmodule SupavisorWeb.OpenApiSchemas do
         allow_list: ["0.0.0.0/0", "::/0"],
         banned_at: "2026-01-01T00:00:00Z",
         ban_reason: "abuse",
+        banned_until: "2926-04-01T00:00:00Z",
         users: [
           %{
             id: "b1024a4c-4eb4-4c64-8f49-c8a46c2b2e16",
@@ -394,10 +401,19 @@ defmodule SupavisorWeb.OpenApiSchemas do
         ban_reason: %Schema{
           type: :string,
           description: "Reason for the ban (required when banned is true)"
+        },
+        banned_until: %Schema{
+          type: :string,
+          format: :date_time,
+          description: "Optional ban expiry timestamp"
         }
       },
       required: [:banned],
-      example: %{banned: true, ban_reason: "Acceptable use policy violation"}
+      example: %{
+        banned: true,
+        ban_reason: "Acceptable use policy violation",
+        banned_until: "2026-01-01T00:00:00Z"
+      }
     })
 
     def params, do: {"ToggleTenant Ban Params", "application/json", __MODULE__}

priv/repo/migrations/20260323000000_add_tenant_ban_fields.exs

@@ -5,6 +5,7 @@ defmodule Supavisor.Repo.Migrations.AddTenantBanFields do
     alter table(:tenants, prefix: "_supavisor") do
       add(:banned_at, :utc_datetime, null: true)
       add(:ban_reason, :string, null: true)
+      add(:banned_until, :utc_datetime, null: true)
     end
   end
 end

test/supavisor_web/controllers/tenant_controller_test.exs

@@ -598,7 +598,8 @@ defmodule SupavisorWeb.TenantControllerTest do
                data: %{
                  external_id: ^external_id,
                  banned_at: banned_at,
-                 ban_reason: "abuse"
+                 ban_reason: "abuse",
+                 banned_until: nil
                }
              } =
                conn
@@ -666,14 +667,70 @@ defmodule SupavisorWeb.TenantControllerTest do
 
       # Then unban
       assert %{
-               data: %{external_id: ^external_id, banned_at: nil, ban_reason: nil}
+               data: %{
+                 external_id: ^external_id,
+                 banned_at: nil,
+                 ban_reason: nil,
+                 banned_until: nil
+               }
              } =
                conn
                |> patch(~p"/api/tenants/#{external_id}", %{banned: "false"})
                |> json_response(200)
                |> assert_schema("TenantData")
     end
 
+    test "banning with banned_until persists the value", %{
+      conn: conn,
+      tenant: %Tenant{external_id: external_id}
+    } do
+      banned_until = "2099-12-31T00:00:00Z"
+
+      assert %{data: %{banned_until: ^banned_until}} =
+               conn
+               |> patch(~p"/api/tenants/#{external_id}", %{
+                 banned: "true",
+                 ban_reason: "abuse",
+                 banned_until: banned_until
+               })
+               |> json_response(200)
+               |> assert_schema("TenantData")
+    end
+
+    test "unbanning clears banned_until", %{
+      conn: conn,
+      tenant: %Tenant{external_id: external_id}
+    } do
+      conn
+      |> patch(~p"/api/tenants/#{external_id}", %{
+        banned: "true",
+        ban_reason: "abuse",
+        banned_until: "2099-12-31T00:00:00Z"
+      })
+      |> json_response(200)
+
+      assert %{data: %{banned_until: nil}} =
+               conn
+               |> patch(~p"/api/tenants/#{external_id}", %{banned: "false"})
+               |> json_response(200)
+               |> assert_schema("TenantData")
+    end
+
+    test "returns 422 when banned_until is not a valid datetime", %{
+      conn: conn,
+      tenant: %Tenant{external_id: external_id}
+    } do
+      assert %{"errors" => _} =
+               conn
+               |> patch(~p"/api/tenants/#{external_id}", %{
+                 banned: "true",
+                 ban_reason: "abuse",
+                 banned_until: "not-a-date"
+               })
+               |> json_response(422)
+               |> assert_schema("UnprocessablyEntity")
+    end
+
     test "includes banned_at and ban_reason in GET response after ban", %{
       conn: conn,
       tenant: %Tenant{external_id: external_id}