Commit b7b8d2e5 authored by Simon Pastor's avatar Simon Pastor
Browse files

users fix based on v2

parent edfcea48

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

+6 −6
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ func usersGet(w http.ResponseWriter, r *http.Request) { 
	// Get user list from DB

	var response InlineUserList

	var userList UserList

	userList.ResourceURL = hostUrl.String() + basePath + "users"

	userList.ResourceURL = hostUrl.String() + basePath + "queries/users"

	response.UserList = &userList

	userData.userList = &userList
@@ -728,7 +728,7 @@ func apGet(w http.ResponseWriter, r *http.Request) { 
	var response InlineAccessPointList

	var apList AccessPointList

	apList.ZoneId = vars["zoneId"]

	apList.ResourceURL = hostUrl.String() + basePath + "zones/" + vars["zoneId"] + "/accessPoints"

	apList.ResourceURL = hostUrl.String() + basePath + "queries/zones/" + vars["zoneId"] + "/accessPoints"

	response.AccessPointList = &apList

	userData.apList = &apList
@@ -787,7 +787,7 @@ func zonesGet(w http.ResponseWriter, r *http.Request) { 


	var response InlineZoneList

	var zoneList ZoneList

	zoneList.ResourceURL = hostUrl.String() + basePath + "zones"

	zoneList.ResourceURL = hostUrl.String() + basePath + "queries/zones"

	response.ZoneList = &zoneList



	keyName := baseKey + typeZone + ":*"
@@ -1523,7 +1523,7 @@ func updateUserInfo(address string, zoneId string, accessPointId string, longitu 
	if userInfo == nil {

		userInfo = new(UserInfo)

		userInfo.Address = address

		userInfo.ResourceURL = hostUrl.String() + basePath + "users/" + address

		userInfo.ResourceURL = hostUrl.String() + basePath + "queries/users?address=" + address

	} else {

		// Get old zone & AP IDs

		oldZoneId = userInfo.ZoneId
@@ -1567,7 +1567,7 @@ func updateZoneInfo(zoneId string, nbAccessPoints int, nbUnsrvAccessPoints int, 
	if zoneInfo == nil {

		zoneInfo = new(ZoneInfo)

		zoneInfo.ZoneId = zoneId

		zoneInfo.ResourceURL = hostUrl.String() + basePath + "zones/" + zoneId

		zoneInfo.ResourceURL = hostUrl.String() + basePath + "queries/zones/" + zoneId

	}



	// Update info
@@ -1595,7 +1595,7 @@ func updateAccessPointInfo(zoneId string, apId string, conTypeStr string, opStat 
	if apInfo == nil {

		apInfo = new(AccessPointInfo)

		apInfo.AccessPointId = apId

		apInfo.ResourceURL = hostUrl.String() + basePath + "zones/" + zoneId + "/accessPoints/" + apId

		apInfo.ResourceURL = hostUrl.String() + basePath + "queries/zones/" + zoneId + "/accessPoints/" + apId

	}



	// Update info

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

+7 −7
Original line number Diff line number Diff line
@@ -1484,8 +1484,8 @@ func TestUserInfo(t *testing.T) { 
	/******************************

	 * expected response section

	 ******************************/

	expectedListResourceURL := "/" + testScenarioName + "/location/v2/users"

	expectedResourceURL := expectedListResourceURL + "/ue1"

	expectedListResourceURL := "/" + testScenarioName + "/location/v2/queries/users"

	expectedResourceURL := expectedListResourceURL + "?address=ue1"

	//expectedListResourceURL := ""

	//expectedResourceURL := ""

	expectedUserInfo := UserInfo{"zone1-poa-cell1", "ue1", "", "", nil, expectedResourceURL, nil, "zone1"}
@@ -1537,7 +1537,7 @@ func testUserInfo(t *testing.T, userId string, expectedResponse string) { 
	 * request execution section

	 ******************************/



	rr, err := sendRequest(http.MethodGet, "/users", nil, nil, query, http.StatusOK, UsersGET)

	rr, err := sendRequest(http.MethodGet, "/queries/users", nil, nil, query, http.StatusOK, UsersGET)

	if err != nil {

		t.Fatalf("Failed to get expected response")

	}
@@ -1623,12 +1623,12 @@ func testZoneInfo(t *testing.T, zoneId string, expectedResponse string) { 


	var err error

	if expectedResponse == "" {

		_, err = sendRequest(http.MethodGet, "/zones", nil, vars, nil, http.StatusNotFound, ZonesGetById)

		_, err = sendRequest(http.MethodGet, "/queries/zones", nil, vars, nil, http.StatusNotFound, ZonesGetById)

		if err != nil {

			t.Fatalf("Failed to get expected response")

		}

	} else {

		rr, err := sendRequest(http.MethodGet, "/zones", nil, vars, nil, http.StatusOK, ZonesGetById)

		rr, err := sendRequest(http.MethodGet, "/queries/zones", nil, vars, nil, http.StatusOK, ZonesGetById)

		if err != nil {

			t.Fatalf("Failed to get expected response")

		}
@@ -1720,12 +1720,12 @@ func testAPInfo(t *testing.T, zoneId string, apId string, expectedResponse strin 


	var err error

	if expectedResponse == "" {

		_, err = sendRequest(http.MethodGet, "/zones/"+zoneId+"/accessPoints", nil, vars, nil, http.StatusNotFound, ApByIdGET)

		_, err = sendRequest(http.MethodGet, "/queries/zones/"+zoneId+"/accessPoints", nil, vars, nil, http.StatusNotFound, ApByIdGET)

		if err != nil {

			t.Fatalf("Failed to get expected response")

		}

	} else {

		rr, err := sendRequest(http.MethodGet, "/zones"+zoneId+"/accessPoints", nil, vars, nil, http.StatusOK, ApByIdGET)

		rr, err := sendRequest(http.MethodGet, "/queries/zones"+zoneId+"/accessPoints", nil, vars, nil, http.StatusOK, ApByIdGET)

		if err != nil {

			t.Fatalf("Failed to get expected response")

		}