10781677487

Committed 09 Sep 2024 09:36PM UTC coverage: 67.226% (-0.1%) from 67.325%

Build # 10781677487

Build Type

Pull #1152

github

Committed by

web-flow

Commit Message

Merge branch 'main' into feat-edit-account

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

Pull Request Pull Request #1152: Feat edit account

Run Details

6190 of 10060 branches covered (61.53%)

Branch coverage included in aggregate %.

26 of 61 new or added lines in 5 files covered. (42.62%)

1 existing line in 1 file now uncovered.

7830 of 10795 relevant lines covered (72.53%)

5.75 hits per line

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

88.89

/flexmeasures/data/schemas/account.py

from flask.cli import with_appcontext
from flexmeasures.data import ma
from marshmallow import fields, validates

from flexmeasures.data import db
from flexmeasures.data.models.user import (
    Account as AccountModel,
    AccountRole as AccountRoleModel,
)
from flexmeasures.data.schemas.utils import FMValidationError, MarshmallowClickMixin
from flexmeasures.utils.validation_utils import validate_color_hex, validate_url


class AccountRoleSchema(ma.SQLAlchemySchema):
    """AccountRole schema, with validations."""

    class Meta:
        model = AccountRoleModel

    id = ma.auto_field(dump_only=True)
    name = ma.auto_field()
    accounts = fields.Nested("AccountSchema", exclude=("account_roles",), many=True)


class AccountSchema(ma.SQLAlchemySchema):
    """Account schema, with validations."""

    class Meta:
        model = AccountModel

    id = ma.auto_field(dump_only=True)
    name = ma.auto_field(required=True)
    primary_color = ma.auto_field(required=False)
    secondary_color = ma.auto_field(required=False)
    logo_url = ma.auto_field(required=False)
    account_roles = fields.Nested("AccountRoleSchema", exclude=("accounts",), many=True)
    consultancy_account_id = ma.auto_field()

    @validates("primary_color")
    def validate_primary_color(self, value):
        validate_color_hex(None, "primary_color", value)

    @validates("secondary_color")
    def validate_secondary_color(self, value):
        validate_color_hex(None, "secondary_color", value)

    @validates("logo_url")
    def validate_logo_url(self, value):
        validate_url(None, "logo_url", value)


class AccountIdField(fields.Int, MarshmallowClickMixin):
    """Field that deserializes to an Account and serializes back to an integer."""

    @with_appcontext
    def _deserialize(self, value, attr, obj, **kwargs) -> AccountModel:
        """Turn an account id into an Account."""
        account = db.session.get(AccountModel, value)
        if account is None:
            raise FMValidationError(f"No account found with id {value}.")
        # lazy loading now (account somehow is not in the session after this)
        account.account_roles
        return account

    def _serialize(self, account, attr, data, **kwargs):
        """Turn an Account into a source id."""
        return account.id

1	from flask.cli import with_appcontext	8✔
2	from flexmeasures.data import ma	8✔
3	from marshmallow import fields, validates	8✔
4
5	from flexmeasures.data import db	8✔
6	from flexmeasures.data.models.user import (	8✔
7	Account as AccountModel,
8	AccountRole as AccountRoleModel,
9	)
10	from flexmeasures.data.schemas.utils import FMValidationError, MarshmallowClickMixin	8✔
11	from flexmeasures.utils.validation_utils import validate_color_hex, validate_url	8✔
12
13
14	class AccountRoleSchema(ma.SQLAlchemySchema):	8✔
15	"""AccountRole schema, with validations."""	4✔
16
17	class Meta:	8✔
18	model = AccountRoleModel	8✔
19
20	id = ma.auto_field(dump_only=True)	8✔
21	name = ma.auto_field()	8✔
22	accounts = fields.Nested("AccountSchema", exclude=("account_roles",), many=True)	8✔
23
24
25	class AccountSchema(ma.SQLAlchemySchema):	8✔
26	"""Account schema, with validations."""	4✔
27
28	class Meta:	8✔
29	model = AccountModel	8✔
30
31	id = ma.auto_field(dump_only=True)	8✔
32	name = ma.auto_field(required=True)	8✔
33	primary_color = ma.auto_field(required=False)	8✔
34	secondary_color = ma.auto_field(required=False)	8✔
35	logo_url = ma.auto_field(required=False)	8✔
36	account_roles = fields.Nested("AccountRoleSchema", exclude=("accounts",), many=True)	8✔
37	consultancy_account_id = ma.auto_field()	8✔
38
39	@validates("primary_color")	8✔
40	def validate_primary_color(self, value):	8✔
NEW 41	validate_color_hex(None, "primary_color", value)	×
42
43	@validates("secondary_color")	8✔
44	def validate_secondary_color(self, value):	8✔
NEW 45	validate_color_hex(None, "secondary_color", value)	×
46
47	@validates("logo_url")	8✔
48	def validate_logo_url(self, value):	8✔
NEW 49	validate_url(None, "logo_url", value)	×
50
51
52	class AccountIdField(fields.Int, MarshmallowClickMixin):	8✔
53	"""Field that deserializes to an Account and serializes back to an integer."""	4✔
54
55	@with_appcontext	8✔
56	def _deserialize(self, value, attr, obj, **kwargs) -> AccountModel:	8✔
57	"""Turn an account id into an Account."""
58	account = db.session.get(AccountModel, value)	8✔
59	if account is None:	8✔
60	raise FMValidationError(f"No account found with id {value}.")	×
61	# lazy loading now (account somehow is not in the session after this)
62	account.account_roles	8✔
63	return account	8✔
64
65	def _serialize(self, account, attr, data, **kwargs):	8✔
66	"""Turn an Account into a source id."""
67	return account.id	×

FlexMeasures / flexmeasures / 10781677487

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