partition by org_id and add auth
All checks were successful
Build and Publish / build-release (push) Successful in 3m7s

This commit is contained in:
2026-05-15 10:08:54 -05:00
parent a0b5e0c0b3
commit 4519f797fd
26 changed files with 687 additions and 112 deletions

View File

@@ -6,6 +6,7 @@ defmodule CustomerServiceWeb.LeadController do
alias CustomerService.Lead.Queries, as: LeadQueries
alias CustomerServiceWeb.Schemas.Lead, as: LeadSchemas
alias CustomerServiceWeb.QueryHelpers
alias CustomerService.Aggregates.LeadId
operation(:index,
summary: "List leads",
@@ -23,7 +24,9 @@ defmodule CustomerServiceWeb.LeadController do
)
def index(conn, params) do
case LeadQueries.list_leads(params) do
org_id = conn.private[CustomerServiceWeb.Plugs.ExtractOrganizationId]
case LeadQueries.list_by_org(org_id, params) do
{:ok, {leads, meta}} ->
conn
|> put_status(:ok)
@@ -58,12 +61,17 @@ defmodule CustomerServiceWeb.LeadController do
)
def show(conn, %{"id" => id}) do
case LeadQueries.get_lead(id) do
{:ok, lead} ->
conn |> put_status(:ok) |> json(%{data: lead_json(lead)})
org_id = conn.private[CustomerServiceWeb.Plugs.ExtractOrganizationId]
with {:ok, %LeadId{lead_id: local_id}} <- LeadId.parse(id),
{:ok, lead} <- LeadQueries.get_by_org(org_id, local_id) do
conn |> put_status(:ok) |> json(%{data: lead_json(lead)})
else
{:error, :not_found} ->
conn |> put_status(:not_found) |> json(%{error: "not found"})
:error ->
conn |> put_status(:bad_request) |> json(%{error: "invalid lead id"})
end
end
@@ -76,7 +84,9 @@ defmodule CustomerServiceWeb.LeadController do
)
def create(conn, params) do
lead_id = Ecto.UUID.generate()
org_id = conn.private[CustomerServiceWeb.Plugs.ExtractOrganizationId]
lead_uuid = Ecto.UUID.generate()
lead_id = LeadId.new(org_id, lead_uuid)
command = %CreateQuickLead{
id: lead_id,
@@ -108,19 +118,30 @@ defmodule CustomerServiceWeb.LeadController do
)
def update(conn, %{"id" => id} = params) do
command = %UpdateQuickLead{
id: id,
name: params["name"],
email: params["email"],
phone: params["phone"],
company_name: params["company_name"],
notes: params["notes"],
assigned_to: params["assigned_to"],
estimated_value: parse_decimal(params["estimated_value"]),
expected_close_date: parse_date(params["expected_close_date"])
}
org_id = conn.private[CustomerServiceWeb.Plugs.ExtractOrganizationId]
dispatch_and_return(conn, command, id)
with {:ok, %LeadId{lead_id: local_id}} <- LeadId.parse(id),
{:ok, _lead} <- LeadQueries.get_by_org(org_id, local_id) do
command = %UpdateQuickLead{
id: LeadId.new(org_id, local_id),
name: params["name"],
email: params["email"],
phone: params["phone"],
company_name: params["company_name"],
notes: params["notes"],
assigned_to: params["assigned_to"],
estimated_value: parse_decimal(params["estimated_value"]),
expected_close_date: parse_date(params["expected_close_date"])
}
dispatch_and_return(conn, command, LeadId.new(org_id, local_id))
else
{:error, :not_found} ->
conn |> put_status(:not_found) |> json(%{error: "not found"})
:error ->
conn |> put_status(:bad_request) |> json(%{error: "invalid lead id"})
end
end
operation(:update_status,
@@ -136,18 +157,47 @@ defmodule CustomerServiceWeb.LeadController do
)
def update_status(conn, %{"id" => id} = params) do
command = %UpdateLeadStatus{
id: id,
status: String.to_existing_atom(params["status"])
}
org_id = conn.private[CustomerServiceWeb.Plugs.ExtractOrganizationId]
dispatch_and_return(conn, command, id)
with {:ok, %LeadId{lead_id: local_id}} <- LeadId.parse(id),
{:ok, _lead} <- LeadQueries.get_by_org(org_id, local_id) do
command = %UpdateLeadStatus{
id: LeadId.new(org_id, local_id),
status: String.to_existing_atom(params["status"])
}
dispatch_and_return(conn, command, LeadId.new(org_id, local_id))
else
{:error, :not_found} ->
conn |> put_status(:not_found) |> json(%{error: "not found"})
:error ->
conn |> put_status(:bad_request) |> json(%{error: "invalid lead id"})
end
end
defp dispatch_and_return(conn, command, lead_id) do
defp dispatch_and_return(conn, command, %LeadId{} = lead_id) do
case CustomerService.CommandedApp.dispatch(command, consistency: :strong) do
:ok ->
case LeadQueries.get_lead(lead_id) do
case LeadQueries.get_lead(LeadId.to_string(lead_id)) do
{:ok, lead} ->
conn |> put_status(:ok) |> json(%{data: lead_json(lead)})
{:error, :not_found} ->
conn
|> put_status(:internal_server_error)
|> json(%{error: "lead created but not found in projection"})
end
{:error, reason} ->
conn |> put_status(:unprocessable_entity) |> json(%{error: inspect(reason)})
end
end
defp dispatch_and_return(conn, command, lead_id_string) when is_binary(lead_id_string) do
case CustomerService.CommandedApp.dispatch(command, consistency: :strong) do
:ok ->
case LeadQueries.get_lead(lead_id_string) do
{:ok, lead} ->
conn |> put_status(:ok) |> json(%{data: lead_json(lead)})