Implementatin mpsks clients #504

agmes4 · 2024-12-25T10:41:32Z

Content

Sipa implementation for mpsk clients so users can create delete and change them on there own

Please make sure though you did the following (tick off everything you
already did):

Run the tests and see them pass
Rebase your branch on top of develop
Include tests for features you introduced / bugs you fixed

added the first implentation for the client it self still a lot to do #498

added mpsk client to user profile #498

added mpsks form implementation for etiting and adding clients #498

updated html for mpsks #498

added a html containing the table information for the mpsk clients #498

fixed the mapping for the usersuite so the information can be loaded from the client #498

added a form for deleting mpsks clients minor fixes for mpskclientform #498

added the add change and delete methods for the sample backend #498

added the href to the table showing the mpsk clients #498

added a model for sipa representing mpsks clients #498

added the sipa endpoints for the pycroft fetch #498

In the case of a non-displayable property, there is now a boolean to indicate that such a property cannot be displayed There is an opt-out #498

added a model for sipa representing mpsks clients #498

#498

moved from url args to backend values #498

added the backend implentation for the api to pycroft and sample user #498

moved from url args to backend values #498

#498

codecov · 2024-12-25T10:43:55Z

Codecov Report

Attention: Patch coverage is 75.17730% with 35 lines in your changes missing coverage. Please review.

Project coverage is 31.78%. Comparing base (e4b2c30) to head (22881f1).

Files with missing lines	Patch %	Lines
sipa/blueprints/usersuite.py	69.09%	17 Missing ⚠️
sipa/model/pycroft/user.py	33.33%	8 Missing ⚠️
sipa/model/pycroft/api.py	50.00%	4 Missing ⚠️
sipa/model/sample/user.py	73.33%	4 Missing ⚠️
sipa/forms.py	83.33%	1 Missing ⚠️
sipa/model/user.py	50.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop     #504      +/-   ##
===========================================
+ Coverage    31.65%   31.78%   +0.13%     
===========================================
  Files           68       69       +1     
  Lines         6951     7239     +288     
===========================================
+ Hits          2200     2301     +101     
- Misses        4751     4938     +187

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

lukasjuhrich

Checklist / still missing:

Tests
translations

sipa/blueprints/usersuite.py

sipa/model/mspk_client.py

sipa/model/pycroft/user.py

sipa/model/sample/user.py

sipa/blueprints/usersuite.py

lukasjuhrich · 2024-12-26T02:28:40Z

sipa/forms.py

+                    Length(-1, 30, lazy_gettext("Gerätename zu lang"))],
+        description=lazy_gettext("TL-WR841N, MacBook, FritzBox, PC, Laptop, o.Ä."),
+    )
+


Please use two newlines to separate top-level constructs

sipa/model/pycroft/user.py

sipa/model/sample/user.py

lukasjuhrich · 2024-12-26T02:37:39Z

sipa/templates/usersuite/_index_status.html

+                        {% if property.displayable %}
+                            <span class="{{ style }}">{{ property.value }}</span>
+                        {% else %}
+                            <span class="{{ style }}"></span>
+                        {% endif %}


what precisely is the point of introducing displayable to set it to False in the sample backend?
I'm not sure what this is supposed to achieve.

otherwise it will try to display the clients which is not feasible cause of there amount. So I Tried to mitigate this by introducing the displayable. But forgot it in the pycorft backend

Co-authored-by: Lukas Juhrich <[email protected]>

did for better readability a refactoring

refactoring for better readability change mpsk clients function

removed unnecessary \n

FestplattenSchnitzel · 2024-12-27T11:23:46Z

I can't enter the usersuite unfortunately:

