Skip to content

Commit 6de637c

Browse files
authored
[Backend] Add SQS period to serializer (#4238)
1 parent 6edea67 commit 6de637c

File tree

3 files changed

+25
-2
lines changed

3 files changed

+25
-2
lines changed

apps/challenges/serializers.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ class Meta:
9393
"ephemeral_storage",
9494
"evaluation_module_error",
9595
"worker_image_url",
96-
"worker_instance_type"
96+
"worker_instance_type",
97+
"sqs_retention_period"
9798
)
9899

99100

@@ -309,7 +310,8 @@ class Meta:
309310
"ec2_storage",
310311
"ephemeral_storage",
311312
"evaluation_module_error",
312-
"worker_image_url"
313+
"worker_image_url",
314+
"sqs_retention_period"
313315
)
314316

315317

tests/unit/challenges/test_views.py

+19
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ def test_get_challenge(self):
194194
"ephemeral_storage": self.challenge.ephemeral_storage,
195195
"worker_image_url": self.challenge.worker_image_url,
196196
"worker_instance_type": self.challenge.worker_instance_type,
197+
"sqs_retention_period": self.challenge.sqs_retention_period,
197198
}
198199
]
199200

@@ -548,6 +549,7 @@ def test_get_particular_challenge(self):
548549
"ephemeral_storage": self.challenge.ephemeral_storage,
549550
"worker_image_url": self.challenge.worker_image_url,
550551
"worker_instance_type": self.challenge.worker_instance_type,
552+
"sqs_retention_period": self.challenge.sqs_retention_period,
551553
}
552554
response = self.client.get(self.url, {})
553555
self.assertEqual(response.data, expected)
@@ -649,6 +651,7 @@ def test_update_challenge_when_user_is_its_creator(self):
649651
"ephemeral_storage": self.challenge.ephemeral_storage,
650652
"worker_image_url": self.challenge.worker_image_url,
651653
"worker_instance_type": self.challenge.worker_instance_type,
654+
"sqs_retention_period": self.challenge.sqs_retention_period,
652655
}
653656
response = self.client.put(
654657
self.url, {"title": new_title, "description": new_description}
@@ -776,6 +779,7 @@ def test_particular_challenge_partial_update(self):
776779
"ephemeral_storage": self.challenge.ephemeral_storage,
777780
"worker_image_url": self.challenge.worker_image_url,
778781
"worker_instance_type": self.challenge.worker_instance_type,
782+
"sqs_retention_period": self.challenge.sqs_retention_period,
779783
}
780784
response = self.client.patch(self.url, self.partial_update_data)
781785
self.assertEqual(response.data, expected)
@@ -852,6 +856,7 @@ def test_particular_challenge_update(self):
852856
"ephemeral_storage": self.challenge.ephemeral_storage,
853857
"worker_image_url": self.challenge.worker_image_url,
854858
"worker_instance_type": self.challenge.worker_instance_type,
859+
"sqs_retention_period": self.challenge.sqs_retention_period,
855860
}
856861
response = self.client.put(self.url, self.data)
857862
self.assertEqual(response.data, expected)
@@ -1444,6 +1449,7 @@ def test_get_past_challenges(self):
14441449
"ephemeral_storage": self.challenge3.ephemeral_storage,
14451450
"worker_image_url": self.challenge3.worker_image_url,
14461451
"worker_instance_type": self.challenge3.worker_instance_type,
1452+
"sqs_retention_period": self.challenge3.sqs_retention_period,
14471453
}
14481454
]
14491455
response = self.client.get(self.url, {}, format="json")
@@ -1526,6 +1532,7 @@ def test_get_present_challenges(self):
15261532
"ephemeral_storage": self.challenge.ephemeral_storage,
15271533
"worker_image_url": self.challenge.worker_image_url,
15281534
"worker_instance_type": self.challenge.worker_instance_type,
1535+
"sqs_retention_period": self.challenge.sqs_retention_period,
15291536
}
15301537
]
15311538
response = self.client.get(self.url, {}, format="json")
@@ -1608,6 +1615,7 @@ def test_get_future_challenges(self):
16081615
"ephemeral_storage": self.challenge4.ephemeral_storage,
16091616
"worker_image_url": self.challenge4.worker_image_url,
16101617
"worker_instance_type": self.challenge4.worker_instance_type,
1618+
"sqs_retention_period": self.challenge4.sqs_retention_period,
16111619
}
16121620
]
16131621
response = self.client.get(self.url, {}, format="json")
@@ -1690,6 +1698,7 @@ def test_get_all_challenges(self):
16901698
"ephemeral_storage": self.challenge3.ephemeral_storage,
16911699
"worker_image_url": self.challenge3.worker_image_url,
16921700
"worker_instance_type": self.challenge3.worker_instance_type,
1701+
"sqs_retention_period": self.challenge3.sqs_retention_period,
16931702
},
16941703
{
16951704
"id": self.challenge3.pk,
@@ -1756,6 +1765,7 @@ def test_get_all_challenges(self):
17561765
"ephemeral_storage": self.challenge3.ephemeral_storage,
17571766
"worker_image_url": self.challenge3.worker_image_url,
17581767
"worker_instance_type": self.challenge3.worker_instance_type,
1768+
"sqs_retention_period": self.challenge3.sqs_retention_period,
17591769
},
17601770
{
17611771
"id": self.challenge2.pk,
@@ -1822,6 +1832,7 @@ def test_get_all_challenges(self):
18221832
"ephemeral_storage": self.challenge2.ephemeral_storage,
18231833
"worker_image_url": self.challenge2.worker_image_url,
18241834
"worker_instance_type": self.challenge2.worker_instance_type,
1835+
"sqs_retention_period": self.challenge2.sqs_retention_period,
18251836
},
18261837
]
18271838
response = self.client.get(self.url, {}, format="json")
@@ -1959,6 +1970,7 @@ def test_get_featured_challenges(self):
19591970
"ephemeral_storage": self.challenge3.ephemeral_storage,
19601971
"worker_image_url": self.challenge3.worker_image_url,
19611972
"worker_instance_type": self.challenge3.worker_instance_type,
1973+
"sqs_retention_period": self.challenge3.sqs_retention_period,
19621974
}
19631975
]
19641976
response = self.client.get(self.url, {}, format="json")
@@ -2120,6 +2132,7 @@ def test_get_challenge_by_pk_when_user_is_challenge_host(self):
21202132
"ephemeral_storage": self.challenge3.ephemeral_storage,
21212133
"worker_image_url": self.challenge3.worker_image_url,
21222134
"worker_instance_type": self.challenge3.worker_instance_type,
2135+
"sqs_retention_period": self.challenge3.sqs_retention_period,
21232136
}
21242137

