Skip to content
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

use link instead of fulfilment and use contact info #27

Merged
merged 2 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 6 additions & 17 deletions proto/cmp/services/accommodation/v1alpha/property_types.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ syntax = "proto3";

package cmp.services.accommodation.v1alpha;

import "cmp/types/v1alpha/address.proto";
import "cmp/types/v1alpha/amenity.proto";
import "cmp/types/v1alpha/bed.proto";
import "cmp/types/v1alpha/contact_info.proto";
import "cmp/types/v1alpha/description.proto";
import "cmp/types/v1alpha/email.proto";
import "cmp/types/v1alpha/file.proto";
import "cmp/types/v1alpha/location.proto";
import "cmp/types/v1alpha/meal_plan.proto";
import "cmp/types/v1alpha/phone.proto";
import "cmp/types/v1alpha/product_code.proto";
import "cmp/types/v1alpha/product_status.proto";
import "cmp/types/v1alpha/service_fact.proto";
Expand Down Expand Up @@ -44,27 +42,18 @@ message Property {
// Ex: CategoryUnit.CATEGORY_UNIT_PALMS
CategoryUnit category_unit = 7;

// Ex: Address type
cmp.types.v1alpha.Address address = 8;

// Emails
repeated cmp.types.v1alpha.Email emails = 9;

// Phones
repeated cmp.types.v1alpha.Phone phones = 10;
// Contact Info: phone, address, email, links
cmp.types.v1alpha.ContactInfo contact_info = 8;

// Location coordinate
cmp.types.v1alpha.Coordinates coordinates = 11;

// Ex: "www.hotel.com"
string website = 12;
cmp.types.v1alpha.Coordinates coordinates = 9;

// Status of the property
cmp.types.v1alpha.ProductStatus status = 13;
cmp.types.v1alpha.ProductStatus status = 10;

// Airports
// Ex: ["PMI", "ZRH", "AYT"]
repeated string airports = 14;
repeated string airports = 11;
}

enum CategoryRating {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "cmp/types/v1alpha/bookability.proto";
import "cmp/types/v1alpha/cancel_policy.proto";
import "cmp/types/v1alpha/change_policy.proto";
import "cmp/types/v1alpha/datetime_range.proto";
import "cmp/types/v1alpha/fulfillment.proto";
import "cmp/types/v1alpha/link.proto";
import "cmp/types/v1alpha/price.proto";
import "cmp/types/v1alpha/rate.proto";

Expand Down Expand Up @@ -46,8 +46,8 @@ message TransportSearchResult {
// Rate Rules
repeated cmp.types.v1alpha.RateRule rate_rules = 7;

// Fulfillment
repeated cmp.types.v1alpha.Fulfillment fulfillments = 8;
// Links
repeated cmp.types.v1alpha.Link links = 8;

// Status of the result, whether it is immediately bookable or not
cmp.types.v1alpha.Bookability bookability = 9;
Expand Down
26 changes: 0 additions & 26 deletions proto/cmp/types/v1alpha/fulfillment.proto

This file was deleted.

8 changes: 3 additions & 5 deletions proto/cmp/types/v1alpha/traveller.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ syntax = "proto3";

package cmp.types.v1alpha;

import "cmp/types/v1alpha/contact_info.proto";
import "cmp/types/v1alpha/country.proto";
import "cmp/types/v1alpha/date.proto";
import "cmp/types/v1alpha/document.proto";
import "cmp/types/v1alpha/email.proto";
import "cmp/types/v1alpha/phone.proto";

// Traveller
//
Expand Down Expand Up @@ -65,9 +64,8 @@ message ExtensiveTraveller {
// into first_name: John, first_name: Roger, surname: Stephens, surname: Legend.
repeated string first_names = 3;
repeated string surnames = 4;
cmp.types.v1alpha.Phone phone = 5;
cmp.types.v1alpha.Email email = 6;
repeated cmp.types.v1alpha.Document documents = 7;
cmp.types.v1alpha.ContactInfo contact_info = 5;
repeated cmp.types.v1alpha.Document documents = 6;
}

// Gender Type
Expand Down