addressing PR comments

data/migrations/versions/41d15c93c299_add_quantity_field_to_orgrhskus.py

@@ -15,9 +15,7 @@
 
 def upgrade(op, tables, tester):
     op.add_column("organizationrhskus", sa.Column("quantity", sa.Integer(), nullable=True))
-    pass
 
 
 def downgrade(op, tables, tester):
     op.drop_column("organizationrhskus", "quantity")
-    pass

data/model/organization_skus.py

@@ -18,10 +18,9 @@ def get_org_subscriptions(org_id):
 
 def bind_subscription_to_org(subscription_id, org_id, user_id, quantity=1):
     try:
-        with db_transaction():
-            return OrganizationRhSkus.create(
-                subscription_id=subscription_id, org_id=org_id, user_id=user_id, quantity=quantity
-            )
+        return OrganizationRhSkus.create(
+            subscription_id=subscription_id, org_id=org_id, user_id=user_id, quantity=quantity
+        )
     except model.DataModelException as ex:
         logger.error("Problem binding subscription to org %s: %s", org_id, ex)
     except peewee.IntegrityError:

endpoints/api/billing.py

@@ -984,9 +984,6 @@ def post(self, orgname):
                 subscription_id = subscription.get("subscription_id")
                 if subscription_id is None:
                     break
-                # quantity = subscription.get("quantity")
-                # if quantity is None:
-                #     quantity = 1
                 user = get_authenticated_user()
                 account_number = marketplace_users.get_account_number(user)
                 subscriptions = marketplace_subscriptions.get_list_of_subscriptions(account_number)
@@ -1000,6 +997,7 @@ def post(self, orgname):
                     for subscription in subscriptions:
                         if subscription["id"] == subscription_id:
                             quantity = subscription["quantity"]
+                            break
                     try:
                         model.organization_skus.bind_subscription_to_org(
                             user_id=user.id,