fix search and insured override

lib/policy_service/aggregates/life_policy_application.ex

@@ -33,5 +33,11 @@ defmodule PolicyService.Aggregates.LifePolicyApplication do
   def validate_details(_), do: {:error, :invalid_life_details}
 
   def validate_insured(%{"type" => "corporate"}), do: {:error, :life_insurance_requires_individual}
-  def validate_insured(insured), do: super(insured)
+
+  def validate_insured(%{"type" => "individual", "gender" => gender} = insured)
+      when is_binary(gender) and byte_size(gender) > 0 do
+    super(insured)
+  end
+
+  def validate_insured(%{"type" => "individual"}), do: {:error, :missing_gender}
 end

lib/policy_service/aggregates/policy_application.ex

@@ -58,8 +58,7 @@ defmodule PolicyService.Aggregates.PolicyApplication do
       @impl Commanded.Aggregates.Aggregate
       def execute(%__MODULE__{state: nil}, %SubmitPolicyApplication{} = cmd) do
         with :ok <- PolicyService.Aggregates.PolicyApplication.validate_policy_id(cmd.id),
-             :ok <-
+             :ok <- validate_insured(cmd.insured),
-               PolicyService.Aggregates.PolicyApplication.validate_insured(cmd.insured),
              :ok <-
                PolicyService.Aggregates.PolicyApplication.validate_buyer(cmd.buyer),
              :ok <- validate_details(cmd.policy_details),
@@ -242,16 +241,7 @@ defmodule PolicyService.Aggregates.PolicyApplication do
         }
       end
 
-      # allow each aggregate to override any callback
+      # ── Validation ───────────────────────────────────────────────────
-      defoverridable execute: 2, apply: 2
-    end
-  end
-
-  def validate_policy_id(%PolicyService.Aggregates.PolicyId{policy_type: _}), do: :ok
-  def validate_policy_id(_), do: {:error, :invalid_policy_id_format}
-
-  def validate_user(id) when is_binary(id) and byte_size(id) > 0, do: :ok
-  def validate_user(_), do: {:error, :missing_user_id}
 
       def validate_insured(%{
             "type" => "individual",
@@ -275,6 +265,17 @@ defmodule PolicyService.Aggregates.PolicyApplication do
 
       def validate_insured(_), do: {:error, :invalid_insured_info}
 
+      # allow each aggregate to override any callback
+      defoverridable execute: 2, apply: 2, validate_insured: 1
+    end
+  end
+
+  def validate_policy_id(%PolicyService.Aggregates.PolicyId{policy_type: _}), do: :ok
+  def validate_policy_id(_), do: {:error, :invalid_policy_id_format}
+
+  def validate_user(id) when is_binary(id) and byte_size(id) > 0, do: :ok
+  def validate_user(_), do: {:error, :missing_user_id}
+
   def validate_buyer(%{
         "type" => "individual",
         "name" => n,

lib/policy_service/projections/policy.ex

@@ -35,7 +35,7 @@ defmodule PolicyService.Projections.PolicyApplication do
     max_limit: 100,
     custom_fields: [
       search: [
-        filter: {PolicyService.Projections.PolicyApplicationFilters, :search, []},
+        filter: {PolicyService.Filters.PolicyApplicationFilters, :search, []},
         ecto_type: :string,
         operators: [:==]
       ]