amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Check if multiple line items belong to the same subscription

Browse source 
We are just fine in this case to create a Monthly hosting bill
Also return None explicitly if MonthlyHostingBill is not created
This commit is contained in:
PCoder 2019-04-20 07:22:49 +02:00
parent 0969c97eca
commit 91695eaee4
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
hosting/models.py
View file

@ -273,10 +273,19 @@ class MonthlyHostingBill(AssignPermissionsMixin, models.Model):
# Try to infer the HostingOrder from subscription id or VM_ID # Try to infer the HostingOrder from subscription id or VM_ID
if len(args['subscription_ids_csv']) > 0: if len(args['subscription_ids_csv']) > 0:
sub_ids = [sub_id.strip() for sub_id in args['subscription_ids_csv'].split(",")] sub_ids = [sub_id.strip() for sub_id in args['subscription_ids_csv'].split(",")]
if len(sub_ids) == 1: set_sub_ids = set(sub_ids)
args['order'] = HostingOrder.objects.get( if len(set_sub_ids) == 1:
subscription_id=sub_ids[0] # the multiple line items belong to the same subscription
) sub_id = set_sub_ids.pop()
try:
args['order'] = HostingOrder.objects.get(
subscription_id=sub_id
)
except HostingOrder.DoesNotExist as dne:
logger.error("Hosting order for {} doesn't exist".format(
sub_id
))
args['order'] = None
else: else:
logger.debug( logger.debug(
"More than one subscriptions" "More than one subscriptions"
@ -284,7 +293,7 @@ class MonthlyHostingBill(AssignPermissionsMixin, models.Model):
) )
logger.debug("SUB_IDS={}".format(','.join(sub_ids))) logger.debug("SUB_IDS={}".format(','.join(sub_ids)))
logger.debug("Not importing invoices") logger.debug("Not importing invoices")
return return None
elif len(args['lines_meta_data_csv']) > 0: elif len(args['lines_meta_data_csv']) > 0:
vm_ids = [vm_id.strip() for vm_id in args['lines_meta_data_csv'].split(",")] vm_ids = [vm_id.strip() for vm_id in args['lines_meta_data_csv'].split(",")]
if len(vm_ids) == 1: if len(vm_ids) == 1:
@ -296,7 +305,7 @@ class MonthlyHostingBill(AssignPermissionsMixin, models.Model):
) )
logger.debug("VM_IDS={}".format(','.join(vm_ids))) logger.debug("VM_IDS={}".format(','.join(vm_ids)))
logger.debug("Not importing invoices") logger.debug("Not importing invoices")
return return None
else: else:
logger.debug("Neither subscription id nor vm_id available") logger.debug("Neither subscription id nor vm_id available")
logger.debug("Can't import invoice") logger.debug("Can't import invoice")