Skip to content

Commit 45af25b

Browse files
authored
Merge pull request #530 from digitalfabrik/develop
Release `2024.5.1`
2 parents 9c4394d + e4f1c4d commit 45af25b

8 files changed

Lines changed: 1543 additions & 1539 deletions

File tree

lunes_cms/api/v1/serializers/alternative_word_serializer.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ class AlternativeWordSerializer(serializers.ModelSerializer):
99
`serializers.ModelSerializer`.
1010
"""
1111

12+
article = serializers.IntegerField(source="singular_article")
13+
1214
class Meta:
1315
"""
1416
Define model and the corresponding fields
1517
"""
1618

1719
model = AlternativeWord
18-
fields = ("alt_word", "singular_article")
20+
fields = ("alt_word", "article")

lunes_cms/api/v1/serializers/document_serializer.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ class DocumentSerializer(serializers.ModelSerializer):
1414
alternatives = AlternativeWordSerializer(many=True, read_only=True)
1515
document_image = DocumentImageSerializer(many=True, read_only=True)
1616

17+
article = serializers.IntegerField(source="singular_article")
18+
1719
class Meta:
1820
"""
1921
Define model and the corresponding fields
@@ -23,7 +25,7 @@ class Meta:
2325
fields = (
2426
"id",
2527
"word",
26-
"singular_article",
28+
"article",
2729
"audio",
2830
"word_type",
2931
"alternatives",

tests/api/expected-results/documents_by_training_set_108.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"id": 1733,
44
"word": "Dachreling",
5-
"singular_article": 2,
5+
"article": 2,
66
"audio": "http://testserver/media/audio/dachreling.mp3",
77
"word_type": "Nomen",
88
"alternatives": [],
@@ -17,7 +17,7 @@
1717
{
1818
"id": 1735,
1919
"word": "Fahrzeugfront",
20-
"singular_article": 2,
20+
"article": 2,
2121
"audio": "http://testserver/media/audio/fahrzeugfront.mp3",
2222
"word_type": "Nomen",
2323
"alternatives": [],
@@ -32,7 +32,7 @@
3232
{
3333
"id": 1736,
3434
"word": "Fahrzeugheck",
35-
"singular_article": 3,
35+
"article": 3,
3636
"audio": "http://testserver/media/audio/fahrzeugheck.mp3",
3737
"word_type": "Nomen",
3838
"alternatives": [],
@@ -47,7 +47,7 @@
4747
{
4848
"id": 1815,
4949
"word": "Führungslenker",
50-
"singular_article": 1,
50+
"article": 1,
5151
"audio": "http://testserver/media/audio/fuhrungslenker.mp3",
5252
"word_type": "Nomen",
5353
"alternatives": [],
@@ -62,7 +62,7 @@
6262
{
6363
"id": 1739,
6464
"word": "Kotflügel",
65-
"singular_article": 1,
65+
"article": 1,
6666
"audio": "http://testserver/media/audio/kotflugel.mp3",
6767
"word_type": "Nomen",
6868
"alternatives": [],
@@ -77,7 +77,7 @@
7777
{
7878
"id": 1744,
7979
"word": "Schweller",
80-
"singular_article": 1,
80+
"article": 1,
8181
"audio": "http://testserver/media/audio/schweller.mp3",
8282
"word_type": "Nomen",
8383
"alternatives": [],

tests/api/expected-results/documents_by_training_set_7.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"id": 1242,
44
"word": "Elektroinstallation",
5-
"singular_article": 2,
5+
"article": 2,
66
"audio": "http://testserver/media/audio/elektroinstallation.mp3",
77
"word_type": "Nomen",
88
"alternatives": [],
@@ -17,7 +17,7 @@
1717
{
1818
"id": 1247,
1919
"word": "Eurostecker",
20-
"singular_article": 1,
20+
"article": 1,
2121
"audio": "http://testserver/media/audio/eurostecker.mp3",
2222
"word_type": "Nomen",
2323
"alternatives": [],
@@ -32,13 +32,13 @@
3232
{
3333
"id": 1264,
3434
"word": "Kuparohr",
35-
"singular_article": 3,
35+
"article": 3,
3636
"audio": "http://testserver/media/audio/kuparohr.mp3",
3737
"word_type": "Nomen",
3838
"alternatives": [
3939
{
4040
"alt_word": "Kuparohre",
41-
"singular_article": 4
41+
"article": 4
4242
}
4343
],
4444
"document_image": [
@@ -52,7 +52,7 @@
5252
{
5353
"id": 1277,
5454
"word": "Phasenprüfer",
55-
"singular_article": 1,
55+
"article": 1,
5656
"audio": "http://testserver/media/audio/phasenprufer.mp3",
5757
"word_type": "Nomen",
5858
"alternatives": [],
@@ -67,7 +67,7 @@
6767
{
6868
"id": 1297,
6969
"word": "Schaltplan",
70-
"singular_article": 1,
70+
"article": 1,
7171
"audio": "http://testserver/media/audio/schaltplan.mp3",
7272
"word_type": "Nomen",
7373
"alternatives": [],
@@ -82,13 +82,13 @@
8282
{
8383
"id": 117,
8484
"word": "Spannungsprüfer",
85-
"singular_article": 1,
85+
"article": 1,
8686
"audio": "http://testserver/media/audio/spannungsprufer.mp3",
8787
"word_type": "Nomen",
8888
"alternatives": [
8989
{
9090
"alt_word": "Duspol",
91-
"singular_article": 1
91+
"article": 1
9292
}
9393
],
9494
"document_image": [
@@ -102,13 +102,13 @@
102102
{
103103
"id": 284,
104104
"word": "zweipolige Phasenprüfer",
105-
"singular_article": 1,
105+
"article": 1,
106106
"audio": "http://testserver/media/audio/zweipolige-phasenprufer.mp3",
107107
"word_type": "Nomen",
108108
"alternatives": [
109109
{
110110
"alt_word": "Phasenprüfer",
111-
"singular_article": 1
111+
"article": 1
112112
}
113113
],
114114
"document_image": [

0 commit comments

Comments
 (0)