CRITICAL 2024-12-27 11:56:04,613 sipa.blueprints.generic Backend error: pycroft
Traceback (most recent call last):
  File "/tmp/sipa/sipa/model/pycroft/user.py", line 44, in __init__
    self.user_data: UserData = UserData.model_validate(user_data)
                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/tmp/sipa/venv/lib/python3.12/site-packages/pydantic/main.py", line 503, in model_validate
    return cls.__pydantic_validator__.validate_python(
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
pydantic_core._pydantic_core.ValidationError: 1 validation error for UserData
mpsk_clients
  Field required [type=missing, input_value={'birthdate': '1111-11-11..., 'wifi_password': None}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.4/v/missing

The above exception was the direct cause of the following exception:

Traceback (most recent call last):
  File "/tmp/sipa/venv/lib/python3.12/site-packages/flask/app.py", line 880, in full_dispatch_request
    rv = self.dispatch_request()
         ^^^^^^^^^^^^^^^^^^^^^^^
  File "/tmp/sipa/venv/lib/python3.12/site-packages/flask/app.py", line 865, in dispatch_request
    return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args)  # type: ignore[no-any-return]
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/tmp/sipa/sipa/blueprints/generic.py", line 143, in login
    user = User.authenticate(username, password)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/tmp/sipa/sipa/model/pycroft/user.py", line 78, in authenticate
    user = cls.get(result['id'])
           ^^^^^^^^^^^^^^^^^^^^^
  File "/tmp/sipa/sipa/model/pycroft/user.py", line 57, in get
    return cls(user_data)
           ^^^^^^^^^^^^^^
  File "/tmp/sipa/sipa/model/pycroft/user.py", line 47, in __init__
    raise PycroftBackendError("Error when parsing user lookup response") from e
sipa.model.pycroft.exc.PycroftBackendError: Error when parsing user lookup response

agmes4 · 2024-12-27T12:15:25Z

interesting yesterday it worked for me will check

agmes4 · 2024-12-27T12:20:46Z

just forgot to push a naming change sorry

FestplattenSchnitzel

Unfortunately, the error persists. Are you using a modified version of Pycroft? The error occurs b/c there is no mpsk_clients field in the data returned by the Pycroft API.

fixed a bug resulting in unable to add mpsk clients

refactored code and removed unnecessary assignment

in order to not display the mpsk clients on the user suite its necessary to have the possibility to hide a certain property. Otherwise it will not display nicely

for better errorhandling

fixed the changing of mpsk clients

added the displayable arg to sample users property capabilities

its checked rather the to delete mpsk client exists for the user refactoring changed the changing for the sample backends changing mpsk

added tests for mpsk

agmes4 added 21 commits December 25, 2024 11:39

added mpsks clients

cff8fdf

added the first implentation for the client it self still a lot to do #498

added mpsks clients

b18dffa

added mpsk client to user profile #498

added form for mpsks client

3084f5d

added mpsks form implementation for etiting and adding clients #498

updated html

70a7e2a

updated html for mpsks #498

added html subpage for mpsks

56fa8e4

added a html containing the table information for the mpsk clients #498

fixed usersuites

8478569

fixed the mapping for the usersuite so the information can be loaded from the client #498

added mpsk delete form

1be02b5

added a form for deleting mpsks clients minor fixes for mpskclientform #498

added mpsks methods sample backend

68d4200

added the add change and delete methods for the sample backend #498

added reference mpsk table

96e7d04

added the href to the table showing the mpsk clients #498

added model representing mpsks clients

2290488

added a model for sipa representing mpsks clients #498

added mpsk api fetches

636d1da

added the sipa endpoints for the pycroft fetch #498

added displayable to property

7744442

In the case of a non-displayable property, there is now a boolean to indicate that such a property cannot be displayed There is an opt-out #498

added model representing mpsks clients

c538192

added a model for sipa representing mpsks clients #498

changed to new mpsk model

14f4464

#498

added managing mpsk clients

fd0738b

#498

added forms managing mpsk

e6cba92

#498

fixed change mpsk form

dc8ec4f

moved from url args to backend values #498

added user implemation for user

3193e69

added the backend implentation for the api to pycroft and sample user #498

fixed change mpsk form

c6b3f9f

moved from url args to backend values #498

fixing for ruff

a59188a

#498

fixing for ruff

09c8ac6

#498

agmes4 requested review from lukasjuhrich and FestplattenSchnitzel December 25, 2024 10:41

lukasjuhrich reviewed Dec 26, 2024

View reviewed changes

agmes4 and others added 5 commits December 26, 2024 07:28

Update sipa/blueprints/usersuite.py

e819b1a

Co-authored-by: Lukas Juhrich <[email protected]>

Update sipa/model/pycroft/user.py

a0490e0

Co-authored-by: Lukas Juhrich <[email protected]>

Update sipa/blueprints/usersuite.py

c614644

Co-authored-by: Lukas Juhrich <[email protected]>

Update sipa/model/mspk_client.py

c375563

Co-authored-by: Lukas Juhrich <[email protected]>

Update sipa/model/mspk_client.py

72284d6

Co-authored-by: Lukas Juhrich <[email protected]>

agmes4 added 3 commits December 26, 2024 07:52

refactored mpsks to mpsk

aeae120

did for better readability a refactoring

refactoring function

d46fe2e

refactoring for better readability change mpsk clients function

refactoring

1eb4104

removed unnecessary \n

fixup! refactoring

79222a2

FestplattenSchnitzel reviewed Dec 27, 2024

View reviewed changes

agmes4 added 12 commits December 27, 2024 20:25

fixup! refactoring

d219f2f

fixed bug adding mpsk clients

63156e2

fixed a bug resulting in unable to add mpsk clients

fixup! fixed bug adding mpsk clients

56b4dec

refactored code

8f8cedd

refactored code and removed unnecessary assignment

added capability displayable

5b41ac9

in order to not display the mpsk clients on the user suite its necessary to have the possibility to hide a certain property. Otherwise it will not display nicely

added errors

11d6bee

for better errorhandling

fixed chaning mpsk client

81324b5

fixed the changing of mpsk clients

fixed capabilities sample user

4ac1cc4

added the displayable arg to sample users property capabilities

fixed delete mpsk

91c46b4

its checked rather the to delete mpsk client exists for the user refactoring changed the changing for the sample backends changing mpsk

added test for mpsk

a283977

added tests for mpsk

refactoring for ruff

b9a638d

added capability displayable to test

22881f1

agmes4 requested a review from FestplattenSchnitzel January 18, 2025 12:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implementatin mpsks clients #504

Implementatin mpsks clients #504

agmes4 commented Dec 25, 2024 •

edited

Loading

codecov bot commented Dec 25, 2024 •

edited

Loading

lukasjuhrich left a comment •

edited

Loading

lukasjuhrich Dec 26, 2024

lukasjuhrich Dec 26, 2024

agmes4 Dec 26, 2024

FestplattenSchnitzel commented Dec 27, 2024

agmes4 commented Dec 27, 2024

agmes4 commented Dec 27, 2024

FestplattenSchnitzel left a comment

Implementatin mpsks clients #504

Are you sure you want to change the base?

Implementatin mpsks clients #504

Conversation

agmes4 commented Dec 25, 2024 • edited Loading

Content

codecov bot commented Dec 25, 2024 • edited Loading

Codecov Report

lukasjuhrich left a comment • edited Loading

Choose a reason for hiding this comment

lukasjuhrich Dec 26, 2024

Choose a reason for hiding this comment

lukasjuhrich Dec 26, 2024

Choose a reason for hiding this comment

agmes4 Dec 26, 2024

Choose a reason for hiding this comment

FestplattenSchnitzel commented Dec 27, 2024

agmes4 commented Dec 27, 2024

agmes4 commented Dec 27, 2024

FestplattenSchnitzel left a comment

Choose a reason for hiding this comment

agmes4 commented Dec 25, 2024 •

edited

Loading

codecov bot commented Dec 25, 2024 •

edited

Loading

lukasjuhrich left a comment •

edited

Loading