Commit 27f23e00 authored by Ikram Haq's avatar Ikram Haq
Browse files

Update Server_stubs for UserAreaSubscription and UserAreaNotification

parent a6f1866d

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

+6 −22
Original line number Diff line number Diff line
@@ -1412,10 +1412,7 @@ func checkNotificationAreaCircle(addressToCheck string) { 
				subsIdStr := strconv.Itoa(subsId)

				var areaCircleNotif UserAreaNotification

				areaCircleNotif.UserLocationEvent = areaCircleCheck.Subscription.LocationEventCriteria

				// areaCircleNotif.IsFinalNotification = false

				areaCircleNotif.Links = areaCircleCheck.Subscription.Links

				// var terminalLocationList []TerminalLocation

				// var terminalLocation TerminalLocation

				areaCircleNotif.Address = addr

				var locationInfo LocationInfo

				locationInfo.Latitude = nil
@@ -1427,25 +1424,12 @@ func checkNotificationAreaCircle(addressToCheck string) { 
				var timestamp TimeStamp

				timestamp.Seconds = int32(seconds)

				locationInfo.Timestamp = &timestamp

				// terminalLocation.CurrentLocation = &locationInfo

				// retrievalStatus := RETRIEVED_RetrievalStatus

				// terminalLocation.LocationRetrievalStatus = &retrievalStatus

				// terminalLocationList = append(terminalLocationList, terminalLocation)

				areaCircleNotif.LocationInfo = &locationInfo

				areaCircleNotif.NotificationType = "UserAreaNotification"



				// areaCircleNotif.TerminalLocation = terminalLocationList

				areaCircleNotif.CallbackData = areaCircleCheck.Subscription.CallbackReference.CallbackData

				var inlineCircleSubscriptionNotification InlineUserAreaNotification

				inlineCircleSubscriptionNotification.UserAreaNotification = &areaCircleNotif

				areaCircleCheck.NbNotificationsSent++

				sendSubscriptionNotification5(areaCircleCheck.Subscription.CallbackReference.NotifyURL, inlineCircleSubscriptionNotification)

				// Iterate over LocationEventCriteria and concatenate its values

				// var eventCriteria []string

				// for _, criteria := range areaCircleCheck.Subscription.LocationEventCriteria {

				// 	eventCriteria = append(eventCriteria, string(criteria))

				// }

				// criteriaStr := strings.Join(eventCriteria, ", ")

				sendSubscriptionNotification5(areaCircleCheck.Subscription.CallbackReference, inlineCircleSubscriptionNotification)

				log.Info("Area Circle Notification" + "(" + subsIdStr + ") For " + addr + " when " + " area")

				// areaCircleSubscriptionMap[subsId].NextTts = areaCircleCheck.Subscription.Frequency

				// areaCircleSubscriptionMap[subsId].NotificationCheckReady = false
@@ -3405,7 +3389,7 @@ func areaSubPOST(w http.ResponseWriter, r *http.Request) { 
	}



	//checking for mandatory properties

	if areaCircleSub.CallbackReference == nil || areaCircleSub.CallbackReference.NotifyURL == "" {

	if areaCircleSub.CallbackReference == "" {

		log.Error("Mandatory CallbackReference parameter not present")

		errHandlerProblemDetails(w, "Mandatory CallbackReference parameter not present", http.StatusBadRequest)

		return
@@ -3516,7 +3500,7 @@ func areaSubPUT(w http.ResponseWriter, r *http.Request) { 
	}



	//checking for mandatory properties

	if areaCircleSub.CallbackReference == nil || areaCircleSub.CallbackReference.NotifyURL == "" {

	if areaCircleSub.CallbackReference == "" {

		log.Error("Mandatory CallbackReference parameter not present")

		errHandlerProblemDetails(w, "Mandatory CallbackReference parameter not present", http.StatusBadRequest)

		return
@@ -3564,9 +3548,9 @@ func areaSubPUT(w http.ResponseWriter, r *http.Request) { 
				  return

		  }

	*/

	if areaCircleSub.Links.Self.Href == "" {

		log.Error("Mandatory ResourceURL parameter not present")

		errHandlerProblemDetails(w, "Mandatory ResourceURL parameter not present", http.StatusBadRequest)

	if areaCircleSub.Links == nil {

		log.Error("Mandatory Ref URL parameter not present")

		errHandlerProblemDetails(w, "Mandatory Ref URL parameter not present", http.StatusBadRequest)

		return

	}

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

+2 −2
Original line number Diff line number Diff line 
/*

 * AdvantEDGE Location API

 *

 * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf) <p>The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about Users (UE) and Zone locations <p>**Note**<br>AdvantEDGE supports all of Location API endpoints (see below).

 * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/03.01.01_60/gs_mec013v030101p.pdf) <p>The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about Users (UE) and Zone locations <p>**Note**<br>AdvantEDGE supports all of Location API endpoints (see below).

 *

 * API version: 2.2.1

 * API version: 3.1.1

 * Contact: AdvantEDGE@InterDigital.com

 * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)

 */

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

+2 −2
Original line number Diff line number Diff line 
/*

 * AdvantEDGE Location API

 *

 * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf) <p>The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about Users (UE) and Zone locations <p>**Note**<br>AdvantEDGE supports all of Location API endpoints (see below).

 * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/03.01.01_60/gs_mec013v030101p.pdf) <p>The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about Users (UE) and Zone locations <p>**Note**<br>AdvantEDGE supports all of Location API endpoints (see below).

 *

 * API version: 2.2.1

 * API version: 3.1.1

 * Contact: AdvantEDGE@InterDigital.com

 * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)

 */

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

+2 −2
Original line number Diff line number Diff line 
/*

 * AdvantEDGE Location API

 *

 * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf) <p>The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about Users (UE) and Zone locations <p>**Note**<br>AdvantEDGE supports all of Location API endpoints (see below).

 * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/03.01.01_60/gs_mec013v030101p.pdf) <p>The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about Users (UE) and Zone locations <p>**Note**<br>AdvantEDGE supports all of Location API endpoints (see below).

 *

 * API version: 2.2.1

 * API version: 3.1.1

 * Contact: AdvantEDGE@InterDigital.com

 * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)

 */

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

+2 −2
Original line number Diff line number Diff line 
/*

 * AdvantEDGE Location API

 *

 * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf) <p>The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about Users (UE) and Zone locations <p>**Note**<br>AdvantEDGE supports all of Location API endpoints (see below).

 * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/03.01.01_60/gs_mec013v030101p.pdf) <p>The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about Users (UE) and Zone locations <p>**Note**<br>AdvantEDGE supports all of Location API endpoints (see below).

 *

 * API version: 2.2.1

 * API version: 3.1.1

 * Contact: AdvantEDGE@InterDigital.com

 * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)

 */