diff --git a/Plattform/Plattform/Connected Services/AirlineService/AirlineService.wsdl b/Plattform/Plattform/Connected Services/AirlineService/AirlineService.wsdl index 4f8176b..483c8bb 100644 --- a/Plattform/Plattform/Connected Services/AirlineService/AirlineService.wsdl +++ b/Plattform/Plattform/Connected Services/AirlineService/AirlineService.wsdl @@ -7,22 +7,41 @@ - - + + - - + + + + + + + + - - - + + + + + + + - - + + + + + + + + + + + diff --git a/Plattform/Plattform/Connected Services/AirlineService/AirlineService.xsd b/Plattform/Plattform/Connected Services/AirlineService/AirlineService.xsd index 980e393..dfe6d4d 100644 --- a/Plattform/Plattform/Connected Services/AirlineService/AirlineService.xsd +++ b/Plattform/Plattform/Connected Services/AirlineService/AirlineService.xsd @@ -1,15 +1,36 @@ - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Plattform/Plattform/Connected Services/AirlineService/AirlineService2.xsd b/Plattform/Plattform/Connected Services/AirlineService/AirlineService2.xsd index 459027b..597507b 100644 --- a/Plattform/Plattform/Connected Services/AirlineService/AirlineService2.xsd +++ b/Plattform/Plattform/Connected Services/AirlineService/AirlineService2.xsd @@ -1,5 +1,11 @@ + + + + + + @@ -9,12 +15,12 @@ + - + - @@ -25,4 +31,20 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Plattform/Plattform/Connected Services/AirlineService/Reference.cs b/Plattform/Plattform/Connected Services/AirlineService/Reference.cs index 11e3297..a3d0a28 100644 --- a/Plattform/Plattform/Connected Services/AirlineService/Reference.cs +++ b/Plattform/Plattform/Connected Services/AirlineService/Reference.cs @@ -25,23 +25,23 @@ namespace Plattform.AirlineService { [System.Runtime.Serialization.OptionalFieldAttribute()] private Plattform.AirlineService.Airline AirlineField; + [System.Runtime.Serialization.OptionalFieldAttribute()] + private Plattform.AirlineService.Airport DestinationField; + [System.Runtime.Serialization.OptionalFieldAttribute()] private float DurationField; [System.Runtime.Serialization.OptionalFieldAttribute()] private int FlightIDField; - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string FromCityShortNameField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private string NameField; [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.DateTime StartTimeField; + private Plattform.AirlineService.Airport OriginField; [System.Runtime.Serialization.OptionalFieldAttribute()] - private string ToCityShortNameField; + private System.DateTime StartTimeField; [global::System.ComponentModel.BrowsableAttribute(false)] public System.Runtime.Serialization.ExtensionDataObject ExtensionData { @@ -66,6 +66,19 @@ namespace Plattform.AirlineService { } } + [System.Runtime.Serialization.DataMemberAttribute()] + public Plattform.AirlineService.Airport Destination { + get { + return this.DestinationField; + } + set { + if ((object.ReferenceEquals(this.DestinationField, value) != true)) { + this.DestinationField = value; + this.RaisePropertyChanged("Destination"); + } + } + } + [System.Runtime.Serialization.DataMemberAttribute()] public float Duration { get { @@ -92,19 +105,6 @@ namespace Plattform.AirlineService { } } - [System.Runtime.Serialization.DataMemberAttribute()] - public string FromCityShortName { - get { - return this.FromCityShortNameField; - } - set { - if ((object.ReferenceEquals(this.FromCityShortNameField, value) != true)) { - this.FromCityShortNameField = value; - this.RaisePropertyChanged("FromCityShortName"); - } - } - } - [System.Runtime.Serialization.DataMemberAttribute()] public string Name { get { @@ -118,6 +118,19 @@ namespace Plattform.AirlineService { } } + [System.Runtime.Serialization.DataMemberAttribute()] + public Plattform.AirlineService.Airport Origin { + get { + return this.OriginField; + } + set { + if ((object.ReferenceEquals(this.OriginField, value) != true)) { + this.OriginField = value; + this.RaisePropertyChanged("Origin"); + } + } + } + [System.Runtime.Serialization.DataMemberAttribute()] public System.DateTime StartTime { get { @@ -131,19 +144,6 @@ namespace Plattform.AirlineService { } } - [System.Runtime.Serialization.DataMemberAttribute()] - public string ToCityShortName { - get { - return this.ToCityShortNameField; - } - set { - if ((object.ReferenceEquals(this.ToCityShortNameField, value) != true)) { - this.ToCityShortNameField = value; - this.RaisePropertyChanged("ToCityShortName"); - } - } - } - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; protected void RaisePropertyChanged(string propertyName) { @@ -215,15 +215,175 @@ namespace Plattform.AirlineService { } } + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] + [System.Runtime.Serialization.DataContractAttribute(Name="Airport", Namespace="http://schemas.datacontract.org/2004/07/AirlineServer.Models")] + [System.SerializableAttribute()] + public partial class Airport : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { + + [System.NonSerializedAttribute()] + private System.Runtime.Serialization.ExtensionDataObject extensionDataField; + + [System.Runtime.Serialization.OptionalFieldAttribute()] + private Plattform.AirlineService.City CityField; + + [System.Runtime.Serialization.OptionalFieldAttribute()] + private string NameField; + + [System.Runtime.Serialization.OptionalFieldAttribute()] + private string ShortNameField; + + [global::System.ComponentModel.BrowsableAttribute(false)] + public System.Runtime.Serialization.ExtensionDataObject ExtensionData { + get { + return this.extensionDataField; + } + set { + this.extensionDataField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Plattform.AirlineService.City City { + get { + return this.CityField; + } + set { + if ((object.ReferenceEquals(this.CityField, value) != true)) { + this.CityField = value; + this.RaisePropertyChanged("City"); + } + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Name { + get { + return this.NameField; + } + set { + if ((object.ReferenceEquals(this.NameField, value) != true)) { + this.NameField = value; + this.RaisePropertyChanged("Name"); + } + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string ShortName { + get { + return this.ShortNameField; + } + set { + if ((object.ReferenceEquals(this.ShortNameField, value) != true)) { + this.ShortNameField = value; + this.RaisePropertyChanged("ShortName"); + } + } + } + + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; + + protected void RaisePropertyChanged(string propertyName) { + System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; + if ((propertyChanged != null)) { + propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] + [System.Runtime.Serialization.DataContractAttribute(Name="City", Namespace="http://schemas.datacontract.org/2004/07/AirlineServer.Models")] + [System.SerializableAttribute()] + public partial class City : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { + + [System.NonSerializedAttribute()] + private System.Runtime.Serialization.ExtensionDataObject extensionDataField; + + [System.Runtime.Serialization.OptionalFieldAttribute()] + private int CityIDField; + + [System.Runtime.Serialization.OptionalFieldAttribute()] + private string NameField; + + [System.Runtime.Serialization.OptionalFieldAttribute()] + private int ZipCodeField; + + [global::System.ComponentModel.BrowsableAttribute(false)] + public System.Runtime.Serialization.ExtensionDataObject ExtensionData { + get { + return this.extensionDataField; + } + set { + this.extensionDataField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public int CityID { + get { + return this.CityIDField; + } + set { + if ((this.CityIDField.Equals(value) != true)) { + this.CityIDField = value; + this.RaisePropertyChanged("CityID"); + } + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Name { + get { + return this.NameField; + } + set { + if ((object.ReferenceEquals(this.NameField, value) != true)) { + this.NameField = value; + this.RaisePropertyChanged("Name"); + } + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public int ZipCode { + get { + return this.ZipCodeField; + } + set { + if ((this.ZipCodeField.Equals(value) != true)) { + this.ZipCodeField = value; + this.RaisePropertyChanged("ZipCode"); + } + } + } + + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; + + protected void RaisePropertyChanged(string propertyName) { + System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; + if ((propertyChanged != null)) { + propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); + } + } + } + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] [System.ServiceModel.ServiceContractAttribute(ConfigurationName="AirlineService.IAirlineService")] public interface IAirlineService { - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAirlineService/GetFreeFlights", ReplyAction="http://tempuri.org/IAirlineService/GetFreeFlightsResponse")] - Plattform.AirlineService.Flight[] GetFreeFlights(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAirlineService/GetFlights", ReplyAction="http://tempuri.org/IAirlineService/GetFlightsResponse")] + Plattform.AirlineService.Flight[][] GetFlights(System.DateTime startTime, System.DateTime endTime, string origin, string destination, int numberOfSeats); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAirlineService/GetFreeFlights", ReplyAction="http://tempuri.org/IAirlineService/GetFreeFlightsResponse")] - System.Threading.Tasks.Task GetFreeFlightsAsync(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAirlineService/GetFlights", ReplyAction="http://tempuri.org/IAirlineService/GetFlightsResponse")] + System.Threading.Tasks.Task GetFlightsAsync(System.DateTime startTime, System.DateTime endTime, string origin, string destination, int numberOfSeats); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAirlineService/BookFlight", ReplyAction="http://tempuri.org/IAirlineService/BookFlightResponse")] + Plattform.AirlineService.Flight BookFlight(Plattform.AirlineService.Flight flight, int numberOfSeats); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAirlineService/BookFlight", ReplyAction="http://tempuri.org/IAirlineService/BookFlightResponse")] + System.Threading.Tasks.Task BookFlightAsync(Plattform.AirlineService.Flight flight, int numberOfSeats); } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -253,12 +413,20 @@ namespace Plattform.AirlineService { base(binding, remoteAddress) { } - public Plattform.AirlineService.Flight[] GetFreeFlights() { - return base.Channel.GetFreeFlights(); + public Plattform.AirlineService.Flight[][] GetFlights(System.DateTime startTime, System.DateTime endTime, string origin, string destination, int numberOfSeats) { + return base.Channel.GetFlights(startTime, endTime, origin, destination, numberOfSeats); } - public System.Threading.Tasks.Task GetFreeFlightsAsync() { - return base.Channel.GetFreeFlightsAsync(); + public System.Threading.Tasks.Task GetFlightsAsync(System.DateTime startTime, System.DateTime endTime, string origin, string destination, int numberOfSeats) { + return base.Channel.GetFlightsAsync(startTime, endTime, origin, destination, numberOfSeats); + } + + public Plattform.AirlineService.Flight BookFlight(Plattform.AirlineService.Flight flight, int numberOfSeats) { + return base.Channel.BookFlight(flight, numberOfSeats); + } + + public System.Threading.Tasks.Task BookFlightAsync(Plattform.AirlineService.Flight flight, int numberOfSeats) { + return base.Channel.BookFlightAsync(flight, numberOfSeats); } } }