-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: merge Lorem Fitsum features into Reference Implementation feeds #215
Changes from 3 commits
40bcc70
fc0ed33
bcaab68
9744042
a025713
9040df2
8971395
b3fb02d
1bf5b10
1434c67
02b005d
6d2b682
f413b6d
ead80b2
f6740c9
416b9cf
4a26fcb
368d785
d88cc7f
e831d3a
729c67a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,3 +15,26 @@ This implementation is also used as a reference implementation for the [Test Sui | |
|
||
`ApplicationHostBaseUrl: http://localhost:{PORT}` | ||
3. Now, re-run the project. You're good to go 👍 | ||
|
||
|
||
## Reference Implementation Data Generation | ||
|
||
Reference Implementation has three main uses that make it very important in the OpenActive ecosystem: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we need to do either:
My personal opinion is # 2 because OpenActive may need to broaden the meaning of "Reference Implementation" at a later date (e.g. if there are future reference implementations in other languages) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yep makes sense, I've added a comment about that. |
||
- For data publishers / booking systems: It is used to demonstrate the properties and shape of data and APIs, according to the OpenActive specifications | ||
- For data users / brokers: It is used as a trial integration where testing can be done with no ramifications | ||
- For contributors: It is used to ensure the Test Suite tests are correct and passing, for different combinations of Open Booking API features. | ||
Comment on lines
+39
to
+41
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is unbelievably useful to finally spell this out — good shout! |
||
|
||
The data for the sample feeds are generated in two places: | ||
- BookingSystem.AspNetCore/Feeds/*Feeds.cs | ||
- OpenActive.FakeDatabase.NET/Fakes/FakeBookingSystem.cs | ||
|
||
The FakeBookingSystem within OpenActive.FakeDatabase.NET acts as the interface to an example database. | ||
The example Feeds within BookingSystem.AspNetCore query this interface and translate the data to conform with the OpenActive Modelling Spec. | ||
|
||
Due to this split of functionality, the sample data in the feeds are created/transformed in both files, depending on whether they are important to booking | ||
or not. For example, `Price` is important to booking and there is generated in FakeBookingSystem at startup and stored in the in-memory database. However `Terms Of Service` is not | ||
needed for booking, and therefore is generated at request time. | ||
Comment on lines
+50
to
+52
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also appreciated! |
||
|
||
### Golden Records | ||
Golden records are randomly generated records that contain all possible fields specified by the OpenActive Modelling Specification. | ||
They are unrealistic representations of data, and the presence of all the fields should not be relied on when developing front-end representations of the data. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -644,118 +644,6 @@ await db.InsertAsync(new OrderTable | |
} | ||
} | ||
|
||
public OpenActive.NET.Place GetPlaceById(long placeId) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Moved this to FeedGenerationHelper as it doesn't really belong in FakeBookingSystem |
||
{ | ||
// Three hardcoded fake places | ||
switch (placeId) | ||
{ | ||
case 1: | ||
return new OpenActive.NET.Place | ||
{ | ||
Identifier = 1, | ||
Name = "Post-ercise Plaza", | ||
Description = "Sorting Out Your Fitness One Parcel Lift at a Time! Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", | ||
Address = new OpenActive.NET.PostalAddress | ||
{ | ||
StreetAddress = "Kings Mead House", | ||
AddressLocality = "Oxford", | ||
AddressRegion = "Oxfordshire", | ||
PostalCode = "OX1 1AA", | ||
AddressCountry = "GB" | ||
}, | ||
Geo = new OpenActive.NET.GeoCoordinates | ||
{ | ||
Latitude = (decimal?)51.7502, | ||
Longitude = (decimal?)-1.2674 | ||
}, | ||
Image = new List<OpenActive.NET.ImageObject> { | ||
new OpenActive.NET.ImageObject | ||
{ | ||
Url = new Uri("https://upload.wikimedia.org/wikipedia/commons/e/e5/Oxford_StAldates_PostOffice.jpg") | ||
}, | ||
}, | ||
Telephone = "01865 000001", | ||
Url = new Uri("https://en.wikipedia.org/wiki/Post_Office_Limited"), | ||
AmenityFeature = new List<OpenActive.NET.LocationFeatureSpecification> | ||
{ | ||
new OpenActive.NET.ChangingFacilities { Name = "Changing Facilities", Value = true }, | ||
new OpenActive.NET.Showers { Name = "Showers", Value = true }, | ||
new OpenActive.NET.Lockers { Name = "Lockers", Value = true }, | ||
new OpenActive.NET.Towels { Name = "Towels", Value = false }, | ||
new OpenActive.NET.Creche { Name = "Creche", Value = false }, | ||
new OpenActive.NET.Parking { Name = "Parking", Value = false } | ||
} | ||
}; | ||
case 2: | ||
return new OpenActive.NET.Place | ||
{ | ||
Identifier = 2, | ||
Name = "Premier Lifters", | ||
Description = "Where your Fitness Goals are Always Inn-Sight. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", | ||
Address = new OpenActive.NET.PostalAddress | ||
{ | ||
StreetAddress = "Greyfriars Court, Paradise Square", | ||
AddressLocality = "Oxford", | ||
AddressRegion = "Oxfordshire", | ||
PostalCode = "OX1 1BB", | ||
AddressCountry = "GB" | ||
}, | ||
Geo = new OpenActive.NET.GeoCoordinates | ||
{ | ||
Latitude = (decimal?)51.7504933, | ||
Longitude = (decimal?)-1.2620685 | ||
}, | ||
Image = new List<OpenActive.NET.ImageObject> { | ||
new OpenActive.NET.ImageObject | ||
{ | ||
Url = new Uri("https://upload.wikimedia.org/wikipedia/commons/5/53/Cambridge_Orchard_Park_Premier_Inn.jpg") | ||
}, | ||
}, | ||
Telephone = "01865 000002", | ||
Url = new Uri("https://en.wikipedia.org/wiki/Premier_Inn"), | ||
AmenityFeature = new List<OpenActive.NET.LocationFeatureSpecification> | ||
{ | ||
new OpenActive.NET.ChangingFacilities { Name = "Changing Facilities", Value = false }, | ||
new OpenActive.NET.Showers { Name = "Showers", Value = false }, | ||
new OpenActive.NET.Lockers { Name = "Lockers", Value = false }, | ||
new OpenActive.NET.Towels { Name = "Towels", Value = true }, | ||
new OpenActive.NET.Creche { Name = "Creche", Value = true }, | ||
new OpenActive.NET.Parking { Name = "Parking", Value = true } | ||
} | ||
}; | ||
case 3: | ||
return new OpenActive.NET.Place | ||
{ | ||
Identifier = 3, | ||
Name = "Stroll & Stretch", | ||
Description = "Casual Calisthenics in the Heart of Commerce. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", | ||
Address = new OpenActive.NET.PostalAddress | ||
{ | ||
StreetAddress = "Norfolk Street", | ||
AddressLocality = "Oxford", | ||
AddressRegion = "Oxfordshire", | ||
PostalCode = "OX1 1UU", | ||
AddressCountry = "GB" | ||
}, | ||
Geo = new OpenActive.NET.GeoCoordinates | ||
{ | ||
Latitude = (decimal?)51.749826, | ||
Longitude = (decimal?)-1.261492 | ||
}, | ||
Image = new List<OpenActive.NET.ImageObject> { | ||
new OpenActive.NET.ImageObject | ||
{ | ||
Url = new Uri("https://upload.wikimedia.org/wikipedia/commons/2/28/Westfield_Garden_State_Plaza_-_panoramio.jpg") | ||
}, | ||
}, | ||
Telephone = "01865 000003", | ||
Url = new Uri("https://en.wikipedia.org/wiki/Shopping_center"), | ||
}; | ||
default: | ||
return null; | ||
} | ||
} | ||
|
||
public async Task<(bool, FacilityUseTable, SlotTable, BookedOrderItemInfo)> GetSlotAndBookedOrderItemInfoBySlotId(Guid uuid, long? slotId) | ||
{ | ||
using (var db = await Mem.Database.OpenAsync()) | ||
|
@@ -1497,13 +1385,13 @@ private static async Task CreateFakeFacilitiesAndSlots(IDbConnection db, bool fa | |
var slotId = 0; | ||
List<(FacilityUseTable facility, List<SlotTable> slots)> facilitiesAndSlots = opportunitySeeds.Select((seed) => | ||
{ | ||
var facilityUseName = $"{Faker.Commerce.ProductMaterial()} {Faker.PickRandomParam("Sports Hall", "Swimming Pool Hall", "Running Hall", "Jumping Hall")}"; | ||
var facilityUseName = $"{Faker.Commerce.ProductMaterial()} {Faker.PickRandomParam("Sports Hall", "Squash Court", "Badminton Court", "Cricket Net")}"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These have matching facility types in the Facility Types JSONLD There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we use an enum for these, rather than string matching? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is facility type name, not the Facility Type |
||
var facility = new FacilityUseTable | ||
{ | ||
Id = seed.Id, | ||
Deleted = false, | ||
Name = facilityUseName, | ||
SellerId = Faker.Random.Bool(0.8f) ? Faker.Random.Long(1, 2) : Faker.Random.Long(3, 5), // distribution: 80% 1-2, 20% 3-5 | ||
SellerId = Faker.Random.Bool(0.8f) ? Faker.Random.Long(1, 2) : Faker.Random.Long(3, 4), // distribution: 80% 1-2, 20% 3-5 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Seller 5 is an individual seller which doesn't make sense for a facility There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Have just spotted a typo, so will fix if this current CI run passes |
||
PlaceId = Faker.PickRandom(new[] { 1, 2, 3 }) | ||
}; | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have just spotted a typo, so will fix if this current CI run passes