include submission time slot in opportunity API

commcare_connect/form_receiver/tests/test_receiver_integration.py

@@ -464,12 +464,9 @@ def test_reciever_verification_flags_form_submission(
  user_with_connectid_link: User, api_client: APIClient, opportunity: Opportunity
 ):
  verification_flags = OpportunityVerificationFlags.objects.get(opportunity=opportunity)
- verification_flags.form_submission_start = datetime.time(hour=10, minute=0)
- verification_flags.form_submission_end = datetime.time(hour=12, minute=0)
- verification_flags.save()
 
  form_json = _create_opp_and_form_json(opportunity, user=user_with_connectid_link)
- time = datetime.datetime(2024, 4, 17, 10, 0, 0)
+ time = datetime.datetime(2024, 4, 17, verification_flags.form_submission_start.hour, 0, 0)
  form_json["metadata"]["timeStart"] = time
  form_json["metadata"]["timeEnd"] = time + datetime.timedelta(minutes=10)
  make_request(api_client, form_json, user_with_connectid_link)
@@ -481,12 +478,9 @@ def test_reciever_verification_flags_form_submission_start(
  user_with_connectid_link: User, api_client: APIClient, opportunity: Opportunity
 ):
  verification_flags = OpportunityVerificationFlags.objects.get(opportunity=opportunity)
- verification_flags.form_submission_start = datetime.time(hour=10, minute=0)
- verification_flags.form_submission_end = datetime.time(hour=12, minute=0)
- verification_flags.save()
 
  form_json = _create_opp_and_form_json(opportunity, user=user_with_connectid_link)
- time = datetime.datetime(2024, 4, 17, 9, 0, 0)
+ time = datetime.datetime(2024, 4, 17, verification_flags.form_submission_start.hour - 1, 0, 0)
  form_json["metadata"]["timeStart"] = time
  make_request(api_client, form_json, user_with_connectid_link)
  visit = UserVisit.objects.get(user=user_with_connectid_link)
@@ -498,12 +492,9 @@ def test_reciever_verification_flags_form_submission_end(
  user_with_connectid_link: User, api_client: APIClient, opportunity: Opportunity
 ):
  verification_flags = OpportunityVerificationFlags.objects.get(opportunity=opportunity)
- verification_flags.form_submission_start = datetime.time(hour=10, minute=0)
- verification_flags.form_submission_end = datetime.time(hour=12, minute=0)
- verification_flags.save()
 
  form_json = _create_opp_and_form_json(opportunity, user=user_with_connectid_link)
- time = datetime.datetime(2024, 4, 17, 13, 0, 0)
+ time = datetime.datetime(2024, 4, 17, verification_flags.form_submission_end.hour + 1, 0, 0)
  form_json["metadata"]["timeStart"] = time
  make_request(api_client, form_json, user_with_connectid_link)
  visit = UserVisit.objects.get(user=user_with_connectid_link)

commcare_connect/opportunity/api/serializers.py

@@ -15,6 +15,7 @@
  OpportunityAccess,
  OpportunityClaim,
  OpportunityClaimLimit,
+ OpportunityVerificationFlags,
  Payment,
  PaymentUnit,
  UserVisit,
@@ -91,6 +92,12 @@ class Meta:
  fields = ["id", "name", "latitude", "longitude", "radius", "active"]
 
 
+class OpportunityVerificationFlagsSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = OpportunityVerificationFlags
+ fields = ["form_submission_start", "form_submission_end"]
+
+
 class OpportunitySerializer(serializers.ModelSerializer):
  organization = serializers.SlugRelatedField(read_only=True, slug_field="slug")
  learn_app = CommCareAppSerializer()
@@ -105,6 +112,7 @@ class OpportunitySerializer(serializers.ModelSerializer):
  payment_units = serializers.SerializerMethodField()
  is_user_suspended = serializers.SerializerMethodField()
  catchment_areas = serializers.SerializerMethodField()
+ verification_flags = OpportunityVerificationFlagsSerializer(source="opportunityverificationflags", read_only=True)
 
  class Meta:
  model = Opportunity
@@ -133,6 +141,7 @@ class Meta:
  "payment_units",
  "is_user_suspended",
  "catchment_areas",
+ "verification_flags",
  ]
 
  def get_claim(self, obj):

commcare_connect/opportunity/tests/factories.py

@@ -1,4 +1,4 @@
-from datetime import timezone
+from datetime import time, timezone
 
 from factory import DictFactory, Faker, LazyAttribute, SelfAttribute, SubFactory
 from factory.django import DjangoModelFactory
@@ -72,6 +72,8 @@ class Meta:
 
 class OpportunityVerificationFlagsFactory(DjangoModelFactory):
  opportunity = SubFactory(OpportunityFactory)
+ form_submission_start = time(10, 0, 0)
+ form_submission_end = time(12, 0, 0)
 
  class Meta:
  model = "opportunity.OpportunityVerificationFlags"

commcare_connect/opportunity/tests/test_api_views.py

@@ -160,6 +160,11 @@ def test_opportunity_list_endpoint(
  assert response.data[0]["budget_per_visit"] == max([pu.amount for pu in payment_units])
  claim_limits = OpportunityClaimLimit.objects.filter(opportunity_claim__opportunity_access__opportunity=opportunity)
  assert response.data[0]["claim"]["max_payments"] == sum([cl.max_visits for cl in claim_limits])
+ verification_flags = opportunity.opportunityverificationflags
+ assert response.data[0]["verification_flags"]["form_submission_start"] == str(
+ verification_flags.form_submission_start
+ )
+ assert response.data[0]["verification_flags"]["form_submission_end"] == str(verification_flags.form_submission_end)
 
 
 def test_delivery_progress_endpoint(