worker: include orgs in reconciler runs (PROJQUAY-8431) (quay#3560)

Adds an include_orgs param to the active users query used by the reconciler and sets it to true for reconciler runs

Reconciler is not including orgs as a candidate for creating corresponding RH entitlements. As a result it misses users with stripe billing that are considered orgs.

data/model/user.py

@@ -1231,9 +1231,12 @@ def get_public_repo_count(username):
     )
 
 
-def get_active_users(disabled=True, deleted=False):
+def get_active_users(disabled=True, deleted=False, include_orgs=False):
     query = User.select().where(User.organization == False, User.robot == False)
 
+    if include_orgs:
+        query = User.select().where(User.robot == False)
+
     if not disabled:
         query = query.where(User.enabled == True)
     else:

workers/reconciliationworker.py

@@ -40,7 +40,7 @@ def _perform_reconciliation(self, user_api, marketplace_api):
         """
         logger.info("Reconciliation worker looking to create new subscriptions...")
 
-        users = model.user.get_active_users()
+        users = model.user.get_active_users(include_orgs=True)
 
         stripe_users = [user for user in users if user.stripe_id is not None]
 

workers/test/test_reconciliationworker.py

@@ -22,6 +22,18 @@ def test_skip_free_user(initialized_db):
     mock.assert_not_called()
 
 
+def test_reconcile_org_user(initialized_db):
+    user = model.user.get_user("devtable")
+
+    org_user = model.organization.create_organization("org_user", "[email protected]", user)
+    org_user.stripe_id = "cus_" + "".join(random.choices(string.ascii_lowercase, k=14))
+    org_user.save()
+    with patch.object(marketplace_users, "lookup_customer_id") as mock:
+        worker._perform_reconciliation(marketplace_users, marketplace_subscriptions)
+
+    mock.assert_called_with(org_user.email)
+
+
 def test_exception_handling(initialized_db):
     with patch("data.billing.FakeStripe.Customer.retrieve") as mock:
         mock.side_effect = stripe.error.InvalidRequestException