Skip to content

Serialize work type ID #165

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
Neraste merged 4 commits into from
Mar 6, 2025
Merged

Serialize work type ID #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
811c57d
Serialize work type ID
odrling Jul 23, 2024
e5ad313
check expected work type IDs in tests
odrling Jul 28, 2024
8300876
Add ID to WorkTypeForWorkSerializer
odrling Mar 5, 2025
922b137
Merge branch 'develop' into work-types-serialize-id
Neraste Mar 6, 2025
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
4 changes: 2 additions & 2 deletions dakara_server/library/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class WorkTypeSerializer(serializers.ModelSerializer):

class Meta:
model = WorkType
fields = ("name", "name_plural", "query_name", "icon_name")
fields = ("id", "name", "name_plural", "query_name", "icon_name")

@staticmethod
def set(work_type_data):
Expand Down Expand Up @@ -144,7 +144,7 @@ class WorkTypeForWorkSerializer(serializers.ModelSerializer):

class Meta:
model = WorkType
fields = ("name", "name_plural", "query_name", "icon_name")
fields = ("id", "name", "name_plural", "query_name", "icon_name")
extra_kwargs = {
"name": {"required": False},
"name_plural": {"required": False},
Expand Down
1 change: 1 addition & 0 deletions dakara_server/library/tests/base_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ def check_work_json(self, json, expected_work):

def check_work_type_json(self, json, expected_work_type):
"""Method to test an representation against the expected work type."""
self.assertEqual(json["id"], expected_work_type.id)
self.assertEqual(json["name"], expected_work_type.name)
self.assertEqual(json["name_plural"], expected_work_type.name_plural)
self.assertEqual(json["query_name"], expected_work_type.query_name)
Expand Down