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.

Sign up for GitHub

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

Jump to bottom

MES v 2.0.4 #31

Merged
merged 8 commits into from
Sep 20, 2023
Merged

MES v 2.0.4 #31

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1807401
(reco) add log_duration to monitor get_nearest_offer
LucileRainteau Sep 20, 2023
346b9a3
(reco) add logs to monitor the function get_nearest_offers
LucileRainteau Sep 20, 2023
072ccca
Merge branch 'staging' into main
LucileRainteau Sep 20, 2023
489c15e
(reco) test query without join
LucileRainteau Sep 20, 2023
d7275f1
(reco) simplify filters orm
LucileRainteau Sep 20, 2023
7d0e11a
Merge branch 'staging' into main
LucileRainteau Sep 20, 2023
5c92aac
Merge branch 'main' of https://github.com/pass-culture/api-data into …
LucileRainteau Sep 20, 2023
98f03d4
Merge branch 'staging' into main
LucileRainteau Sep 20, 2023
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
60 changes: 22 additions & 38 deletions apps/recommendation/api/src/huggy/crud/offer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,47 +97,31 @@ def get_nearest_offers(
)

start = time.time()
if user.latitude is not None and user.longitude is not None:
user_geolocated = True
user_point = WKTElement(f"POINT({user.latitude} {user.longitude})")
user_distance = func.ST_Distance(
user_point,
func.Geometry(
func.ST_MakePoint(
offer_table.venue_longitude,
offer_table.venue_latitude,
)
),
).label("user_distance")

if offer_table.is_geolocated:
user_distance_condition = [
offer_table.default_max_distance >= user_distance
]
offer_rank = (
func.row_number()
.over(partition_by=offer_table.item_id, order_by=user_distance)
.label("offer_rank")
)
else:
user_distance_condition = [1 == 1]
offer_rank = (
func.row_number()
.over(
partition_by=offer_table.item_id, order_by=offer_table.stock_price
)
.label("offer_rank")
# if user.latitude is not None and user.longitude is not None:
# user_geolocated = True
user_point = WKTElement(f"POINT({user.latitude} {user.longitude})")
user_distance = func.ST_Distance(
user_point,
func.Geometry(
func.ST_MakePoint(
offer_table.venue_longitude,
offer_table.venue_latitude,

)
),
).label("user_distance")

else:
user_geolocated = False
user_distance = None
user_distance_condition = [1 == 1]
offer_rank = (
func.row_number()
.over(partition_by=offer_table.item_id, order_by=offer_table.stock_price)
.label("offer_rank")
user_distance_condition = [
offer_table.default_max_distance >= func.coalesce(user_distance, 0)
]
offer_rank = (
func.row_number()
.over(
partition_by=offer_table.item_id,
order_by=func.coalesce(user_distance, offer_table.stock_price),
)
.label("offer_rank")
)

# print(f"user_geolocated : {user_geolocated}")
# print(f"user_distance : {user_distance}")
Expand Down
Loading