Commit 227cecf2 authored by Ikram Haq's avatar Ikram Haq
Browse files

Fix Populate list issue

parent 55ab4470
Loading
Loading
Loading
Loading
+25 −6
Original line number Diff line number Diff line
@@ -4716,8 +4716,7 @@ func zonalTrafficSubPut(w http.ResponseWriter, r *http.Request) {
}

func populateZonalTrafficList(key string, jsonInfo string, userData interface{}) error {

	zoneList := userData.(*NotificationSubscriptionList)
	subscriptions := userData.(*[]Subscription)
	var zoneInfo ZoneLocationEventSubscription

	// Format response
@@ -4725,7 +4724,16 @@ func populateZonalTrafficList(key string, jsonInfo string, userData interface{})
	if err != nil {
		return err
	}
	zoneList.ZoneLocationEventSubscription = append(zoneList.ZoneLocationEventSubscription, zoneInfo)
	href := ""
	if zoneInfo.Links != nil && zoneInfo.Links.Self != nil {
		href = zoneInfo.Links.Self.Href
	}
	// Create a Subscription instance
	sub := Subscription{
		Href:             href,
		SubscriptionType: zoneInfo.SubscriptionType,
	}
	*subscriptions = append(*subscriptions, sub)
	return nil
}

@@ -4947,8 +4955,7 @@ func zoneStatusSubPut(w http.ResponseWriter, r *http.Request) {
}

func populateZoneStatusList(key string, jsonInfo string, userData interface{}) error {

	zoneList := userData.(*NotificationSubscriptionList)
	subscriptions := userData.(*[]Subscription)
	var zoneInfo ZoneStatusSubscription

	// Format response
@@ -4956,7 +4963,19 @@ func populateZoneStatusList(key string, jsonInfo string, userData interface{}) e
	if err != nil {
		return err
	}
	zoneList.ZoneStatusSubscription = append(zoneList.ZoneStatusSubscription, zoneInfo)

	// Extract the Href from the Links structure
	href := ""
	if zoneInfo.Links != nil && zoneInfo.Links.Self != nil {
		href = zoneInfo.Links.Self.Href
	}

	// Create a Subscription instance
	sub := Subscription{
		Href:             href,
		SubscriptionType: zoneInfo.SubscriptionType,
	}
	*subscriptions = append(*subscriptions, sub)
	return nil
}