Skip to content

Wire up new tables with backend connection #86

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

Merged
felixevers merged 1 commit into from
Jan 26, 2026
Merged

Wire up new tables with backend connection #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
98 changes: 75 additions & 23 deletions backend/api/decorators/filter_sort.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ def get_property_join_alias(
) -> Any:
entity_type = detect_entity_type(model_class)
if not entity_type:
raise ValueError(f"Unsupported entity type for property filtering: {model_class}")
raise ValueError(
f"Unsupported entity type for property filtering: {model_class}"
)

property_alias = aliased(models.PropertyValue)
value_column = get_property_value_column(field_type)
Expand Down Expand Up @@ -97,10 +99,16 @@ def apply_sorting(
continue

field_type = property_field_types.get(
sort_input.property_definition_id, "FIELD_TYPE_TEXT"
sort_input.property_definition_id,
"FIELD_TYPE_TEXT"
)
query, property_alias, value_column = get_property_join_alias(
query, model_class, sort_input.property_definition_id, field_type
query, property_alias, value_column = (
get_property_join_alias(
query,
model_class,
sort_input.property_definition_id,
field_type,
)
)

if sort_input.direction == SortDirection.DESC:
Expand All @@ -114,7 +122,9 @@ def apply_sorting(
return query


def apply_text_filter(column: Any, operator: FilterOperator, parameter: Any) -> Any:
def apply_text_filter(
column: Any, operator: FilterOperator, parameter: Any
) -> Any:
search_text = parameter.search_text
if search_text is None:
return None
Expand Down Expand Up @@ -155,7 +165,9 @@ def apply_text_filter(column: Any, operator: FilterOperator, parameter: Any) ->
return None


def apply_number_filter(column: Any, operator: FilterOperator, parameter: Any) -> Any:
def apply_number_filter(
column: Any, operator: FilterOperator, parameter: Any
) -> Any:
compare_value = parameter.compare_value
min_value = parameter.min
max_value = parameter.max
Expand Down Expand Up @@ -192,7 +204,9 @@ def normalize_date_for_comparison(date_value: Any) -> Any:
return date_value


def apply_date_filter(column: Any, operator: FilterOperator, parameter: Any) -> Any:
def apply_date_filter(
column: Any, operator: FilterOperator, parameter: Any
) -> Any:
compare_date = parameter.compare_date
min_date = parameter.min_date
max_date = parameter.max_date
Expand Down Expand Up @@ -276,7 +290,9 @@ def apply_datetime_filter(
return None


def apply_boolean_filter(column: Any, operator: FilterOperator, parameter: Any) -> Any:
def apply_boolean_filter(
column: Any, operator: FilterOperator, parameter: Any
) -> Any:
if operator == FilterOperator.BOOLEAN_IS_TRUE:
return column.is_(True)
if operator == FilterOperator.BOOLEAN_IS_FALSE:
Expand Down Expand Up @@ -336,7 +352,9 @@ def apply_tags_single_filter(
return None


def apply_null_filter(column: Any, operator: FilterOperator, parameter: Any) -> Any:
def apply_null_filter(
column: Any, operator: FilterOperator, parameter: Any
) -> Any:
if operator == FilterOperator.IS_NULL:
return column.is_(None)
if operator == FilterOperator.IS_NOT_NULL:
Expand Down Expand Up @@ -432,7 +450,8 @@ def apply_filtering(
continue

field_type = property_field_types.get(
filter_input.property_definition_id, "FIELD_TYPE_TEXT"
filter_input.property_definition_id,
"FIELD_TYPE_TEXT"
)
query, property_alias, value_column = get_property_join_alias(
query, model_class, filter_input.property_definition_id, field_type
Expand All @@ -450,7 +469,9 @@ def apply_filtering(
FilterOperator.TEXT_STARTS_WITH,
FilterOperator.TEXT_ENDS_WITH,
]:
condition = apply_text_filter(value_column, operator, parameter)
condition = apply_text_filter(
value_column, operator, parameter
)

elif operator in [
FilterOperator.NUMBER_EQUALS,
Expand All @@ -474,7 +495,9 @@ def apply_filtering(
FilterOperator.DATE_BETWEEN,
FilterOperator.DATE_NOT_BETWEEN,
]:
condition = apply_date_filter(value_column, operator, parameter)
condition = apply_date_filter(
value_column, operator, parameter
)

elif operator in [
FilterOperator.DATETIME_EQUALS,
Expand All @@ -492,15 +515,19 @@ def apply_filtering(
FilterOperator.BOOLEAN_IS_TRUE,
FilterOperator.BOOLEAN_IS_FALSE,
]:
condition = apply_boolean_filter(value_column, operator, parameter)
condition = apply_boolean_filter(
value_column, operator, parameter
)

elif operator in [
FilterOperator.TAGS_EQUALS,
FilterOperator.TAGS_NOT_EQUALS,
FilterOperator.TAGS_CONTAINS,
FilterOperator.TAGS_NOT_CONTAINS,
]:
condition = apply_tags_filter(value_column, operator, parameter)
condition = apply_tags_filter(
value_column, operator, parameter
)

elif operator in [
FilterOperator.TAGS_SINGLE_EQUALS,
Expand All @@ -514,7 +541,9 @@ def apply_filtering(
FilterOperator.IS_NULL,
FilterOperator.IS_NOT_NULL,
]:
condition = apply_null_filter(value_column, operator, parameter)
condition = apply_null_filter(
value_column, operator, parameter
)

if condition is not None:
filter_conditions.append(condition)
Expand Down Expand Up @@ -546,13 +575,20 @@ async def wrapper(*args: Any, **kwargs: Any) -> Any:
if not model_class:
if isinstance(result, Select):
for arg in args:
if hasattr(arg, "context") and hasattr(arg.context, "db"):
if (
hasattr(arg, "context")
and hasattr(arg.context, "db")
):
db = arg.context.db
query_result = await db.execute(result)
return query_result.scalars().all()
else:
info = kwargs.get("info")
if info and hasattr(info, "context") and hasattr(info.context, "db"):
if (
info
and hasattr(info, "context")
and hasattr(info.context, "db")
):
db = info.context.db
query_result = await db.execute(result)
return query_result.scalars().all()
Expand All @@ -579,7 +615,10 @@ async def wrapper(*args: Any, **kwargs: Any) -> Any:

if property_def_ids:
for arg in args:
if hasattr(arg, "context") and hasattr(arg.context, "db"):
if (
hasattr(arg, "context")
and hasattr(arg.context, "db")
):
db = arg.context.db
prop_defs_result = await db.execute(
select(models.PropertyDefinition).where(
Expand All @@ -588,12 +627,17 @@ async def wrapper(*args: Any, **kwargs: Any) -> Any:
)
prop_defs = prop_defs_result.scalars().all()
property_field_types = {
str(prop_def.id): prop_def.field_type for prop_def in prop_defs
str(prop_def.id): prop_def.field_type
for prop_def in prop_defs
}
break
else:
info = kwargs.get("info")
if info and hasattr(info, "context") and hasattr(info.context, "db"):
if (
info
and hasattr(info, "context")
and hasattr(info.context, "db")
):
db = info.context.db
prop_defs_result = await db.execute(
select(models.PropertyDefinition).where(
Expand All @@ -602,7 +646,8 @@ async def wrapper(*args: Any, **kwargs: Any) -> Any:
)
prop_defs = prop_defs_result.scalars().all()
property_field_types = {
str(prop_def.id): prop_def.field_type for prop_def in prop_defs
str(prop_def.id): prop_def.field_type
for prop_def in prop_defs
}

if filtering:
Expand All @@ -624,13 +669,20 @@ async def wrapper(*args: Any, **kwargs: Any) -> Any:

if isinstance(result, Select):
for arg in args:
if hasattr(arg, "context") and hasattr(arg.context, "db"):
if (
hasattr(arg, "context")
and hasattr(arg.context, "db")
):
db = arg.context.db
query_result = await db.execute(result)
return query_result.scalars().all()
else:
info = kwargs.get("info")
if info and hasattr(info, "context") and hasattr(info.context, "db"):
if (
info
and hasattr(info, "context")
and hasattr(info.context, "db")
):
db = info.context.db
query_result = await db.execute(result)
return query_result.scalars().all()
Expand Down
8 changes: 6 additions & 2 deletions backend/api/decorators/full_text_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,14 @@ def apply_full_text_search(
if search_input.property_definition_ids:
property_filter = and_(
property_alias.text_value.ilike(search_pattern),
property_alias.definition_id.in_(search_input.property_definition_ids),
property_alias.definition_id.in_(
search_input.property_definition_ids
),
)
else:
property_filter = property_alias.text_value.ilike(search_pattern)
property_filter = (
property_alias.text_value.ilike(search_pattern)
)

query = query.outerjoin(property_alias, join_condition)
search_conditions.append(property_filter)
Expand Down
Loading
Loading