Skip to content

Commit eb1d7e3

Browse files
committed
improving serialization of calendar activities for enddatetime
Field was already as allow_null, so now it is also no longer required (instead of having the user send a request with a null value). fix #93
1 parent c590e1e commit eb1d7e3

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

apis/serializers/farm_activities.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ def to_representation(self, instance):
5858
class FarmCalendarActivitySerializer(serializers.ModelSerializer):
5959
activityType = URNRelatedField(class_names=['FarmCalendarActivityType'], source='activity_type', queryset=FarmCalendarActivityType.objects.all())
6060
hasStartDatetime = serializers.DateTimeField(source='start_datetime')
61-
hasEndDatetime = serializers.DateTimeField(source='end_datetime', allow_null=True)
61+
hasEndDatetime = serializers.DateTimeField(source='end_datetime', allow_null=True, required=False)
6262

63-
responsibleAgent = serializers.CharField(source='responsible_agent', allow_null=True)
63+
responsibleAgent = serializers.CharField(source='responsible_agent', allow_null=True, required=False)
6464

6565
usesAgriculturalMachinery = URNRelatedField(class_names=['AgriculturalMachine'], source='agricultural_machinery', many=True, queryset=AgriculturalMachine.objects.all())
6666

schema.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5595,10 +5595,8 @@ components:
55955595
required:
55965596
- activityType
55975597
- hasCompostMaterial
5598-
- hasEndDatetime
55995598
- hasStartDatetime
56005599
- id
5601-
- responsibleAgent
56025600
- usesAgriculturalMachinery
56035601
AddressField:
56045602
type: object
@@ -5737,13 +5735,11 @@ components:
57375735
readOnly: true
57385736
required:
57395737
- activityType
5740-
- hasEndDatetime
57415738
- hasMeasurement
57425739
- hasNestedOperation
57435740
- hasStartDatetime
57445741
- id
57455742
- isOperatedOn
5746-
- responsibleAgent
57475743
- usesAgriculturalMachinery
57485744
CompostTurningOperation:
57495745
type: object
@@ -5778,10 +5774,8 @@ components:
57785774
format: uuid
57795775
required:
57805776
- activityType
5781-
- hasEndDatetime
57825777
- hasStartDatetime
57835778
- id
5784-
- responsibleAgent
57855779
- usesAgriculturalMachinery
57865780
ContactPersonField:
57875781
type: object
@@ -5830,7 +5824,6 @@ components:
58305824
required:
58315825
- activityType
58325826
- hasAgriCrop
5833-
- hasEndDatetime
58345827
- hasResult
58355828
- id
58365829
- observedProperty
@@ -5878,11 +5871,9 @@ components:
58785871
required:
58795872
- activityType
58805873
- hasAppliedAmount
5881-
- hasEndDatetime
58825874
- hasStartDatetime
58835875
- id
58845876
- operatedOn
5885-
- responsibleAgent
58865877
- usesAgriculturalMachinery
58875878
- usesPesticide
58885879
CropSpeciesSerializerField:
@@ -5932,7 +5923,6 @@ components:
59325923
required:
59335924
- activityType
59345925
- hasAgriCrop
5935-
- hasEndDatetime
59365926
- hasResult
59375927
- id
59385928
- observedProperty
@@ -6094,10 +6084,8 @@ components:
60946084
format: uuid
60956085
required:
60966086
- activityType
6097-
- hasEndDatetime
60986087
- hasStartDatetime
60996088
- id
6100-
- responsibleAgent
61016089
- usesAgriculturalMachinery
61026090
FarmCalendarActivityType:
61036091
type: object
@@ -6325,11 +6313,9 @@ components:
63256313
- activityType
63266314
- hasApplicationMethod
63276315
- hasAppliedAmount
6328-
- hasEndDatetime
63296316
- hasStartDatetime
63306317
- id
63316318
- operatedOn
6332-
- responsibleAgent
63336319
- usesAgriculturalMachinery
63346320
- usesFertilizer
63356321
Fertilizer:
@@ -6483,11 +6469,9 @@ components:
64836469
required:
64846470
- activityType
64856471
- hasAppliedAmount
6486-
- hasEndDatetime
64876472
- hasStartDatetime
64886473
- id
64896474
- operatedOn
6490-
- responsibleAgent
64916475
- usesAgriculturalMachinery
64926476
- usesIrrigationSystem
64936477
LocationSerializerField:
@@ -6545,7 +6529,6 @@ components:
65456529
type: string
65466530
required:
65476531
- activityType
6548-
- hasEndDatetime
65496532
- hasResult
65506533
- id
65516534
- observedProperty

0 commit comments

Comments
 (0)