Rename learn_app and deliver_app, add validation for not allowing sam…

…e app

commcare_connect/opportunity/forms.py

@@ -15,8 +15,8 @@ class Meta:
  model = Opportunity
  fields = ["name", "description"]
 
- learn_app_select = forms.ChoiceField()
- deliver_app_select = forms.ChoiceField()
+ learn_app = forms.ChoiceField()
+ deliver_app = forms.ChoiceField()
 
  def __init__(self, *args, **kwargs):
  self.applications = kwargs.pop("applications", [])
@@ -25,20 +25,26 @@ def __init__(self, *args, **kwargs):
  super().__init__(*args, **kwargs)
 
  choices = [(app["id"], app["name"]) for app in self.applications]
- self.fields["learn_app_select"] = forms.ChoiceField(choices=choices)
- self.fields["deliver_app_select"] = forms.ChoiceField(choices=choices)
+ self.fields["learn_app"] = forms.ChoiceField(choices=choices)
+ self.fields["deliver_app"] = forms.ChoiceField(choices=choices)
+
+ def clean(self):
+ cleaned_data = super().clean()
+ if cleaned_data["learn_app"] == cleaned_data["deliver_app"]:
+ self.add_error("learn_app", "Learn app and Deliver app cannot be same")
+ self.add_error("deliver_app", "Learn app and Deliver app cannot be same")
 
  def save(self, commit=True):
  for app in self.applications:
- if app["id"] == self.cleaned_data["learn_app_select"]:
+ if app["id"] == self.cleaned_data["learn_app"]:
  self.instance.learn_app, _ = CommCareApp.objects.get_or_create(
  cc_app_id=app["id"],
  name=app["name"],
  cc_domain=app["domain"],
  defaults={"created_by": self.user.email, "modified_by": self.user.email},
  )
 
- if app["id"] == self.cleaned_data["deliver_app_select"]:
+ if app["id"] == self.cleaned_data["deliver_app"]:
  self.instance.deliver_app, _ = CommCareApp.objects.get_or_create(
  cc_app_id=app["id"],
  name=app["name"],