wrap attachment in transaction, cleanup code

data/model/organization_skus.py

@@ -3,7 +3,7 @@
 import peewee
 
 from data import model
-from data.database import OrganizationRhSkus
+from data.database import OrganizationRhSkus, db_transaction
 
 logger = logging.getLogger(__name__)
 
@@ -18,9 +18,10 @@ def get_org_subscriptions(org_id):
 
 def bind_subscription_to_org(subscription_id, org_id, user_id, quantity=1):
     try:
-        return OrganizationRhSkus.create(
-            subscription_id=subscription_id, org_id=org_id, user_id=user_id, quantity=quantity
-        )
+        with db_transaction():
+            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,9 @@ 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
+                # 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)
@@ -996,6 +996,10 @@ def post(self, orgname):
 
                 user_subscription_ids = [int(subscription["id"]) for subscription in subscriptions]
                 if int(subscription_id) in user_subscription_ids:
+                    quantity = 1
+                    for subscription in subscriptions:
+                        if subscription["id"] == subscription_id:
+                            quantity = subscription["quantity"]
                     try:
                         model.organization_skus.bind_subscription_to_org(
                             user_id=user.id,

static/js/directives/ui/org-binding.js

@@ -84,9 +84,7 @@ angular.module('quay').directive('orgBinding', function() {
         requestData["subscriptions"] = [];
         requestData["subscriptions"].push({
           "subscription_id": subscription["id"],
-          "quantity": subscription["quantity"]
         });
-        console.log(JSON.stringify(requestData));
         PlanService.bindSkuToOrg(requestData, $scope.organization, function(resp){
           if (resp === "Okay"){
             bindSkuSuccessMessage();