do not get records for users that are current adopters

openstax · Oct 18, 2024 · 5c216b8 · 5c216b8
1 parent c99462a
commit 5c216b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/salesforce/management/commands/update_opportunities.py b/salesforce/management/commands/update_opportunities.py
@@ -33,7 +33,8 @@ def handle(self, *args, **options):
                      "Opportunity__r.Contact__r.Accounts_UUID__c "
                      "FROM Adoption__c WHERE "
                      "Base_Year__c = {} AND Opportunity__r.Contact__r.Accounts_UUID__c  != null "
-                     "AND Confirmation_Type__c = 'OpenStax Confirmed Adoption'").format(year)
+                     "AND Confirmation_Type__c = 'OpenStax Confirmed Adoption' "
+                     "AND Opportunity__r.Contact__r.Adoption_Status != 'Current Adopter'").format(year)
 
             response = sf.query(query)
             records = response['records']

diff --git a/salesforce/views.py b/salesforce/views.py
@@ -54,6 +54,7 @@ def list(self, request):
         account_uuid = request.GET.get('account_uuid', False)
         # a user can have many adoption records - one for each book
         # 10/2024 - added new data that can be used on the form, will need coordination with the FE form
+        # see https://github.com/openstax/openstax-cms/pull/1585
         queryset = AdoptionOpportunityRecord.objects.filter(account_uuid=account_uuid)
         book_list = []
         for record in queryset: