Commit dadb5f76 authored by Ikram Haq's avatar Ikram Haq
Browse files

Update datamodel and add expirydeadline logic in zoneStatusSubscription

parent 899bd5aa

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

+6 −6
Original line number Diff line number Diff line
@@ -194,13 +194,13 @@ func ZoneStatusSubListGET(w http.ResponseWriter, r *http.Request) { 
	zoneStatusSubListGet(w, r)

}



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

	zoneStatusSubPost(w, r)

}

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

// 	zoneStatusSubPost(w, r)

// }



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

	zoneStatusSubPut(w, r)

}

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

// 	zoneStatusSubPut(w, r)

// }



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

	zonesGet(w, r)

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

+3 −3
Original line number Diff line number Diff line
@@ -338,11 +338,11 @@ func convertStringToOperationStatus(opStatus string) OperationStatus { 


	switch opStatus {

	case "Serviceable":

		return SERVICEABLE_OperationStatus

		return SERVICEABLE

	case "Unserviceable":

		return UNSERVICEABLE_OperationStatus

		return UNSERVICEABLE

	default:

		return UNKNOWN_OperationStatus

		return UNKNOWN

	}

}

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

+554 −204

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -10,5 +10,5 @@ 
package server



type InlineZoneLocationEventSubscription struct {

	ZoneLocationEventSubscription *ZoneLocationEventSubscription `json:"ZoneLocationEventSubscription,omitempty"`

	ZoneLocationEventSubscription *ZoneLocationEventSubscription `json:"zoneLocationEventSubscription,omitempty"`

}

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

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

 * Copyright (c) 2022  The AdvantEDGE Authors

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *    http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 * 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)

 */