Fixed an ordering bug related to capacityRestrictions #863

Author: allmightyspiff

plugin/commands/order/place_test.go

@@ -41,11 +41,11 @@ var _ = Describe("Place", func() {
 		cliCommand.Command.PersistentFlags().Var(cliCommand.OutputFlag, "output", "--output=JSON for json output.")
 		cliCommand.OrderManager = OrderManager
 	})
-    AfterEach(func() {
-        // Clear API call logs and any errors that might have been set after every test
-        fakeHandler.ClearApiCallLogs()
-        fakeHandler.ClearErrors()
-    })
+	AfterEach(func() {
+		// Clear API call logs and any errors that might have been set after every test
+		fakeHandler.ClearApiCallLogs()
+		fakeHandler.ClearErrors()
+	})
 
 	Describe("order verify", func() {
 		for k, _ := range order.TYPEMAP {
@@ -246,7 +246,7 @@ var _ = Describe("Place", func() {
 	Describe("softlayer-cli/issues/863", func() {
 		BeforeEach(func() {
 			fakeHandler.ClearApiCallLogs()
-			fakeHandler.SetFileNames([]string{"getItems-835", "getDatacenters_mad02"})
+			fakeHandler.SetFileNames([]string{"getItems-835", "getDatacenters_mad02", "getActivePresets-835"})
 		})
 		It("Finds the correct price IDs", func() {
 			err := testhelpers.RunCobraCommand(
@@ -261,14 +261,14 @@ var _ = Describe("Place", func() {
 				"--preset=BL2_8x32x100", "--verify",
 			)
 			Expect(err).NotTo(HaveOccurred())
-			
+
 			callLog := fakeHandler.ApiCallLogs
 			Expect(len(callLog)).To(Equal(9))
 			fmt.Printf(callLog[8].String())
 			Expect(callLog[8].String()).To(Equal(`SoftLayer_Product_Order::verifyOrder(id=0, mask='', filter='', ` +
 				`{"parameters":[{"complexType":"SoftLayer_Container_Product_Order_Virtual_Guest",` +
-				`"location":"3460412","packageId":865,"presetId":785,"prices":[{"id":899},{"id":21},{"id":204637},` +
-				`{"id":314158},{"id":55},{"id":57},{"id":58},{"id":420},{"id":905},{"id":22505}],"quantity":1,` +
+				`"location":"3460412","packageId":865,"presetId":281,"prices":[{"id":899},{"id":21},{"id":204637},` +
+				`{"id":314142},{"id":55},{"id":57},{"id":58},{"id":420},{"id":905},{"id":22505}],"quantity":1,` +
 				`"useHourlyPricing":false,"virtualGuests":[{"domain":"ibm.com","hostname":"testServer"}]}]}`,
 			))
 		})

plugin/managers/order.go

@@ -232,7 +232,9 @@ func (i orderManager) GenerateOrder(packageKeyname, location string, itemKeyname
 		}
 
 		for _, item := range presetItems.Prices {
-			if item.Item != nil && item.Item.ItemCategory != nil && item.Item.ItemCategory.CategoryCode != nil && *item.Item.ItemCategory.CategoryCode == "guest_core" {
+			if item.Item != nil && item.Item.ItemCategory != nil &&
+				item.Item.ItemCategory.CategoryCode != nil &&
+				*item.Item.ItemCategory.CategoryCode == "guest_core" {
 				if item.Item.Capacity != nil {
 					presetCore = float64(*item.Item.Capacity)
 				}
@@ -317,8 +319,9 @@ func (i orderManager) GetPresetbyKey(packageKeyname, presetKeyname string) (data
 	return activePresets[0], nil
 }
 
+// Makes an API call to get packageKeyName
+// Finds the given itemKeynames in the result, checking any capacity restrictions for the items if needed
 func (i orderManager) GetPriceIdList(packageKeyname string, itemKeynames []string, presetCore float64) ([]int, error) {
-
 	mask := "id, itemCategory, keyName, prices[categories]"
 	packages, err := i.GetPackageByKey(packageKeyname, "id")
 	if err != nil {
@@ -343,16 +346,22 @@ func (i orderManager) GetPriceIdList(packageKeyname string, itemKeynames []strin
 		if len(newItems) != 0 {
 			matchingItem = newItems[0]
 		} else {
-			return nil, errors.New(T("Item {{.Item}} does not exist for package {{.Package}}", map[string]interface{}{"Item": itemKeyname, "Package": packageKeyname}))
+			subs := map[string]interface{}{"Item": itemKeyname, "Package": packageKeyname}
+			return nil, errors.New(T("Item {{.Item}} does not exist for package {{.Package}}", subs))
 		}
+
 		var itemCategory string
 		if matchingItem.ItemCategory != nil && matchingItem.ItemCategory.CategoryCode != nil {
 			itemCategory = *matchingItem.ItemCategory.CategoryCode
 		}
+
 		if _, ok := categoryDict[itemCategory]; !ok {
 			for _, p := range matchingItem.Prices {
-				if ((p.LocationGroupId != nil && *p.LocationGroupId == 0) || p.LocationGroupId == nil) && p.Id != nil {
-					var capacityMin, capacityMax int
+				if ((p.LocationGroupId != nil && *p.LocationGroupId == 0) ||
+					p.LocationGroupId == nil) && p.Id != nil {
+
+					capacityMin := -1
+					capacityMax := -1
 					if p.CapacityRestrictionMinimum != nil {
 						capacityMin, err = strconv.Atoi(*p.CapacityRestrictionMinimum)
 						if err != nil {
@@ -375,15 +384,17 @@ func (i orderManager) GetPriceIdList(packageKeyname string, itemKeynames []strin
 							priceId = *p.Id
 						}
 					}
-
 				}
 			}
 		} else {
 			var PriceIdList []int
 			categoryDict[itemCategory] += 1
 			categoryCode := itemCategory[:len(itemCategory)-1] + strconv.Itoa(categoryDict[itemCategory])
 			for _, p := range matchingItem.Prices {
-				if p.LocationGroupId != nil && *p.LocationGroupId == 0 && len(p.Categories) > 0 && p.Categories[0].CategoryCode != nil && *p.Categories[0].CategoryCode == categoryCode {
+				if p.LocationGroupId != nil && *p.LocationGroupId == 0 &&
+					len(p.Categories) > 0 && p.Categories[0].CategoryCode != nil &&
+					*p.Categories[0].CategoryCode == categoryCode {
+
 					PriceIdList = append(PriceIdList, *p.Id)
 				}
 			}