@restorecommerce/protos 2.0.2 → 3.0.1

package/CHANGELOG.md

@@ -3,6 +3,342 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.1](https://github.com/restorecommerce/libs/compare/@restorecommerce/protos@3.0.0...@restorecommerce/protos@3.0.1) (2023-05-29)
+
+
+### Bug Fixes
+
+* **protos:** pluralize rendering proto ([f1f2afa](https://github.com/restorecommerce/libs/commit/f1f2afaa47755be6ba34fafda157ee797d2cb9fb))
+
+
+
+
+
+# [3.0.0](https://github.com/restorecommerce/libs/compare/@restorecommerce/protos@2.0.2...@restorecommerce/protos@3.0.0) (2023-05-22)
+
+
+### Bug Fixes
+
+* **address, fulfillment, product:** fix naming and complete fulfillment calls ([5c720e6](https://github.com/restorecommerce/libs/commit/5c720e67ddbbe21875029b9c3d0d5f6589746401))
+* **facade:** renamed service in protos and removed service names options from proto files, fixed typing issues. ([25a24f0](https://github.com/restorecommerce/libs/commit/25a24f063e2499c06c171f1265297500816879f2))
+* **generated src:** re-generate ts.prototypes after merge! ([46d9f26](https://github.com/restorecommerce/libs/commit/46d9f26a2457e2dc1d2b8eb1b59d76da60ca2643))
+* **protos:** Added optional fields for request object ([e1374fd](https://github.com/restorecommerce/libs/commit/e1374fd90dddb16c109f4353efdfec995b526b69))
+* **protos:** Added optional fields for request object ([ba0f6bb](https://github.com/restorecommerce/libs/commit/ba0f6bb4d031b1838d44f480ea242efa352c4923))
+* **protos:** removed self reference Attribute from proto file ([4346cc5](https://github.com/restorecommerce/libs/commit/4346cc5997bafc429a7229ed0471a6e84bd169c4))
+* **protos:** restore nested attribute as its referenced in obligation masked properties in ACS ([d6536f9](https://github.com/restorecommerce/libs/commit/d6536f96dfc30eb1905c899af519d50778e2edee))
+* **rc-grpc-clients, facade:** WIP optional fields ([98f0977](https://github.com/restorecommerce/libs/commit/98f097730503bd0fa021bc886ba55d477dafb89f))
+
+
+* Feature/product appendix (#48) ([cb00636](https://github.com/restorecommerce/libs/commit/cb00636d6c98286e2fd923b229ab950f6201c760)), closes [#48](https://github.com/restorecommerce/libs/issues/48)
+* Integration (rebased) (#47) ([718fa5f](https://github.com/restorecommerce/libs/commit/718fa5f8edfc56e2968c0cb3704eda2855fdee0c)), closes [#47](https://github.com/restorecommerce/libs/issues/47)
+
+
+### BREAKING CHANGES
+
+* Fixing service names, remove Identifier, add autoresolvers
+
+commit 29d59c01a8114e2525101432649dcf2130e4c285
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 14:11:26 2023 +0200
+
+    fix package.json typo
+
+commit 1b6cf98744114f7597e1e251860c5c6665225693
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 14:04:48 2023 +0200
+
+    remove experimental index.ts for generated code
+
+commit f3ef433341cbf757945f2380620e21463a345f9b
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 14:04:06 2023 +0200
+
+    remove experimental index.ts for generated code
+
+commit 0d9949dab1c6f577100ab0a18f32174ecfa76580
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 13:55:50 2023 +0200
+
+    order CancelRequestList not required
+
+commit 0379566af99f2e4eed1c843b7d622a20adc1777b
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 13:03:08 2023 +0200
+
+    regenerate prototypes
+
+commit efe2c06a323b99471c69f04d2e05cfc4e85bb3ff
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 13:03:08 2023 +0200
+
+    feat(fulfillment, ordering and products): finalization of protos for fulfillment and ordering
+
+    Refactoreing of Product, Fulfillment, Ordering and Address Protos for a successful integration of
+    all services.
+* - Products now differentiate to physical or virtual nature
+
+commit 426e85a5782e7138b8d8c9ab61e9184be3c0f309
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 13:03:08 2023 +0200
+
+    protos before merge
+
+commit 504707f08a6f18bf4d081e4880c6cd2d7556d018
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 13:03:08 2023 +0200
+
+    remove experimental units
+
+commit 4880826237c0c14bf63feee427d0e066c21176b0
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 13:03:08 2023 +0200
+
+    units!
+
+commit fef2fc9542d465d9c92cfa1ffedcd4b374f052b0
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 13:03:08 2023 +0200
+
+    generate rc-grpc-client form local protos
+
+commit 70e72a1631662485d1a32bf9fc8da1b6c9d0039b
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 13:03:08 2023 +0200
+
+    reverse ServiceImplementation to ServiceServiceImplementation, regenerate client and server source
+
+commit ff3def942963747dcf82a24422a98a9833744573
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 13:02:03 2023 +0200
+
+    merge master into integration
+
+commit b520dba15d31b958edc30b7c912edcaa5e644e8c
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 12:59:26 2023 +0200
+
+    feat(virtual and physical products): virtual and Physical Products
+
+    Products are now differentiated as virtual or physical products by a oneof in product.nature
+* Variants of the product are now in product.nature.physical.variants, for virual
+    likewise
+
+commit 736427b382d30434b7e7c5729817c8ecd6905e8c
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 12:57:44 2023 +0200
+
+    fix rebase mistakes
+
+commit 700cba9f3cedcecdf74572c738d636974e705bc4
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 12:57:44 2023 +0200
+
+    feat(fulfillment-srv, ordering-srv): integration
+
+    Adjustments of protos for fulfillment, ordering and products according to system integration
+* Significant changes of naming and structure in proto files
+
+commit 72c6103cef3eac64bfb7df9dfbe7ea673f7b5ec5
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 12:57:44 2023 +0200
+
+    integration
+
+commit 2a9f2411e299248d83ce59b599a79c4780c78dbf
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 12:52:32 2023 +0200
+
+    refinement order.proto and fulfillment.proto for integration tests
+
+commit 79d7f5d249b41fce93083cea36220efa8a82a43b
+Author: Thomas Hoppe <thomas.hoppe@n-fuse.co>
+Date:   Thu May 4 12:52:32 2023 +0200
+
+    merge
+
+commit fdc1cceaf347b6cccf9ce6ad3f53ac94662957a8
+Author: Martin <martin.yankov@n-fuse.co>
+Date:   Thu May 4 12:42:45 2023 +0200
+
+    fix: failed unit tests
+
+commit 35baca9dd7860cc7f3695a7b875ae082293644c3
+Author: Martin <martin.yankov@n-fuse.co>
+Date:   Thu May 4 12:42:45 2023 +0200
+
+    add new line
+
+commit b6a2e5cacd72c76b40fe04402db39e678d945d8d
+Author: Martin <martin.yankov@n-fuse.co>
+Date:   Thu May 4 12:42:45 2023 +0200
+
+    removed: unnused packages
+
+commit f38eab382fc437199ba738e5a4e49d6ccc775a14
+Author: Martin <martin.yankov@n-fuse.co>
+Date:   Thu May 4 12:42:45 2023 +0200
+
+    removed: getTokenForRequest
+
+commit c78bc1bdc05373196be540c1d39c287b3614c7b7
+Author: Martin <martin.yankov@n-fuse.co>
+Date:   Thu May 4 12:42:45 2023 +0200
+
+    fixed: unknown type error
+
+commit 1a35d3f9512e04c6a046f8fdcc819badf8f20abc
+Author: Martin <martin.yankov@n-fuse.co>
+Date:   Thu May 4 12:42:45 2023 +0200
+
+    koaMiddleware
+
+commit 6dfa4c597d2c0ed8e2155952f7f7e423ec03d001
+Author: Martin <martin.yankov@n-fuse.co>
+Date:   Thu May 4 12:42:45 2023 +0200
+
+    changes for ApolloServer 4 migration
+
+commit d3a828f5529f77901ba30ca1379a742b5b95aed0
+Author: Martin <martin.yankov@n-fuse.co>
+Date:   Thu May 4 12:42:45 2023 +0200
+
+    chore: upgrade Apollo Server 4
+
+commit b78164619c185b695fdf95104799f294d76939a4
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 12:37:51 2023 +0200
+
+    regenerate rc-qrpc-client
+
+commit 98933a41c1844de517baea5099afe95794445652
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 12:34:56 2023 +0200
+
+    feat(fulfillment-srv, ordering-srv): integration
+
+    Adjustments of protos for fulfillment, ordering and products according to system integration
+* Significant changes of naming and structure in proto files
+
+commit 9d52ddcc030c67f620649d823748dbf2c846d798
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 12:33:51 2023 +0200
+
+    integration
+
+commit 033e6dd6f9e4f3809100bd50843393b8d4bce8f2
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 12:30:13 2023 +0200
+
+    fulfillment protos final
+
+commit 324e81a5bf20176801a679a19a8f120c581bd23e
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 12:30:13 2023 +0200
+
+    fulfillment protos final?
+
+commit 3352058e9a62c3fbd1104b69bfb9fbdd5e2670ec
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 12:25:57 2023 +0200
+
+    persistent address
+
+commit 14dab0e4bfd6a17af2b45f0be6a8e1719f0370b8
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 12:24:21 2023 +0200
+
+    oneof resolver
+
+commit 22eca03374745b73f1a26b94d1d5dd09e87e27cb
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 12:22:53 2023 +0200
+
+    add submit fulfillment
+
+commit 1a626529635f6167f8519e07208ec1ccdae34e33
+Author: Gerald Baulig <gerald.baulig@n-fuse.co>
+Date:   Thu May 4 12:17:55 2023 +0200
+
+    refinement order.proto and fulfillment.proto for integration tests
+
+* refactor(rename productappendix to file): rename productApenndix to file
+
+ProductAppendix -> File
+
+* fix(product.proto): import file.proto
+
+import file.proto
+* Significant changes of naming and structure in proto files
+
+* regenerate rc-qrpc-client
+
+* chore: upgrade Apollo Server 4
+
+* changes for ApolloServer 4 migration
+
+* koaMiddleware
+
+* fixed: unknown type error
+
+* removed: getTokenForRequest
+
+* removed: unnused packages
+
+* add new line
+
+* fix: failed unit tests
+
+* merge
+
+* refinement order.proto and fulfillment.proto for integration tests
+
+* integration
+
+* feat(fulfillment-srv, ordering-srv): integration
+
+Adjustments of protos for fulfillment, ordering and products according to system integration
+* Significant changes of naming and structure in proto files
+
+* fix rebase mistakes
+
+* feat(virtual and physical products): virtual and Physical Products
+
+Products are now differentiated as virtual or physical products by a oneof in product.nature
+* Variants of the product are now in product.nature.physical.variants, for virual
+likewise
+
+* merge master into integration
+
+* reverse ServiceImplementation to ServiceServiceImplementation, regenerate client and server source
+
+* generate rc-grpc-client form local protos
+
+* units!
+
+* remove experimental units
+
+* protos before merge
+
+* feat(fulfillment, ordering and products): finalization of protos for fulfillment and ordering
+
+Refactoreing of Product, Fulfillment, Ordering and Address Protos for a successful integration of
+all services.
+* - Products now differentiate to physical or virtual nature
+
+* regenerate prototypes
+
+* order CancelRequestList not required
+
+* remove experimental index.ts for generated code
+
+* remove experimental index.ts for generated code
+
+* fix package.json typo
+
+
+
+
+
 ## [2.0.2](https://github.com/restorecommerce/libs/compare/@restorecommerce/protos@2.0.1...@restorecommerce/protos@2.0.2) (2022-11-16)
 
 

package/google/protobuf/timestamp.proto

@@ -0,0 +1,147 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+package google.protobuf;
+
+option csharp_namespace = "Google.Protobuf.WellKnownTypes";
+option cc_enable_arenas = true;
+option go_package = "google.golang.org/protobuf/types/known/timestamppb";
+option java_package = "com.google.protobuf";
+option java_outer_classname = "TimestampProto";
+option java_multiple_files = true;
+option objc_class_prefix = "GPB";
+
+// A Timestamp represents a point in time independent of any time zone or local
+// calendar, encoded as a count of seconds and fractions of seconds at
+// nanosecond resolution. The count is relative to an epoch at UTC midnight on
+// January 1, 1970, in the proleptic Gregorian calendar which extends the
+// Gregorian calendar backwards to year one.
+//
+// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
+// second table is needed for interpretation, using a [24-hour linear
+// smear](https://developers.google.com/time/smear).
+//
+// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
+// restricting to that range, we ensure that we can convert to and from [RFC
+// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings.
+//
+// # Examples
+//
+// Example 1: Compute Timestamp from POSIX `time()`.
+//
+//     Timestamp timestamp;
+//     timestamp.set_seconds(time(NULL));
+//     timestamp.set_nanos(0);
+//
+// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
+//
+//     struct timeval tv;
+//     gettimeofday(&tv, NULL);
+//
+//     Timestamp timestamp;
+//     timestamp.set_seconds(tv.tv_sec);
+//     timestamp.set_nanos(tv.tv_usec * 1000);
+//
+// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
+//
+//     FILETIME ft;
+//     GetSystemTimeAsFileTime(&ft);
+//     UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
+//
+//     // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
+//     // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
+//     Timestamp timestamp;
+//     timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
+//     timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
+//
+// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
+//
+//     long millis = System.currentTimeMillis();
+//
+//     Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
+//         .setNanos((int) ((millis % 1000) * 1000000)).build();
+//
+//
+// Example 5: Compute Timestamp from Java `Instant.now()`.
+//
+//     Instant now = Instant.now();
+//
+//     Timestamp timestamp =
+//         Timestamp.newBuilder().setSeconds(now.getEpochSecond())
+//             .setNanos(now.getNano()).build();
+//
+//
+// Example 6: Compute Timestamp from current time in Python.
+//
+//     timestamp = Timestamp()
+//     timestamp.GetCurrentTime()
+//
+// # JSON Mapping
+//
+// In JSON format, the Timestamp type is encoded as a string in the
+// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the
+// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z"
+// where {year} is always expressed using four digits while {month}, {day},
+// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
+// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
+// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
+// is required. A proto3 JSON serializer should always use UTC (as indicated by
+// "Z") when printing the Timestamp type and a proto3 JSON parser should be
+// able to accept both UTC and other timezones (as indicated by an offset).
+//
+// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
+// 01:30 UTC on January 15, 2017.
+//
+// In JavaScript, one can convert a Date object to this format using the
+// standard
+// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
+// method. In Python, a standard `datetime.datetime` object can be converted
+// to this format using
+// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
+// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
+// the Joda Time's [`ISODateTimeFormat.dateTime()`](
+// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
+// ) to obtain a formatter capable of generating timestamps in this format.
+//
+//
+message Timestamp {
+  // Represents seconds of UTC time since Unix epoch
+  // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
+  // 9999-12-31T23:59:59Z inclusive.
+  int64 seconds = 1;
+
+  // Non-negative fractions of a second at nanosecond resolution. Negative
+  // second values with fractions must still have non-negative nanos values
+  // that count forward in time. Must be from 0 to 999,999,999
+  // inclusive.
+  int32 nanos = 2;
+}

package/io/restorecommerce/access_control.proto

@@ -34,20 +34,18 @@ message Response {
     INDETERMINATE = 3;
   }
   Decision decision = 1;
-  repeated io.restorecommerce.attribute.Attribute obligation = 2;
+  repeated io.restorecommerce.attribute.Attribute obligations = 2;
   bool evaluation_cacheable = 3;
   io.restorecommerce.status.OperationStatus operation_status = 4;
 }
 
 message ReverseQuery {
   repeated io.restorecommerce.policy_set.PolicySetRQ policy_sets = 1;
-  repeated io.restorecommerce.attribute.Attribute obligation = 2;
+  repeated io.restorecommerce.attribute.Attribute obligations = 2;
   io.restorecommerce.status.OperationStatus operation_status = 3;
 }
 
-service Service {
-  option (io.restorecommerce.options.service_name) = "access_control";
-
+service AccessControlService {
   rpc IsAllowed (Request) returns (Response) {
     option (io.restorecommerce.options.is_query) = true;
   };

package/io/restorecommerce/address.proto

@@ -14,9 +14,7 @@ import "io/restorecommerce/country.proto";
 /*
 * Microservice definition.
 */
-service Service {
-  option (io.restorecommerce.options.service_name) = "address";
-
+service AddressService {
   rpc Read (io.restorecommerce.resourcebase.ReadRequest) returns (AddressListResponse) {
     option (io.restorecommerce.options.is_query) = true;
   };
@@ -32,7 +30,7 @@ message Deleted {
 
 message AddressList {
   repeated Address items = 1;
-  uint32 total_count = 2;
+  optional uint32 total_count = 2;
   io.restorecommerce.auth.Subject subject = 3;
 }
 
@@ -48,46 +46,37 @@ message AddressResponse {
 }
 
 message GeoPoint {
-  double latitude = 1;
-  double longitude = 2;
+  optional double latitude = 1;
+  optional double longitude = 2;
 }
 
 message AddressAddition {
-  string field1 = 1;
-  string field2 = 2;
+  optional string field1 = 1;
+  optional string field2 = 2;
 }
 
 message BusinessAddress {
-  string name = 1;
+  optional string name = 1;
 }
 
 message ResidentialAddress {
-  string title = 1;
-  string given_name = 2;
-  string mid_name = 3;
-  string family_name = 4;
+  optional string title = 1;
+  optional string given_name = 2;
+  optional string mid_name = 3;
+  optional string family_name = 4;
 }
 
 message PackStation {
-  string provider = 1;
-  string station_number = 2;
-  string post_number = 3;
-}
-
-/**
-  Uses by Order-Srv and Fulfillment-Srv
-**/
-message ContactPerson {
-  string name = 1;
-  string email = 2;
-  string phone = 3;
+  optional string provider = 1;
+  optional string station_number = 2;
+  optional string post_number = 3;
 }
 
 message Address {
-  string id = 1;
-  io.restorecommerce.meta.Meta meta = 2;
-  string postcode = 3;
-  string country_id = 4 [
+  optional string id = 1;
+  optional io.restorecommerce.meta.Meta meta = 2;
+  optional string postcode = 3;
+  optional string country_id = 4 [
     (io.restorecommerce.options.resolver) = {
       target_type: ".io.restorecommerce.country.Country",
       target_service: "resource",
@@ -96,16 +85,28 @@ message Address {
       field_name: "country",
     }
   ];
-  string locality = 6;
-  string street = 7;
-  string region = 8;
-  GeoPoint geo_coordinates = 9;
-  double altitude = 10;
-  string building_number = 11;
-  AddressAddition address_addition = 12;
+  optional string locality = 6;
+  optional string street = 7;
+  optional string region = 8;
+  optional GeoPoint geo_coordinates = 9;
+  optional double altitude = 10;
+  optional string building_number = 11;
+  optional AddressAddition address_addition = 12;
   oneof type {
     BusinessAddress business_address = 13;
     ResidentialAddress residential_address = 14;
     PackStation pack_station = 15;
   }
-}
+}
+
+message Contact {
+  optional string name = 1;
+  optional string email = 2;
+  optional string phone = 3;
+}
+
+message ShippingAddress {
+  optional Address address = 1;
+  optional Contact contact = 2;
+  optional string comments = 3;
+}

package/io/restorecommerce/attribute.proto

@@ -3,11 +3,11 @@ syntax = "proto3";
 package io.restorecommerce.attribute;
 
 message Attribute {
-  string id = 1;
-  string value = 2;
-  repeated Attribute attribute = 3;
+  optional string id = 1;
+  optional string value = 2;
+  repeated Attribute attributes = 3;
 }
 
 message AttributeObj {
-  Attribute attribute = 1;
+  optional Attribute attributes = 1;
 }