|
|
@@ -105,14 +105,22 @@ class CkPlanWeekendSerializers(serializers.ModelSerializer):
|
|
|
p_obj = serializers.SerializerMethodField()
|
|
|
|
|
|
def get_p_obj(self, obj):
|
|
|
- pests = [int(i) for i in obj.pest.split(",")]
|
|
|
- p_query = MongoPestBank.objects.filter(id__in=pests)
|
|
|
- p_serializers = PestBankSerializers(p_query, many=True)
|
|
|
-
|
|
|
- pick = [int(i) for i in obj.pick.split(",")]
|
|
|
- pk_query = MongoPestBank.objects.filter(id__in=pick)
|
|
|
- pk_serializers = PestBankSerializers(pk_query, many=True)
|
|
|
- return {"pest": p_serializers.data, "pick": pk_serializers.data}
|
|
|
+ if obj.pest:
|
|
|
+ pests = [int(i) for i in obj.pest.split(",")]
|
|
|
+ p_query = MongoPestBank.objects.filter(id__in=pests)
|
|
|
+ p_serializers = PestBankSerializers(p_query, many=True)
|
|
|
+ pest_data = p_serializers.data
|
|
|
+ else:
|
|
|
+ pest_data = []
|
|
|
+
|
|
|
+ if obj.pick:
|
|
|
+ pick = [int(i) for i in obj.pick.split(",")]
|
|
|
+ pk_query = MongoPestBank.objects.filter(id__in=pick)
|
|
|
+ pk_serializers = PestBankSerializers(pk_query, many=True)
|
|
|
+ pk_data = pk_serializers.data
|
|
|
+ else:
|
|
|
+ pk_data = []
|
|
|
+ return {"pest": pest_data, "pick": pk_data}
|
|
|
|
|
|
class Meta:
|
|
|
model = PlanWeekend
|