21252138
response = self.client.get(self.url, {})
@@ -2210,6 +2223,7 @@ def test_get_challenge_by_pk_when_user_is_participant(self):
22102223
"ephemeral_storage": self.challenge4.ephemeral_storage,
22112224
"worker_image_url": self.challenge4.worker_image_url,
22122225
"worker_instance_type": self.challenge4.worker_instance_type,
2226+
"sqs_retention_period": self.challenge4.sqs_retention_period,
22132227
}
22142228

22152229
self.client.force_authenticate(user=self.user1)
@@ -2360,6 +2374,7 @@ def test_get_challenge_when_host_team_is_given(self):
23602374
"ephemeral_storage": self.challenge2.ephemeral_storage,
23612375
"worker_image_url": self.challenge2.worker_image_url,
23622376
"worker_instance_type": self.challenge2.worker_instance_type,
2377+
"sqs_retention_period": self.challenge2.sqs_retention_period,
23632378
}
23642379
]
23652380

@@ -2438,6 +2453,7 @@ def test_get_challenge_when_participant_team_is_given(self):
24382453
"ephemeral_storage": self.challenge2.ephemeral_storage,
24392454
"worker_image_url": self.challenge2.worker_image_url,
24402455
"worker_instance_type": self.challenge2.worker_instance_type,
2456+
"sqs_retention_period": self.challenge2.sqs_retention_period,
24412457
}
24422458
]
24432459

@@ -2516,6 +2532,7 @@ def test_get_challenge_when_mode_is_participant(self):
25162532
"ephemeral_storage": self.challenge2.ephemeral_storage,
25172533
"worker_image_url": self.challenge2.worker_image_url,
25182534
"worker_instance_type": self.challenge2.worker_instance_type,
2535+
"sqs_retention_period": self.challenge2.sqs_retention_period,
25192536
}
25202537
]
25212538

@@ -2592,6 +2609,7 @@ def test_get_challenge_when_mode_is_host(self):
25922609
"ephemeral_storage": self.challenge.ephemeral_storage,
25932610
"worker_image_url": self.challenge.worker_image_url,
25942611
"worker_instance_type": self.challenge.worker_instance_type,
2612+
"sqs_retention_period": self.challenge.sqs_retention_period,
25952613
},
25962614
{
25972615
"id": self.challenge2.pk,
@@ -2658,6 +2676,7 @@ def test_get_challenge_when_mode_is_host(self):
26582676
"ephemeral_storage": self.challenge2.ephemeral_storage,
26592677
"worker_image_url": self.challenge2.worker_image_url,
26602678
"worker_instance_type": self.challenge2.worker_instance_type,
2679+
"sqs_retention_period": self.challenge2.sqs_retention_period,
26612680
},
26622681
]
26632682

tests/unit/participants/test_views.py

+2
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,7 @@ def test_get_teams_and_corresponding_challenges_for_a_participant(self):
883883
"evaluation_module_error": self.challenge1.evaluation_module_error,
884884
"worker_image_url": self.challenge1.worker_image_url,
885885
"worker_instance_type": self.challenge1.worker_instance_type,
886+
"sqs_retention_period": self.challenge1.sqs_retention_period,
886887
},
887888
"participant_team": {
888889
"id": self.participant_team.id,
@@ -976,6 +977,7 @@ def test_get_participant_team_challenge_list(self):
976977
"evaluation_module_error": self.challenge1.evaluation_module_error,
977978
"worker_image_url": self.challenge1.worker_image_url,
978979
"worker_instance_type": self.challenge1.worker_instance_type,
980+
"sqs_retention_period": self.challenge1.sqs_retention_period,
979981
}
980982
]
981983

0 commit comments

Comments
 (0)