Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Created Algorithm for Potential Partners in Beta Register Page #1177

Merged
merged 2 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions config/config.exs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,27 @@ config :animina, :ai_message_help_price, 20
# Configures whether to have ai automatically respond to messages
config :animina, :autoreply_messages_with_ai, false

# Configures default maximum age for potential partners
config :animina, :default_potential_partner_maximum_age, 100

# Configures default minimum age for potential partners
config :animina, :default_potential_partner_minimum_age, 18

# confugures the difference in age if no maximum or minimum age is set
config :animina, :default_potential_partner_age_difference, 10
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this mean? If I am 50 years old will that mean that the range is from 40 - 60 or is it from 45 - 55? Either improve the actual code or add a better comment to it.

Copy link
Collaborator Author

@MICHAELMUNAVU83 MICHAELMUNAVU83 Dec 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It means range is from 40 and 60 , Kindly advise on the best naming to have in this case @wintermeyer

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's call it default_partner_height_offset

Not perfect but good for now.


# Configures the maximum height for potential partners
config :animina, :default_potential_partner_maximum_height, 300
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

300 as a default doesn't make any sense. Make it 120 please.

PS: There will come the day when I get an email from a user who has a height of 121 cm. I am so sure! ;-)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case we want a value so huge that will make sure we do not leave out any users , we also use this value as the default maximum height in the query , this allows us to select all users below 300 cm , I think it would be best to have a very high value for this case , thoughts? @wintermeyer

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A quick google research let to the number 251. That seems to be the height human right now. Let's go with 225 cm since the heightest German right now seems to be 224.


# Configures the minimum height for potential partners
config :animina, :default_potential_partner_minimum_height, 0
wintermeyer marked this conversation as resolved.
Show resolved Hide resolved

# Configures the maximum height difference for potential partners
config :animina, :default_potential_partner_height_difference, 10

# Configures the default search range for potential partners
config :animina, :default_potential_partner_search_range, 10_000
wintermeyer marked this conversation as resolved.
Show resolved Hide resolved

config :animina,
ecto_repos: [Animina.Repo],
generators: [timestamp_type: :utc_datetime]
Expand Down
32 changes: 18 additions & 14 deletions lib/animina_web/components/beta_registration_components.ex
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ defmodule AniminaWeb.BetaRegistrationComponents do

<h2 class="text-2xl mt-3 font-semibold dark:text-white">
<%= with_locale(@language, fn -> %>
<%= gettext("Current Potential Partners:") %> 123
<%= gettext("Current Potential Partners:") %> <%= @number_of_potential_partners %>
<% end) %>
</h2>

