Skip to content

Commit

Permalink
[#1] Code format
Browse files Browse the repository at this point in the history
  • Loading branch information
wayangalihpratama committed Aug 30, 2023
1 parent 9c53df3 commit 5c5c6fc
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 5 deletions.
14 changes: 11 additions & 3 deletions backend/akvo/core_data/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ def define_answer_value(self, data, answer):


class Data(models.Model):
form = models.ForeignKey(to=Forms, on_delete=models.CASCADE, related_name="data")
form = models.ForeignKey(
to=Forms,
on_delete=models.CASCADE,
related_name="data"
)
name = models.TextField()
geo = models.JSONField(null=True, default=None)
submitter = models.CharField()
Expand All @@ -64,10 +68,14 @@ class Meta:

class Answers(models.Model):
data = models.ForeignKey(
to=Data, on_delete=models.CASCADE, related_name="data_answers"
to=Data,
on_delete=models.CASCADE,
related_name="data_answers"
)
question = models.ForeignKey(
to=Questions, on_delete=models.CASCADE, related_name="question_answers"
to=Questions,
on_delete=models.CASCADE,
related_name="question_answers"
)
name = models.TextField(null=True, default=None)
value = models.FloatField(null=True, default=None)
Expand Down
4 changes: 3 additions & 1 deletion backend/akvo/core_data/serializers/answer.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ def validate(self, attrs):
question_id = attrs.get("question").id

def raise_validation_error(message):
raise serializers.ValidationError(f"{message} for Question:{question_id}")
raise serializers.ValidationError(
f"{message} for Question:{question_id}"
)

if value == "" or (isinstance(value, list) and len(value) == 0):
raise_validation_error("Value is required")
Expand Down
5 changes: 4 additions & 1 deletion backend/akvo/core_forms/tests/test_form_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ def test_list_form_serializer_contains_expected_fields(self):
data = self.serializer.data
self.assertEqual(
set(data.keys()),
{"id", "name", "description", "version", "languages", "translations"},
{
"id", "name", "description",
"version", "languages", "translations"
},
)

def test_list_form_serializer_return_expected_data(self):
Expand Down

0 comments on commit 5c5c6fc

Please sign in to comment.