Commit 2120c1d7 authored by Ikram Haq's avatar Ikram Haq
Browse files

Fix minor issue

parent fd98b971

go-apps/meep-loc-serv/server/loc-serv.go

+72 −72
Original line number Diff line number Diff line
@@ -4178,31 +4178,31 @@ func zoneSubListGET(w http.ResponseWriter, r *http.Request) { 
// 	w.WriteHeader(http.StatusOK)

// 	fmt.Fprint(w, string(jsonResponse))

// }

// func zonalTrafficSubListGet(w http.ResponseWriter, r *http.Request) {

// 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")

func zonalTrafficSubListGet(w http.ResponseWriter, r *http.Request) {

	w.Header().Set("Content-Type", "application/json; charset=UTF-8")



// 	var response InlineNotificationSubscriptionList

// 	var zonalTrafficSubList NotificationSubscriptionList

// 	zonalTrafficSubList.ResourceURL = hostUrl.String() + basePath + "subscriptions/zonalTraffic"

// 	response.NotificationSubscriptionList = &zonalTrafficSubList

	var response InlineNotificationSubscriptionList

	var zonalTrafficSubList NotificationSubscriptionList

	zonalTrafficSubList.ResourceURL = hostUrl.String() + basePath + "subscriptions/zonalTraffic"

	response.NotificationSubscriptionList = &zonalTrafficSubList



// 	keyName := baseKey + typeZonalSubscription + "*"

// 	err := rc.ForEachJSONEntry(keyName, populateZonalTrafficList, &zonalTrafficSubList)

// 	if err != nil {

// 		log.Error(err.Error())

// 		errHandlerProblemDetails(w, err.Error(), http.StatusInternalServerError)

// 		return

// 	}

	keyName := baseKey + typeZonalSubscription + "*"

	err := rc.ForEachJSONEntry(keyName, populateZonalTrafficList, &zonalTrafficSubList)

	if err != nil {

		log.Error(err.Error())

		errHandlerProblemDetails(w, err.Error(), http.StatusInternalServerError)

		return

	}



// 	jsonResponse, err := json.Marshal(response)

// 	if err != nil {

// 		log.Error(err.Error())

// 		errHandlerProblemDetails(w, err.Error(), http.StatusInternalServerError)

// 		return

// 	}

// 	w.WriteHeader(http.StatusOK)

// 	fmt.Fprint(w, string(jsonResponse))

// }

	jsonResponse, err := json.Marshal(response)

	if err != nil {

		log.Error(err.Error())

		errHandlerProblemDetails(w, err.Error(), http.StatusInternalServerError)

		return

	}

	w.WriteHeader(http.StatusOK)

	fmt.Fprint(w, string(jsonResponse))

}



func zonalTrafficSubGet(w http.ResponseWriter, r *http.Request) {

	w.Header().Set("Content-Type", "application/json; charset=UTF-8")