10761534525

Committed 05 Sep 2024 08:45PM UTC coverage: 67.405% (-0.002%) from 67.407%

Build # 10761534525

Build Type

Pull #1169

github

Committed by

Flix6x

Commit Message

docs: rephrase changelog entries

Signed-off-by: F.N. Claessen <felix@seita.nl>

Pull Request Pull Request #1169: Asset search filter applies to both asset names and account names

Run Details

6177 of 10018 branches covered (61.66%)

Branch coverage included in aggregate %.

87 of 102 new or added lines in 9 files covered. (85.29%)

15 existing lines in 3 files now uncovered.

7815 of 10740 relevant lines covered (72.77%)

5.76 hits per line

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

49.33

/flexmeasures/ui/crud/accounts.py

from __future__ import annotations

from sqlalchemy import select
from flask import request, url_for
from flask_classful import FlaskView
from flask_security import login_required
from flexmeasures.ui.crud.api_wrapper import InternalApi
from flexmeasures.ui.utils.view_utils import render_flexmeasures_template
from flexmeasures.ui.crud.assets import get_assets_by_account
from flexmeasures.ui.crud.users import get_users_by_account
from flexmeasures.data.models.user import Account
from flexmeasures.data import db


def get_accounts() -> list[dict]:
    """/accounts"""
    accounts_response = InternalApi().get(url_for("AccountAPI:index"))
    accounts = accounts_response.json()

    return accounts


def get_account(account_id: str) -> dict:
    account_response = InternalApi().get(url_for("AccountAPI:get", id=account_id))
    account = account_response.json()

    return account


class AccountCrudUI(FlaskView):
    route_base = "/accounts"
    trailing_slash = False

    @login_required
    def index(self):
        """/accounts"""
        accounts = get_accounts()
        for account in accounts:
            account_obj = db.session.get(Account, account["id"])
            account["asset_count"] = account_obj.number_of_assets
            account["user_count"] = account_obj.number_of_users

        return render_flexmeasures_template(
            "crud/accounts.html",
            accounts=accounts,
        )

    @login_required
    def get(self, account_id: str):
        """/accounts/<account_id>"""
        include_inactive = request.args.get("include_inactive", "0") != "0"
        account = get_account(account_id)
        if account["consultancy_account_id"]:
            consultancy_account = db.session.execute(
                select(Account).filter_by(id=account["consultancy_account_id"])
            ).scalar_one_or_none()
            if consultancy_account:
                account["consultancy_account_name"] = consultancy_account.name
        assets = get_assets_by_account(account_id)
        assets += get_assets_by_account(account_id=None)
        users = get_users_by_account(account_id, include_inactive=include_inactive)
        return render_flexmeasures_template(
            "crud/account.html",
            account=account,
            assets=assets,
            users=users,
            include_inactive=include_inactive,
        )

    @login_required
    def auditlog(self, account_id: str):
        """/accounts/auditlog/<account_id>"""
        account = get_account(account_id)
        audit_log_response = InternalApi().get(
            url_for("AccountAPI:auditlog", id=account_id)
        )
        audit_logs_response = audit_log_response.json()
        return render_flexmeasures_template(
            "crud/account_audit_log.html",
            audit_logs=audit_logs_response,
            account=account,
        )

1	from __future__ import annotations	8✔
2
3	from sqlalchemy import select	8✔
4	from flask import request, url_for	8✔
5	from flask_classful import FlaskView	8✔
6	from flask_security import login_required	8✔
7	from flexmeasures.ui.crud.api_wrapper import InternalApi	8✔
8	from flexmeasures.ui.utils.view_utils import render_flexmeasures_template	8✔
9	from flexmeasures.ui.crud.assets import get_assets_by_account	8✔
10	from flexmeasures.ui.crud.users import get_users_by_account	8✔
11	from flexmeasures.data.models.user import Account	8✔
12	from flexmeasures.data import db	8✔
13
14
15	def get_accounts() -> list[dict]:	8✔
16	"""/accounts"""
17	accounts_response = InternalApi().get(url_for("AccountAPI:index"))	8✔
18	accounts = accounts_response.json()	8✔
19
20	return accounts	8✔
21
22
23	def get_account(account_id: str) -> dict:	8✔
24	account_response = InternalApi().get(url_for("AccountAPI:get", id=account_id))	8✔
25	account = account_response.json()	8✔
26
27	return account	8✔
28
29
30	class AccountCrudUI(FlaskView):	8✔
31	route_base = "/accounts"	8✔
32	trailing_slash = False	8✔
33
34	@login_required	8✔
35	def index(self):	8✔
36	"""/accounts"""
37	accounts = get_accounts()	×
38	for account in accounts:	×
NEW 39	account_obj = db.session.get(Account, account["id"])	×
NEW 40	account["asset_count"] = account_obj.number_of_assets	×
NEW 41	account["user_count"] = account_obj.number_of_users	×
42
43	return render_flexmeasures_template(	×
44	"crud/accounts.html",
45	accounts=accounts,
46	)
47
48	@login_required	8✔
49	def get(self, account_id: str):	8✔
50	"""/accounts/<account_id>"""
51	include_inactive = request.args.get("include_inactive", "0") != "0"	×
52	account = get_account(account_id)	×
53	if account["consultancy_account_id"]:	×
54	consultancy_account = db.session.execute(	×
55	select(Account).filter_by(id=account["consultancy_account_id"])
56	).scalar_one_or_none()
57	if consultancy_account:	×
58	account["consultancy_account_name"] = consultancy_account.name	×
59	assets = get_assets_by_account(account_id)	×
60	assets += get_assets_by_account(account_id=None)	×
61	users = get_users_by_account(account_id, include_inactive=include_inactive)	×
62	return render_flexmeasures_template(	×
63	"crud/account.html",
64	account=account,
65	assets=assets,
66	users=users,
67	include_inactive=include_inactive,
68	)
69
70	@login_required	8✔
71	def auditlog(self, account_id: str):	8✔
72	"""/accounts/auditlog/<account_id>"""
73	account = get_account(account_id)	×
74	audit_log_response = InternalApi().get(	×
75	url_for("AccountAPI:auditlog", id=account_id)
76	)
77	audit_logs_response = audit_log_response.json()	×
78	return render_flexmeasures_template(	×
79	"crud/account_audit_log.html",
80	audit_logs=audit_logs_response,
81	account=account,
82	)

FlexMeasures / flexmeasures / 10761534525

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