10997679560

Committed 23 Sep 2024 03:38PM UTC coverage: 67.252% (-0.01%) from 67.264%

Build # 10997679560

Build Type

push

github

Committed by

web-flow

Commit Message

Feat users pagination (#1160)

* feat: dynamic account colors

Added options to add a priamary and secondary color when creating an account

Also fixed typo comment

A line in the css wasnt commented properly

* chore: removed experimental code

* refactor: edgecase handling and more

- Handled edge case for fetching color setting when accoutn has no consultant
- wrote test for color computation utils
- type hints additons
- ignored some docker volume folders

* chore: clearing unwanted DB changes

* refactor: code improvements

- type hinting
- segregattion of fucntionalities

The color hex validation is now in a seperate fuciton in the coding_utils file

* chore: removed Alembic comments

* chore: linting code

* fix: removed unwanted classes

* fix: removed unwanted css clases

* chore: initialize repo

* chore: added '#' to default secondary color

* feat: account logo

This feature gives the option to add a logo url to an account

* fix: revert utils.py

accidentally replaced its content with that of another file

* chore: remove unnecessary validation

* chore: typo fix and migration file cleanup

* feat: added extra validation to check logo url length

* feat: logourl fallback

this feature checks te consultant account if the main account desint have a logo set

If both arent set it fallback to the flexmeasures account logo

* fix: url regex validation error

additional pattern was needed to compliment the existing pattern

* refactor: regex patterns for path and port

* refactor: regex patterns for query params

* docs: updated change log with new features changes (white labeling - logo url)

* docs: fixed typo with wrong url linking

* feat: api to edit account details

* refactor: fallback for empty account

- handle edgecase for rendering brand logo incase user is not logged it

* feat: edit accotun popup

- also modified preremdered variables to also send over au... (continued)

Run Details

6246 of 10131 branches covered (61.65%)

Branch coverage included in aggregate %.

29 of 38 new or added lines in 4 files covered. (76.32%)

2 existing lines in 1 file now uncovered.

7889 of 10887 relevant lines covered (72.46%)

5.74 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

62.5

/flexmeasures/data/queries/users.py

from __future__ import annotations

from sqlalchemy import select, Select, or_, and_

from flexmeasures.data.models.user import User as UserModel, Account


def query_users_by_search_terms(
    search_terms: list[str] | None,
    filter_statement: bool = True,
) -> Select:
    select_statement = select(UserModel)
    if search_terms is not None:
        filter_statement = filter_statement & and_(
            *(
                or_(
                    UserModel.email.ilike(f"%{term}%"),
                    UserModel.username.ilike(f"%{term}%"),
                    UserModel.account.has(Account.name.ilike(f"%{term}%")),
                )
                for term in search_terms
            )
        )
        query = select_statement.where(filter_statement).order_by(UserModel.id)
    else:
        query = select_statement.where(filter_statement).order_by(UserModel.id)
    return query

1	from __future__ import annotations	8✔
2
3	from sqlalchemy import select, Select, or_, and_	8✔
4
5	from flexmeasures.data.models.user import User as UserModel, Account	8✔
6
7
8	def query_users_by_search_terms(	8✔
9	search_terms: list[str] \| None,
10	filter_statement: bool = True,
11	) -> Select:
12	select_statement = select(UserModel)	8✔
13	if search_terms is not None:	8✔
NEW 14	filter_statement = filter_statement & and_(	×
15	*(
16	or_(
17	UserModel.email.ilike(f"%{term}%"),
18	UserModel.username.ilike(f"%{term}%"),
19	UserModel.account.has(Account.name.ilike(f"%{term}%")),
20	)
21	for term in search_terms
22	)
23	)
NEW 24	query = select_statement.where(filter_statement).order_by(UserModel.id)	×
25	else:
26	query = select_statement.where(filter_statement).order_by(UserModel.id)	8✔
27	return query	8✔

FlexMeasures / flexmeasures / 10997679560

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous