Replaced OperatingAirplane with Purser, added to many relationship to new model Passenger

Author: maurei

test/OpenApiClientTests/LegacyClient/RequestTests.cs

@@ -67,7 +67,7 @@ public async Task Partial_posting_resource_with_selected_relationships_produces_
  Type = FlightsResourceType.Flights,
  Relationships = new FlightRelationshipsInPostRequest
  {
- OperatingAirplane = new ToOneAirplaneRequestData()
+ Purser = new ToOneFlightAttendantRequestData()
  }
  }
  };
@@ -87,7 +87,7 @@ public async Task Partial_posting_resource_with_selected_relationships_produces_
  ""data"": {
  ""type"": ""flights"",
  ""relationships"": {
- ""operating-airplane"": {
+ ""purser"": {
  ""data"": null
  }
  }
@@ -113,7 +113,7 @@ public async Task Partial_posting_resource_produces_expected_request()
  capitalLWithStroke
  });
 
- string name = "anAirplaneName " + specialCharacters;
+ string name = "purserName " + specialCharacters;
 
  var requestDocument = new AirplanePostRequestDocument
  {
@@ -138,14 +138,14 @@ public async Task Partial_posting_resource_produces_expected_request()
  // Assert
  wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
  wrapper.Request.Method.Should().Be(HttpMethod.Post);
- wrapper.Request.RequestUri.Should().Be(HostPrefix + "airplanes");
+ wrapper.Request.RequestUri.Should().Be(HostPrefix + "pursers");
  wrapper.Request.Content.Should().NotBeNull();
  wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
  wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
 
  wrapper.RequestBody.Should().BeJson(@"{
  ""data"": {
- ""type"": ""airplanes"",
+ ""type"": ""pursers"",
  ""attributes"": {
  ""name"": """ + name + @""",
  ""serial-number"": null,
@@ -189,14 +189,14 @@ public async Task Partial_patching_resource_produces_expected_request()
  // Assert
  wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
  wrapper.Request.Method.Should().Be(HttpMethod.Patch);
- wrapper.Request.RequestUri.Should().Be(HostPrefix + $"airplanes/{airplaneId}");
+ wrapper.Request.RequestUri.Should().Be(HostPrefix + $"pursers/{airplaneId}");
  wrapper.Request.Content.Should().NotBeNull();
  wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
  wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
 
  wrapper.RequestBody.Should().BeJson(@"{
  ""data"": {
- ""type"": ""airplanes"",
+ ""type"": ""pursers"",
  ""id"": ""XUuiP"",
  ""attributes"": {
  ""serial-number"": null,
@@ -236,12 +236,12 @@ public async Task Getting_secondary_resource_produces_expected_request()
  IOpenApiClient openApiClient = new OpenApiClient(wrapper.HttpClient);
 
  // Act
- _ = await ApiResponse.TranslateAsync(async () => await openApiClient.GetFlightOperatingAirplaneAsync(flightId));
+ _ = await ApiResponse.TranslateAsync(async () => await openApiClient.GetFlightPurserAsync(flightId));
 
  // Assert
  wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
  wrapper.Request.Method.Should().Be(HttpMethod.Get);
- wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/operating-airplane");
+ wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/purser");
  wrapper.RequestBody.Should().BeNull();
  }
 
@@ -274,12 +274,12 @@ public async Task Getting_ToOne_relationship_produces_expected_request()
  IOpenApiClient openApiClient = new OpenApiClient(wrapper.HttpClient);
 
  // Act
- _ = await ApiResponse.TranslateAsync(async () => await openApiClient.GetFlightOperatingAirplaneRelationshipAsync(flightId));
+ _ = await ApiResponse.TranslateAsync(async () => await openApiClient.GetFlightPurserRelationshipAsync(flightId));
 
  // Assert
  wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
  wrapper.Request.Method.Should().Be(HttpMethod.Get);
- wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/operating-airplane");
+ wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/purser");
  wrapper.RequestBody.Should().BeNull();
  }
 
@@ -292,28 +292,28 @@ public async Task Patching_ToOne_relationship_produces_expected_request()
  using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
  IOpenApiClient openApiClient = new OpenApiClient(wrapper.HttpClient);
 
- var requestDocument = new ToOneAirplaneRequestData
+ var requestDocument = new ToOneFlightAttendantRequestData
  {
- Data = new AirplaneIdentifier
+ Data = new FlightAttendantIdentifier
  {
  Id = "bBJHu",
- Type = AirplanesResourceType.Airplanes
+ Type = FlightAttendantsResourceType.FlightAttendants
  }
  };
 
  // Act
- await openApiClient.PatchFlightOperatingAirplaneRelationshipAsync(flightId, requestDocument);
+ await openApiClient.PatchFlightPurserRelationshipAsync(flightId, requestDocument);
 
  // Assert
  wrapper.Request.Method.Should().Be(HttpMethod.Patch);
- wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/operating-airplane");
+ wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/purser");
  wrapper.Request.Content.Should().NotBeNull();
  wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
  wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
 
  wrapper.RequestBody.Should().BeJson(@"{
  ""data"": {
- ""type"": ""airplanes"",
+ ""type"": ""pursers"",
  ""id"": ""bBJHu""
  }
 }");

test/OpenApiClientTests/LegacyClient/ResponseTests.cs

@@ -27,9 +27,9 @@ public async Task Getting_resource_collection_translates_response()
  const string flightDepartsAt = "2014-11-25T00:00:00";
  const string documentMetaValue = "1";
  const string flightMetaValue = "https://api.jsonapi.net/docs/#get-flights";
- const string operatingAirplaneMetaValue = "https://jsonapi.net/api/docs/#get-flight-operating-airplane";
- const string cabinPersonnelMetaValue = "https://jsonapi.net/api/docs/#get-flight-cabin-crew-members";
  const string purserMetaValue = "https://jsonapi.net/api/docs/#get-flight-purser";
+ const string cabinPersonnelMetaValue = "https://jsonapi.net/api/docs/#get-flight-cabin-crew-members";
+ const string passengersMetaValue = "https://jsonapi.net/api/docs/#get-flight-passengers";
  const string topLevelLink = HostPrefix + "flights";
  const string flightResourceLink = topLevelLink + "/" + flightId;
 
@@ -59,13 +59,13 @@ public async Task Getting_resource_collection_translates_response()
  ]
  },
  ""relationships"": {
- ""operating-airplane"": {
+ ""purser"": {
  ""links"": {
- ""self"": """ + flightResourceLink + @"/relationships/operating-airplane"",
- ""related"": """ + flightResourceLink + @"/operating-airplane""
+ ""self"": """ + flightResourceLink + @"/relationships/purser"",
+ ""related"": """ + flightResourceLink + @"/purser""
  },
  ""meta"": {
- ""docs"": """ + operatingAirplaneMetaValue + @"""
+ ""docs"": """ + purserMetaValue + @"""
  }
  },
  ""cabin-crew-members"": {
@@ -77,13 +77,13 @@ public async Task Getting_resource_collection_translates_response()
  ""docs"": """ + cabinPersonnelMetaValue + @"""
  }
  },
- ""purser"": {
+ ""passengers"": {
  ""links"": {
- ""self"": """ + flightResourceLink + @"/relationships/purser"",
- ""related"": """ + flightResourceLink + @"/purser""
+ ""self"": """ + flightResourceLink + @"/relationships/passengers"",
+ ""related"": """ + flightResourceLink + @"/passengers""
  },
  ""meta"": {
- ""docs"": """ + purserMetaValue + @"""
+ ""docs"": """ + passengersMetaValue + @"""
  }
  }
  },
@@ -128,23 +128,23 @@ public async Task Getting_resource_collection_translates_response()
  flight.Attributes.DepartsAt.Should().Be(DateTimeOffset.Parse(flightDepartsAt, new CultureInfo("en-GB")));
  flight.Attributes.ArrivesAt.Should().Be(null);
 
- flight.Relationships.OperatingAirplane.Data.Should().BeNull();
- flight.Relationships.OperatingAirplane.Links.Self.Should().Be(flightResourceLink + "/relationships/operating-airplane");
- flight.Relationships.OperatingAirplane.Links.Related.Should().Be(flightResourceLink + "/operating-airplane");
- flight.Relationships.OperatingAirplane.Meta.Should().HaveCount(1);
- flight.Relationships.OperatingAirplane.Meta["docs"].Should().Be(operatingAirplaneMetaValue);
+ flight.Relationships.Purser.Data.Should().BeNull();
+ flight.Relationships.Purser.Links.Self.Should().Be(flightResourceLink + "/relationships/purser");
+ flight.Relationships.Purser.Links.Related.Should().Be(flightResourceLink + "/purser");
+ flight.Relationships.Purser.Meta.Should().HaveCount(1);
+ flight.Relationships.Purser.Meta["docs"].Should().Be(purserMetaValue);
 
  flight.Relationships.CabinCrewMembers.Data.Should().BeNull();
  flight.Relationships.CabinCrewMembers.Links.Self.Should().Be(flightResourceLink + "/relationships/cabin-crew-members");
  flight.Relationships.CabinCrewMembers.Links.Related.Should().Be(flightResourceLink + "/cabin-crew-members");
  flight.Relationships.CabinCrewMembers.Meta.Should().HaveCount(1);
  flight.Relationships.CabinCrewMembers.Meta["docs"].Should().Be(cabinPersonnelMetaValue);
 
- flight.Relationships.Purser.Data.Should().BeNull();
- flight.Relationships.Purser.Links.Self.Should().Be(flightResourceLink + "/relationships/purser");
- flight.Relationships.Purser.Links.Related.Should().Be(flightResourceLink + "/purser");
- flight.Relationships.Purser.Meta.Should().HaveCount(1);
- flight.Relationships.Purser.Meta["docs"].Should().Be(purserMetaValue);
+ flight.Relationships.Passengers.Data.Should().BeNull();
+ flight.Relationships.Passengers.Links.Self.Should().Be(flightResourceLink + "/relationships/passengers");
+ flight.Relationships.Passengers.Links.Related.Should().Be(flightResourceLink + "/passengers");
+ flight.Relationships.Passengers.Meta.Should().HaveCount(1);
+ flight.Relationships.Passengers.Meta["docs"].Should().Be(passengersMetaValue);
  }
 
  [Fact]
@@ -230,16 +230,16 @@ public async Task Posting_resource_translates_response()
 
  const string responseBody = @"{
  ""links"": {
- ""self"": """ + HostPrefix + @"flights/" + flightId + @"&fields[flights]&include=operating-airplane,cabin-crew-members,purser""
+ ""self"": """ + HostPrefix + @"flights/" + flightId + @"&fields[flights]&include=purser,cabin-crew-members,passengers""
  },
  ""data"": {
  ""type"": ""flights"",
  ""id"": """ + flightId + @""",
  ""relationships"": {
- ""operating-airplane"": {
+ ""purser"": {
  ""links"": {
- ""self"": """ + HostPrefix + @"flights/" + flightId + @"/relationships/operating-airplane"",
- ""related"": """ + HostPrefix + @"flights/" + flightId + @"/operating-airplane""
+ ""self"": """ + HostPrefix + @"flights/" + flightId + @"/relationships/purser"",
+ ""related"": """ + HostPrefix + @"flights/" + flightId + @"/purser""
  },
  ""data"": null
  },
@@ -255,16 +255,16 @@ public async Task Posting_resource_translates_response()
  }
  ],
  },
- ""purser"": {
+ ""passengers"": {
  ""links"": {
- ""self"": """ + HostPrefix + @"flights/" + flightId + @"/relationships/purser"",
- ""related"": """ + HostPrefix + @"flights/" + flightId + @"/purser""
+ ""self"": """ + HostPrefix + @"flights/" + flightId + @"/relationships/passengers"",
+ ""related"": """ + HostPrefix + @"flights/" + flightId + @"/passengers""
  },
- ""data"": null
+ ""data"": [ ]
  }
  },
  ""links"": {
- ""self"": """ + HostPrefix + @"flights/" + flightId + @"&fields[flights]&include=operating-airplane,cabin-crew-members,purser""
+ ""self"": """ + HostPrefix + @"flights/" + flightId + @"&fields[flights]&include=purser,cabin-crew-members,passengers""
  }
  }
 }";
@@ -280,12 +280,12 @@ public async Task Posting_resource_translates_response()
  Type = FlightsResourceType.Flights,
  Relationships = new FlightRelationshipsInPostRequest
  {
- OperatingAirplane = new ToOneAirplaneRequestData
+ Purser = new ToOneFlightAttendantRequestData
  {
- Data = new AirplaneIdentifier
+ Data = new FlightAttendantIdentifier
  {
  Id = "XxuIu",
- Type = AirplanesResourceType.Airplanes
+ Type = FlightAttendantsResourceType.FlightAttendants
  }
  }
  }
@@ -294,11 +294,11 @@ public async Task Posting_resource_translates_response()
 
  // Assert
  document.Data.Attributes.Should().BeNull();
- document.Data.Relationships.OperatingAirplane.Data.Should().BeNull();
+ document.Data.Relationships.Purser.Data.Should().BeNull();
  document.Data.Relationships.CabinCrewMembers.Data.Should().HaveCount(1);
  document.Data.Relationships.CabinCrewMembers.Data.First().Id.Should().Be(flightAttendantId);
  document.Data.Relationships.CabinCrewMembers.Data.First().Type.Should().Be(FlightAttendantsResourceType.FlightAttendants);
- document.Data.Relationships.Purser.Data.Should().BeNull();
+ document.Data.Relationships.Passengers.Data.Should().BeEmpty();
  }
 
  [Fact]
@@ -315,7 +315,7 @@ public async Task Patching_resource_with_side_effects_translates_response()
  ""type"": ""flights"",
  ""id"": """ + flightId + @""",
  ""links"": {
- ""self"": """ + HostPrefix + @"flights/" + flightId + @"&fields[flights]&include=operating-airplane,cabin-crew-members,purser""
+ ""self"": """ + HostPrefix + @"flights/" + flightId + @"&fields[flights]&include=purser,cabin-crew-members,passengers""
  }
  }
 }";
@@ -384,9 +384,9 @@ public async Task Getting_secondary_resource_translates_response()
 
  const string responseBody = @"{
  ""links"": {
- ""self"": """ + HostPrefix + @"flights/" + flightId + @"/operating-airplane"",
- ""first"": """ + HostPrefix + @"flights/" + flightId + @"/operating-airplane"",
- ""last"": """ + HostPrefix + @"flights/" + flightId + @"/operating-airplane""
+ ""self"": """ + HostPrefix + @"flights/" + flightId + @"/purser"",
+ ""first"": """ + HostPrefix + @"flights/" + flightId + @"/purser"",
+ ""last"": """ + HostPrefix + @"flights/" + flightId + @"/purser""
  },
  ""data"": null
 }";
@@ -395,7 +395,7 @@ public async Task Getting_secondary_resource_translates_response()
  IOpenApiClient openApiClient = new OpenApiClient(wrapper.HttpClient);
 
  // Act
- AirplaneSecondaryResponseDocument document = await openApiClient.GetFlightOperatingAirplaneAsync(flightId);
+ FlightAttendantSecondaryResponseDocument document = await openApiClient.GetFlightPurserAsync(flightId);
 
  // Assert
  document.Data.Should().BeNull();
@@ -430,28 +430,28 @@ public async Task Getting_ToOne_relationship_translates_response()
  {
  // Arrange
  const string flightId = "ZvuH1";
- const string operatingAirplaneId = "bBJHu";
+ const string purserId = "bBJHu";
 
  const string responseBody = @"{
  ""links"": {
- ""self"": """ + HostPrefix + @"flights/" + flightId + @"/relationships/operating-airplane"",
- ""related"": """ + HostPrefix + @"flights/" + flightId + @"/relationships/operating-airplane""
+ ""self"": """ + HostPrefix + @"flights/" + flightId + @"/relationships/purser"",
+ ""related"": """ + HostPrefix + @"flights/" + flightId + @"/relationships/purser""
  },
  ""data"": {
- ""type"": ""airplanes"",
- ""id"": """ + operatingAirplaneId + @"""
+ ""type"": ""flight-attendants"",
+ ""id"": """ + purserId + @"""
  }
 }";
 
  using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
  IOpenApiClient openApiClient = new OpenApiClient(wrapper.HttpClient);
 
  // Act
- AirplaneIdentifierResponseDocument document = await openApiClient.GetFlightOperatingAirplaneRelationshipAsync(flightId);
+ FlightAttendantIdentifierResponseDocument document = await openApiClient.GetFlightPurserRelationshipAsync(flightId);
 
  // Assert
  document.Data.Should().NotBeNull();
- document.Data.Id.Should().Be(operatingAirplaneId);
+ document.Data.Id.Should().Be(purserId);
  document.Data.Type.Should().Be(FlightAttendantsResourceType.FlightAttendants);
  }
 
@@ -463,12 +463,12 @@ public async Task Patching_ToOne_relationship_translates_response()
  IOpenApiClient openApiClient = new OpenApiClient(wrapper.HttpClient);
 
  // Act
- await openApiClient.PatchFlightOperatingAirplaneRelationshipAsync("ZvuH1", new ToOneAirplaneRequestData
+ await openApiClient.PatchFlightPurserRelationshipAsync("ZvuH1", new ToOneFlightAttendantRequestData
  {
- Data = new AirplaneIdentifier
+ Data = new FlightAttendantIdentifier
  {
  Id = "Adk2a",
- Type = AirplanesResourceType.Airplanes
+ Type = FlightAttendantsResourceType.FlightAttendants
  }
  });
  }

test/OpenApiTests/LegacyOpenApiIntegration/CabinArea.cs

@@ -0,0 +1,12 @@
+using JetBrains.Annotations;
+
+namespace OpenApiTests.LegacyOpenApiIntegration
+{
+ [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+ public enum CabinArea
+ {
+ FirstClass,
+ BusinessClass,
+ EconomyClass
+ }
+}

test/OpenApiTests/LegacyOpenApiIntegration/Flight.cs

@@ -33,13 +33,13 @@ public sealed class Flight : Identifiable<string>
  public ISet<FlightAttendant> CabinCrewMembers { get; set; }
 
  [HasOne]
- public Airplane OperatingAirplane { get; set; }
+ public FlightAttendant Purser { get; set; }
 
  [Attr]
  [NotMapped]
  public ICollection<string> ServicesOnBoard { get; set; }
 
- [HasOne]
- public FlightAttendant Purser { get; set; }
+ [HasMany]
+ public ICollection<Passenger> Passengers { get; set; }
  }
 }