Expand All @@ -37,7 +37,7 @@ defmodule AniminaWeb.BetaRegistrationComponents do
id="beta_user_registration_form"
for={@form}
class="space-y-6 mt-6 group "
phx-change="validate"
phx-change="validate_and_filter_potential_partners"
phx-submit="submit"
>
<h2 class="text-2xl mt-3 font-semibold dark:text-white">
Expand Down Expand Up @@ -209,7 +209,7 @@ defmodule AniminaWeb.BetaRegistrationComponents do
</span>
</label>
<div phx-feedback-for={@f[:height].name} class="mt-2 w-[100%]">
<%= text_input(@f, :height,
<%= number_input(@f, :height,
class:
"block w-full rounded-md border-0 py-1.5 text-gray-900 dark:bg-gray-700 dark:text-white shadow-sm ring-1 ring-inset placeholder:text-gray-400 focus:ring-2 focus:ring-inset sm:text-sm phx-no-feedback:ring-gray-300 phx-no-feedback:focus:ring-indigo-600 sm:leading-6 " <>
unless(get_field_errors(@f[:height], :height) == [],
Expand Down Expand Up @@ -319,28 +319,32 @@ defmodule AniminaWeb.BetaRegistrationComponents do
~H"""
<div>
<label
for="form_minimum_partner_age"
for="form_minimum_partner_height"
class="block text-sm font-medium leading-6 text-gray-900 dark:text-white"
>
<%= with_locale(@language, fn -> %>
<%= gettext("Minimum age") %>
<%= gettext("Minimum height") %>
<% end) %>
</label>
<div phx-feedback-for={@f[:minimum_partner_age].name} class="mt-2">
<%= select(@f, :minimum_partner_age, Enum.map(18..110, &{&1, &1}),
prompt: with_locale(@language, fn -> gettext("doesn't matter") end),
value: @f[:minimum_partner_age].value,
<div phx-feedback-for={@f[:minimum_partner_height].name} class="mt-2">
<%= select(
@f,
:minimum_partner_height,
[{with_locale(@language, fn -> gettext("doesn't matter") end), nil}] ++
Enum.map(140..210, &{"#{&1} cm", &1}),
class:
"block w-full rounded-md border-0 py-1.5 text-gray-900 dark:bg-gray-700 dark:text-white shadow-sm ring-1 ring-inset focus:ring-2 focus:ring-inset phx-no-feedback:ring-gray-300 phx-no-feedback:focus:ring-indigo-600 sm:text-sm sm:leading-6 " <>
unless(get_field_errors(@f[:minimum_partner_age], :minimum_partner_age) == [],
"block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset focus:ring-2 dark:bg-gray-700 dark:text-white focus:ring-inset phx-no-feedback:ring-gray-300 phx-no-feedback:focus:ring-indigo-600 sm:text-sm sm:leading-6 " <>
unless(
get_field_errors(@f[:minimum_partner_height], :minimum_partner_height) == [],
do: "ring-red-600 focus:ring-red-600",
else: "ring-gray-300 focus:ring-indigo-600"
)
),
autofocus: true
) %>

<.error :for={msg <- get_field_errors(@f[:minimum_partner_age], :minimum_partner_age)}>
<.error :for={msg <- get_field_errors(@f[:minimum_partner_height], :minimum_partner_height)}>
<%= with_locale(@language, fn -> %>
<%= gettext("Minimum age") <> " " <> msg %>
<%= gettext("Minimum height") <> " " <> msg %>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please ALWAYS(!) use something like gettext("Hello, %{name}!", name: "Meg") for this kind of thing. All languages are different. There is no way this order will not change for all languages.

<% end) %>
</.error>
</div>
Expand Down
35 changes: 34 additions & 1 deletion lib/animina_web/live/beta_register.ex
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
defmodule AniminaWeb.BetaRegisterLive do
use AniminaWeb, :live_view
alias Animina.Accounts.User
alias AniminaWeb.PotentialPartner
alias AshPhoenix.Form

@impl true
def mount(_params, %{"language" => language} = _session, socket) do
potential_partners =
PotentialPartner.potential_partners_on_registration(default_user_params())

socket =
socket
|> assign(language: language)
|> assign(current_user: nil)
|> assign(active_tab: "register")
|> assign(trigger_action: false)
|> assign(current_user_credit_points: 0)
|> assign(:number_of_potential_partners, Enum.count(potential_partners))
|> assign(:errors, [])
|> assign(
:form,
Expand All @@ -21,11 +26,39 @@ defmodule AniminaWeb.BetaRegisterLive do
{:ok, socket}
end

@impl true
def handle_event("validate_and_filter_potential_partners", %{"user" => user}, socket) do
potential_partners = PotentialPartner.potential_partners_on_registration(user)

{:noreply,
socket
|> assign(:number_of_potential_partners, Enum.count(potential_partners))}
end

defp default_user_params do
%{
"height" => "",
"maximum_partner_height" => "",
"minimum_partner_height" => "",
"maximum_partner_age" => "",
"minimum_partner_age" => "",
"gender" => "male",
"search_range" => "",
"zip_code" => "",
"birthday" => ""
}
end

@impl true
def render(assigns) do
~H"""
<div>
<.initial_form language={@language} form={@form} errors={@errors} />
<.initial_form
number_of_potential_partners={@number_of_potential_partners}
language={@language}
form={@form}
errors={@errors}
/>
</div>
"""
end
Expand Down
191 changes: 173 additions & 18 deletions lib/animina_web/potential_partner.ex
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defmodule AniminaWeb.PotentialPartner do

alias Animina.Accounts
alias Animina.Accounts.User
# alias Animina.GeoData.City
alias Animina.GeoData.City
# alias Animina.Traits.UserFlags

require Ash.Query
Expand Down Expand Up @@ -52,6 +52,27 @@ defmodule AniminaWeb.PotentialPartner do
|> Ash.read!()
end

@doc """
We use this to fetch potential partners for the user during registration.
"""

def potential_partners_on_registration(user) do
User
|> Ash.Query.for_read(:read)
|> Ash.Query.sort(Ash.Sort.expr_sort(fragment("RANDOM()")))
|> beta_registration_partner_gender_query(user)
wintermeyer marked this conversation as resolved.
Show resolved Hide resolved
|> beta_registration_partner_height_query(user)
|> beta_registration_partner_age_query(user)
|> beta_registration_partner_geo_query(user)
|> partner_completed_registration_query(user)
|> partner_not_under_investigation_query(user)
|> partner_not_banned_query(user)
|> partner_not_archived_query(user)
|> partner_not_hibernate_query(user)
|> partner_not_incognito_query(user)
|> Ash.read!()
end

defp partner_completed_registration_query(query, _user) do
query
|> Ash.Query.filter(not is_nil(registration_completed_at))
Expand Down Expand Up @@ -147,6 +168,116 @@ defmodule AniminaWeb.PotentialPartner do
|> Ash.Query.filter(gender: [eq: user.partner_gender])
end

defp beta_registration_partner_gender_query(query, user) do
if user["gender"] == "" do
query
else
query
|> Ash.Query.filter(gender: [eq: user["gender"]])
end
end

defp beta_registration_partner_height_query(query, user) do
max_height = conditional_maximum_height(user["height"], user["maximum_partner_height"])
min_height = conditional_minimum_height(user["height"], user["minimum_partner_height"])

query
|> Ash.Query.filter(height <= ^max_height)
|> Ash.Query.filter(height >= ^min_height)
end

defp beta_registration_partner_age_query(query, user) do
if user["birthday"] == "" do
query
else
age = calculate_age(convert_to_date(user["birthday"]))

max_age = conditional_maximum_age(age, user["maximum_partner_age"])
min_age = conditional_minimum_age(age, user["minimum_partner_age"])

query
|> Ash.Query.filter(
fragment(
"date_part('year', age(current_date, ?))",
birthday
) >= ^min_age
)
|> Ash.Query.filter(
fragment(
"date_part('year', age(current_date, ?))",
birthday
) <= ^max_age
)
end
end

defp beta_registration_partner_geo_query(query, user) do
if user["zip_code"] == "" do
query
else
nearby_zip_codes =
get_nearby_cities(user["zip_code"], user["search_range"])
|> Enum.map(fn city -> city.zip_code end)

query
|> Ash.Query.filter(zip_code: [in: nearby_zip_codes])
end
end

defp conditional_maximum_age("", "") do
Application.get_env(:animina, :default_potential_partner_maximum_age)
end

defp conditional_maximum_age(age, "") do
age + Application.get_env(:animina, :default_potential_partner_age_difference)
end

defp conditional_maximum_age(_, max_age) do
String.to_integer(max_age)
end

defp conditional_minimum_age("", "") do
Application.get_env(:animina, :default_potential_partner_minimum_age)
end

defp conditional_minimum_age(age, "") do
age + Application.get_env(:animina, :default_potential_partner_age_difference)
end

defp conditional_minimum_age(_, min_age) do
String.to_integer(min_age)
end

defp conditional_maximum_height("", "") do
# We set the minimum height to 0m if the user does not specify a minimum height
Application.get_env(:animina, :default_potential_partner_maximum_height)
end

defp conditional_maximum_height(height, "") do
# We add a 10cm buffer to the user's height if the user does not specify a maximum height
String.to_integer(height) +
Application.get_env(:animina, :default_potential_partner_height_difference)
end

defp conditional_maximum_height(_height, maximum_partner_height) do
String.to_integer(maximum_partner_height)
end

defp conditional_minimum_height("", "") do
# We set the minimum height to 0cm if the user does not specify a minimum height
Application.get_env(:animina, :default_potential_partner_minimum_height)
end

defp conditional_minimum_height(height, "") do
# We remove a 10cm buffer to the user's height if the user does not specify a minimum height
String.to_integer(height) -
Application.get_env(:animina, :default_potential_partner_height_difference)
end

defp conditional_minimum_height(_, minimum_partner_height) do
String.to_integer(minimum_partner_height)
end

# defp partner_geo_query(query, user) do
# nearby_zip_codes =
# get_nearby_cities(user.zip_code, user.search_range)
Expand Down Expand Up @@ -180,23 +311,35 @@ defmodule AniminaWeb.PotentialPartner do

# We use the haversine formula to get locations
# near the current city in the search range radius
# defp get_nearby_cities(zip_code, search_range) do
# current_city = City.by_zip_code!(zip_code)
#
# City
# |> Ash.Query.filter(
# fragment(
# "acos(sin(radians(?)) * sin(radians(lat)) +
# cos(radians(?)) * cos(radians(lat)) *
# cos(radians(?) - radians(lon))) * 6731 <= ?",
# ^current_city.lat,
# ^current_city.lat,
# ^current_city.lon,
# ^search_range
# )
# )
# |> Ash.read!()
# end
def get_nearby_cities(zip_code, search_range) do
search_range =
if search_range == "" do
Application.get_env(:animina, :default_potential_partner_search_range)
else
String.to_integer(search_range)
end

case City.by_zip_code(zip_code) do
{:ok, current_city} ->
City
|> Ash.Query.filter(
fragment(
"acos(sin(radians(?)) * sin(radians(lat)) +
cos(radians(?)) * cos(radians(lat)) *
cos(radians(?) - radians(lon))) * 6731 <= ?",
^current_city.lat,
^current_city.lat,
^current_city.lon,
^search_range
)
)
|> Ash.read!()

_ ->
# If the city is not found, we return an empty list
[]
end
end

# defp get_user_flags(user_id, color) do
# UserFlags
Expand All @@ -213,4 +356,16 @@ defmodule AniminaWeb.PotentialPartner do
[]
end
end

def convert_to_date(date_string) do
{:ok, date} = Date.from_iso8601(date_string)
date
end

def calculate_age(birthdate) do
wintermeyer marked this conversation as resolved.
Show resolved Hide resolved
today = Date.utc_today()
days = Date.diff(today, birthdate)
years = days / 365.25
floor(years)
end
end