Latest generation

CHANGELOG.md

@@ -1,3 +1,3 @@
 # CHANGELOG
 
-Lib version: 1.11.0-SNAPSHOT-250624143846
+Lib version: 1.11.0-SNAPSHOT-250626082235

lib/accounts.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from accounts.proto.
-//  source: accounts.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -15,8 +15,8 @@ import 'dart:core' as $core;
 import 'package:fixnum/fixnum.dart' as $fixnum;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'nsc-base.pb.dart' as $69;
+import 'nsc-base.pb.dart' as $1;
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $2;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
@@ -24,7 +24,7 @@ export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 class CreateAccountRequest extends $pb.GeneratedMessage {
   factory CreateAccountRequest({
     $core.String? name,
-    $69.NscPermission? permission,
+    $1.NscPermission? permission,
     $core.bool? jetStream,
   }) {
     final result = create();
@@ -41,7 +41,7 @@ class CreateAccountRequest extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateAccountRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'name')
-    ..aOM<$69.NscPermission>(2, _omitFieldNames ? '' : 'permission', subBuilder: $69.NscPermission.create)
+    ..aOM<$1.NscPermission>(2, _omitFieldNames ? '' : 'permission', subBuilder: $1.NscPermission.create)
     ..aOB(3, _omitFieldNames ? '' : 'jetStream', protoName: 'jetStream')
     ..hasRequiredFields = false
   ;
@@ -73,15 +73,15 @@ class CreateAccountRequest extends $pb.GeneratedMessage {
   void clearName() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $69.NscPermission get permission => $_getN(1);
+  $1.NscPermission get permission => $_getN(1);
   @$pb.TagNumber(2)
-  set permission($69.NscPermission value) => $_setField(2, value);
+  set permission($1.NscPermission value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasPermission() => $_has(1);
   @$pb.TagNumber(2)
   void clearPermission() => $_clearField(2);
   @$pb.TagNumber(2)
-  $69.NscPermission ensurePermission() => $_ensure(1);
+  $1.NscPermission ensurePermission() => $_ensure(1);
 
   @$pb.TagNumber(3)
   $core.bool get jetStream => $_getBF(2);
@@ -95,7 +95,7 @@ class CreateAccountRequest extends $pb.GeneratedMessage {
 
 class CreateAccountResult extends $pb.GeneratedMessage {
   factory CreateAccountResult({
-    $3.NatsCredentials? credentials,
+    $2.NatsCredentials? credentials,
   }) {
     final result = create();
     if (credentials != null) result.credentials = credentials;
@@ -108,7 +108,7 @@ class CreateAccountResult extends $pb.GeneratedMessage {
   factory CreateAccountResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateAccountResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.NatsCredentials>(1, _omitFieldNames ? '' : 'Credentials', protoName: 'Credentials', subBuilder: $3.NatsCredentials.create)
+    ..aOM<$2.NatsCredentials>(1, _omitFieldNames ? '' : 'Credentials', protoName: 'Credentials', subBuilder: $2.NatsCredentials.create)
     ..hasRequiredFields = false
   ;
 
@@ -131,15 +131,15 @@ class CreateAccountResult extends $pb.GeneratedMessage {
 
   /// NatsCredentials holds the configuration for interacting with Platform's NATS
   @$pb.TagNumber(1)
-  $3.NatsCredentials get credentials => $_getN(0);
+  $2.NatsCredentials get credentials => $_getN(0);
   @$pb.TagNumber(1)
-  set credentials($3.NatsCredentials value) => $_setField(1, value);
+  set credentials($2.NatsCredentials value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasCredentials() => $_has(0);
   @$pb.TagNumber(1)
   void clearCredentials() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.NatsCredentials ensureCredentials() => $_ensure(0);
+  $2.NatsCredentials ensureCredentials() => $_ensure(0);
 }
 
 /// Account Imports / Exports
@@ -227,7 +227,7 @@ class AddExportRequest extends $pb.GeneratedMessage {
 
 class AddExportResult extends $pb.GeneratedMessage {
   factory AddExportResult({
-    $3.NatsCredentials? credentials,
+    $2.NatsCredentials? credentials,
   }) {
     final result = create();
     if (credentials != null) result.credentials = credentials;
@@ -240,7 +240,7 @@ class AddExportResult extends $pb.GeneratedMessage {
   factory AddExportResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AddExportResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.NatsCredentials>(1, _omitFieldNames ? '' : 'Credentials', protoName: 'Credentials', subBuilder: $3.NatsCredentials.create)
+    ..aOM<$2.NatsCredentials>(1, _omitFieldNames ? '' : 'Credentials', protoName: 'Credentials', subBuilder: $2.NatsCredentials.create)
     ..hasRequiredFields = false
   ;
 
@@ -263,15 +263,15 @@ class AddExportResult extends $pb.GeneratedMessage {
 
   /// NatsCredentials holds the configuration for interacting with Platform's NATS
   @$pb.TagNumber(1)
-  $3.NatsCredentials get credentials => $_getN(0);
+  $2.NatsCredentials get credentials => $_getN(0);
   @$pb.TagNumber(1)
-  set credentials($3.NatsCredentials value) => $_setField(1, value);
+  set credentials($2.NatsCredentials value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasCredentials() => $_has(0);
   @$pb.TagNumber(1)
   void clearCredentials() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.NatsCredentials ensureCredentials() => $_ensure(0);
+  $2.NatsCredentials ensureCredentials() => $_ensure(0);
 }
 
 class AddImportRequest extends $pb.GeneratedMessage {
@@ -346,7 +346,7 @@ class AddImportRequest extends $pb.GeneratedMessage {
 
 class AddImportResult extends $pb.GeneratedMessage {
   factory AddImportResult({
-    $3.NatsCredentials? credentials,
+    $2.NatsCredentials? credentials,
   }) {
     final result = create();
     if (credentials != null) result.credentials = credentials;
@@ -359,7 +359,7 @@ class AddImportResult extends $pb.GeneratedMessage {
   factory AddImportResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AddImportResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.NatsCredentials>(1, _omitFieldNames ? '' : 'Credentials', protoName: 'Credentials', subBuilder: $3.NatsCredentials.create)
+    ..aOM<$2.NatsCredentials>(1, _omitFieldNames ? '' : 'Credentials', protoName: 'Credentials', subBuilder: $2.NatsCredentials.create)
     ..hasRequiredFields = false
   ;
 
@@ -382,15 +382,15 @@ class AddImportResult extends $pb.GeneratedMessage {
 
   /// NatsCredentials holds the configuration for interacting with Platform's NATS
   @$pb.TagNumber(1)
-  $3.NatsCredentials get credentials => $_getN(0);
+  $2.NatsCredentials get credentials => $_getN(0);
   @$pb.TagNumber(1)
-  set credentials($3.NatsCredentials value) => $_setField(1, value);
+  set credentials($2.NatsCredentials value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasCredentials() => $_has(0);
   @$pb.TagNumber(1)
   void clearCredentials() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.NatsCredentials ensureCredentials() => $_ensure(0);
+  $2.NatsCredentials ensureCredentials() => $_ensure(0);
 }
 
 class DeleteExportRequest extends $pb.GeneratedMessage {
@@ -453,7 +453,7 @@ class DeleteExportRequest extends $pb.GeneratedMessage {
 
 class DeleteExportResult extends $pb.GeneratedMessage {
   factory DeleteExportResult({
-    $3.NatsCredentials? credentials,
+    $2.NatsCredentials? credentials,
   }) {
     final result = create();
     if (credentials != null) result.credentials = credentials;
@@ -466,7 +466,7 @@ class DeleteExportResult extends $pb.GeneratedMessage {
   factory DeleteExportResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteExportResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.NatsCredentials>(1, _omitFieldNames ? '' : 'Credentials', protoName: 'Credentials', subBuilder: $3.NatsCredentials.create)
+    ..aOM<$2.NatsCredentials>(1, _omitFieldNames ? '' : 'Credentials', protoName: 'Credentials', subBuilder: $2.NatsCredentials.create)
     ..hasRequiredFields = false
   ;
 
@@ -489,15 +489,15 @@ class DeleteExportResult extends $pb.GeneratedMessage {
 
   /// NatsCredentials holds the configuration for interacting with Platform's NATS
   @$pb.TagNumber(1)
-  $3.NatsCredentials get credentials => $_getN(0);
+  $2.NatsCredentials get credentials => $_getN(0);
   @$pb.TagNumber(1)
-  set credentials($3.NatsCredentials value) => $_setField(1, value);
+  set credentials($2.NatsCredentials value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasCredentials() => $_has(0);
   @$pb.TagNumber(1)
   void clearCredentials() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.NatsCredentials ensureCredentials() => $_ensure(0);
+  $2.NatsCredentials ensureCredentials() => $_ensure(0);
 }
 
 class DeleteImportRequest extends $pb.GeneratedMessage {
@@ -572,7 +572,7 @@ class DeleteImportRequest extends $pb.GeneratedMessage {
 
 class DeleteImportResult extends $pb.GeneratedMessage {
   factory DeleteImportResult({
-    $3.NatsCredentials? credentials,
+    $2.NatsCredentials? credentials,
   }) {
     final result = create();
     if (credentials != null) result.credentials = credentials;
@@ -585,7 +585,7 @@ class DeleteImportResult extends $pb.GeneratedMessage {
   factory DeleteImportResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteImportResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.NatsCredentials>(1, _omitFieldNames ? '' : 'Credentials', protoName: 'Credentials', subBuilder: $3.NatsCredentials.create)
+    ..aOM<$2.NatsCredentials>(1, _omitFieldNames ? '' : 'Credentials', protoName: 'Credentials', subBuilder: $2.NatsCredentials.create)
     ..hasRequiredFields = false
   ;
 
@@ -608,15 +608,15 @@ class DeleteImportResult extends $pb.GeneratedMessage {
 
   /// NatsCredentials holds the configuration for interacting with Platform's NATS
   @$pb.TagNumber(1)
-  $3.NatsCredentials get credentials => $_getN(0);
+  $2.NatsCredentials get credentials => $_getN(0);
   @$pb.TagNumber(1)
-  set credentials($3.NatsCredentials value) => $_setField(1, value);
+  set credentials($2.NatsCredentials value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasCredentials() => $_has(0);
   @$pb.TagNumber(1)
   void clearCredentials() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.NatsCredentials ensureCredentials() => $_ensure(0);
+  $2.NatsCredentials ensureCredentials() => $_ensure(0);
 }
 
 /// Entity read messages
@@ -668,7 +668,7 @@ class GetAccountRequest extends $pb.GeneratedMessage {
 
 class GetAccountResult extends $pb.GeneratedMessage {
   factory GetAccountResult({
-    $3.NatsCredentials? credentials,
+    $2.NatsCredentials? credentials,
   }) {
     final result = create();
     if (credentials != null) result.credentials = credentials;
@@ -681,7 +681,7 @@ class GetAccountResult extends $pb.GeneratedMessage {
   factory GetAccountResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAccountResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.NatsCredentials>(1, _omitFieldNames ? '' : 'Credentials', protoName: 'Credentials', subBuilder: $3.NatsCredentials.create)
+    ..aOM<$2.NatsCredentials>(1, _omitFieldNames ? '' : 'Credentials', protoName: 'Credentials', subBuilder: $2.NatsCredentials.create)
     ..hasRequiredFields = false
   ;
 
@@ -704,22 +704,22 @@ class GetAccountResult extends $pb.GeneratedMessage {
 
   /// NatsCredentials holds the configuration for interacting with Platform's NATS
   @$pb.TagNumber(1)
-  $3.NatsCredentials get credentials => $_getN(0);
+  $2.NatsCredentials get credentials => $_getN(0);
   @$pb.TagNumber(1)
-  set credentials($3.NatsCredentials value) => $_setField(1, value);
+  set credentials($2.NatsCredentials value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasCredentials() => $_has(0);
   @$pb.TagNumber(1)
   void clearCredentials() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.NatsCredentials ensureCredentials() => $_ensure(0);
+  $2.NatsCredentials ensureCredentials() => $_ensure(0);
 }
 
 /// Entity edition messages
 class EditAccountRequest extends $pb.GeneratedMessage {
   factory EditAccountRequest({
     $core.String? name,
-    $69.NscPermission? permission,
+    $1.NscPermission? permission,
     $core.Iterable<$core.String>? rmPerms,
     $core.bool? jetStream,
     $fixnum.Int64? diskStorage,
@@ -744,7 +744,7 @@ class EditAccountRequest extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'EditAccountRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'name')
-    ..aOM<$69.NscPermission>(2, _omitFieldNames ? '' : 'permission', subBuilder: $69.NscPermission.create)
+    ..aOM<$1.NscPermission>(2, _omitFieldNames ? '' : 'permission', subBuilder: $1.NscPermission.create)
     ..pPS(3, _omitFieldNames ? '' : 'rmPerms', protoName: 'rmPerms')
     ..aOB(4, _omitFieldNames ? '' : 'jetStream', protoName: 'jetStream')
     ..aInt64(5, _omitFieldNames ? '' : 'diskStorage', protoName: 'diskStorage')
@@ -780,15 +780,15 @@ class EditAccountRequest extends $pb.GeneratedMessage {
   void clearName() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $69.NscPermission get permission => $_getN(1);
+  $1.NscPermission get permission => $_getN(1);
   @$pb.TagNumber(2)
-  set permission($69.NscPermission value) => $_setField(2, value);
+  set permission($1.NscPermission value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasPermission() => $_has(1);
   @$pb.TagNumber(2)
   void clearPermission() => $_clearField(2);
   @$pb.TagNumber(2)
-  $69.NscPermission ensurePermission() => $_ensure(1);
+  $1.NscPermission ensurePermission() => $_ensure(1);
 
   @$pb.TagNumber(3)
   $pb.PbList<$core.String> get rmPerms => $_getList(2);
@@ -832,7 +832,7 @@ class EditAccountRequest extends $pb.GeneratedMessage {
 
 class EditAccountResult extends $pb.GeneratedMessage {
   factory EditAccountResult({
-    $3.NatsCredentials? credentials,
+    $2.NatsCredentials? credentials,
   }) {
     final result = create();
     if (credentials != null) result.credentials = credentials;
@@ -845,7 +845,7 @@ class EditAccountResult extends $pb.GeneratedMessage {
   factory EditAccountResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'EditAccountResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.NatsCredentials>(1, _omitFieldNames ? '' : 'Credentials', protoName: 'Credentials', subBuilder: $3.NatsCredentials.create)
+    ..aOM<$2.NatsCredentials>(1, _omitFieldNames ? '' : 'Credentials', protoName: 'Credentials', subBuilder: $2.NatsCredentials.create)
     ..hasRequiredFields = false
   ;
 
@@ -868,15 +868,15 @@ class EditAccountResult extends $pb.GeneratedMessage {
 
   /// NatsCredentials holds the configuration for interacting with Platform's NATS
   @$pb.TagNumber(1)
-  $3.NatsCredentials get credentials => $_getN(0);
+  $2.NatsCredentials get credentials => $_getN(0);
   @$pb.TagNumber(1)
-  set credentials($3.NatsCredentials value) => $_setField(1, value);
+  set credentials($2.NatsCredentials value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasCredentials() => $_has(0);
   @$pb.TagNumber(1)
   void clearCredentials() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.NatsCredentials ensureCredentials() => $_ensure(0);
+  $2.NatsCredentials ensureCredentials() => $_ensure(0);
 }
 
 /// Entity deletion messages
@@ -1106,7 +1106,7 @@ class ListAccountsRequest extends $pb.GeneratedMessage {
 
 class ListAccountsResult extends $pb.GeneratedMessage {
   factory ListAccountsResult({
-    $core.Iterable<$69.NamedNscCredentials>? entities,
+    $core.Iterable<$1.NamedNscCredentials>? entities,
   }) {
     final result = create();
     if (entities != null) result.entities.addAll(entities);
@@ -1119,7 +1119,7 @@ class ListAccountsResult extends $pb.GeneratedMessage {
   factory ListAccountsResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListAccountsResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$69.NamedNscCredentials>(1, _omitFieldNames ? '' : 'entities', $pb.PbFieldType.PM, subBuilder: $69.NamedNscCredentials.create)
+    ..pc<$1.NamedNscCredentials>(1, _omitFieldNames ? '' : 'entities', $pb.PbFieldType.PM, subBuilder: $1.NamedNscCredentials.create)
     ..hasRequiredFields = false
   ;
 
@@ -1141,7 +1141,7 @@ class ListAccountsResult extends $pb.GeneratedMessage {
   static ListAccountsResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $pb.PbList<$69.NamedNscCredentials> get entities => $_getList(0);
+  $pb.PbList<$1.NamedNscCredentials> get entities => $_getList(0);
 }
 
 

lib/accounts.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from accounts.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/accounts.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from accounts.proto.
-//  source: accounts.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -30,88 +30,90 @@ class AccountsClient extends $grpc.Client {
     '',
   ];
 
-  static final _$createAccount = $grpc.ClientMethod<$0.CreateAccountRequest, $0.CreateAccountResult>(
-      '/api.Accounts/CreateAccount',
-      ($0.CreateAccountRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.CreateAccountResult.fromBuffer(value));
-  static final _$getAccount = $grpc.ClientMethod<$0.GetAccountRequest, $0.GetAccountResult>(
-      '/api.Accounts/GetAccount',
-      ($0.GetAccountRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.GetAccountResult.fromBuffer(value));
-  static final _$listAccounts = $grpc.ClientMethod<$0.ListAccountsRequest, $0.ListAccountsResult>(
-      '/api.Accounts/ListAccounts',
-      ($0.ListAccountsRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.ListAccountsResult.fromBuffer(value));
-  static final _$editAccount = $grpc.ClientMethod<$0.EditAccountRequest, $0.EditAccountResult>(
-      '/api.Accounts/EditAccount',
-      ($0.EditAccountRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.EditAccountResult.fromBuffer(value));
-  static final _$deleteAccount = $grpc.ClientMethod<$0.DeleteAccountRequest, $0.DeleteAccountResult>(
-      '/api.Accounts/DeleteAccount',
-      ($0.DeleteAccountRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.DeleteAccountResult.fromBuffer(value));
-  static final _$pushAccounts = $grpc.ClientMethod<$0.PushAccountsRequest, $0.PushAccountsResult>(
-      '/api.Accounts/PushAccounts',
-      ($0.PushAccountsRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.PushAccountsResult.fromBuffer(value));
-  static final _$addExport = $grpc.ClientMethod<$0.AddExportRequest, $0.AddExportResult>(
-      '/api.Accounts/AddExport',
-      ($0.AddExportRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.AddExportResult.fromBuffer(value));
-  static final _$addImport = $grpc.ClientMethod<$0.AddImportRequest, $0.AddImportResult>(
-      '/api.Accounts/AddImport',
-      ($0.AddImportRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.AddImportResult.fromBuffer(value));
-  static final _$deleteExport = $grpc.ClientMethod<$0.DeleteExportRequest, $0.DeleteExportResult>(
-      '/api.Accounts/DeleteExport',
-      ($0.DeleteExportRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.DeleteExportResult.fromBuffer(value));
-  static final _$deleteImport = $grpc.ClientMethod<$0.DeleteImportRequest, $0.DeleteImportResult>(
-      '/api.Accounts/DeleteImport',
-      ($0.DeleteImportRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.DeleteImportResult.fromBuffer(value));
-
   AccountsClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$0.CreateAccountResult> createAccount($0.CreateAccountRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.CreateAccountResult> createAccount($0.CreateAccountRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$createAccount, request, options: options);
   }
 
-  $grpc.ResponseFuture<$0.GetAccountResult> getAccount($0.GetAccountRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.GetAccountResult> getAccount($0.GetAccountRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$getAccount, request, options: options);
   }
 
-  $grpc.ResponseFuture<$0.ListAccountsResult> listAccounts($0.ListAccountsRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ListAccountsResult> listAccounts($0.ListAccountsRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$listAccounts, request, options: options);
   }
 
-  $grpc.ResponseFuture<$0.EditAccountResult> editAccount($0.EditAccountRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.EditAccountResult> editAccount($0.EditAccountRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$editAccount, request, options: options);
   }
 
-  $grpc.ResponseFuture<$0.DeleteAccountResult> deleteAccount($0.DeleteAccountRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.DeleteAccountResult> deleteAccount($0.DeleteAccountRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$deleteAccount, request, options: options);
   }
 
-  $grpc.ResponseFuture<$0.PushAccountsResult> pushAccounts($0.PushAccountsRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.PushAccountsResult> pushAccounts($0.PushAccountsRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$pushAccounts, request, options: options);
   }
 
-  $grpc.ResponseFuture<$0.AddExportResult> addExport($0.AddExportRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AddExportResult> addExport($0.AddExportRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$addExport, request, options: options);
   }
 
-  $grpc.ResponseFuture<$0.AddImportResult> addImport($0.AddImportRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AddImportResult> addImport($0.AddImportRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$addImport, request, options: options);
   }
 
-  $grpc.ResponseFuture<$0.DeleteExportResult> deleteExport($0.DeleteExportRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.DeleteExportResult> deleteExport($0.DeleteExportRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$deleteExport, request, options: options);
   }
 
-  $grpc.ResponseFuture<$0.DeleteImportResult> deleteImport($0.DeleteImportRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.DeleteImportResult> deleteImport($0.DeleteImportRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$deleteImport, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$createAccount = $grpc.ClientMethod<$0.CreateAccountRequest, $0.CreateAccountResult>(
+      '/api.Accounts/CreateAccount',
+      ($0.CreateAccountRequest value) => value.writeToBuffer(),
+      $0.CreateAccountResult.fromBuffer);
+  static final _$getAccount = $grpc.ClientMethod<$0.GetAccountRequest, $0.GetAccountResult>(
+      '/api.Accounts/GetAccount',
+      ($0.GetAccountRequest value) => value.writeToBuffer(),
+      $0.GetAccountResult.fromBuffer);
+  static final _$listAccounts = $grpc.ClientMethod<$0.ListAccountsRequest, $0.ListAccountsResult>(
+      '/api.Accounts/ListAccounts',
+      ($0.ListAccountsRequest value) => value.writeToBuffer(),
+      $0.ListAccountsResult.fromBuffer);
+  static final _$editAccount = $grpc.ClientMethod<$0.EditAccountRequest, $0.EditAccountResult>(
+      '/api.Accounts/EditAccount',
+      ($0.EditAccountRequest value) => value.writeToBuffer(),
+      $0.EditAccountResult.fromBuffer);
+  static final _$deleteAccount = $grpc.ClientMethod<$0.DeleteAccountRequest, $0.DeleteAccountResult>(
+      '/api.Accounts/DeleteAccount',
+      ($0.DeleteAccountRequest value) => value.writeToBuffer(),
+      $0.DeleteAccountResult.fromBuffer);
+  static final _$pushAccounts = $grpc.ClientMethod<$0.PushAccountsRequest, $0.PushAccountsResult>(
+      '/api.Accounts/PushAccounts',
+      ($0.PushAccountsRequest value) => value.writeToBuffer(),
+      $0.PushAccountsResult.fromBuffer);
+  static final _$addExport = $grpc.ClientMethod<$0.AddExportRequest, $0.AddExportResult>(
+      '/api.Accounts/AddExport',
+      ($0.AddExportRequest value) => value.writeToBuffer(),
+      $0.AddExportResult.fromBuffer);
+  static final _$addImport = $grpc.ClientMethod<$0.AddImportRequest, $0.AddImportResult>(
+      '/api.Accounts/AddImport',
+      ($0.AddImportRequest value) => value.writeToBuffer(),
+      $0.AddImportResult.fromBuffer);
+  static final _$deleteExport = $grpc.ClientMethod<$0.DeleteExportRequest, $0.DeleteExportResult>(
+      '/api.Accounts/DeleteExport',
+      ($0.DeleteExportRequest value) => value.writeToBuffer(),
+      $0.DeleteExportResult.fromBuffer);
+  static final _$deleteImport = $grpc.ClientMethod<$0.DeleteImportRequest, $0.DeleteImportResult>(
+      '/api.Accounts/DeleteImport',
+      ($0.DeleteImportRequest value) => value.writeToBuffer(),
+      $0.DeleteImportResult.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.Accounts')
@@ -195,50 +197,60 @@ abstract class AccountsServiceBase extends $grpc.Service {
     return createAccount($call, await $request);
   }
 
+  $async.Future<$0.CreateAccountResult> createAccount($grpc.ServiceCall call, $0.CreateAccountRequest request);
+
   $async.Future<$0.GetAccountResult> getAccount_Pre($grpc.ServiceCall $call, $async.Future<$0.GetAccountRequest> $request) async {
     return getAccount($call, await $request);
   }
 
+  $async.Future<$0.GetAccountResult> getAccount($grpc.ServiceCall call, $0.GetAccountRequest request);
+
   $async.Future<$0.ListAccountsResult> listAccounts_Pre($grpc.ServiceCall $call, $async.Future<$0.ListAccountsRequest> $request) async {
     return listAccounts($call, await $request);
   }
 
+  $async.Future<$0.ListAccountsResult> listAccounts($grpc.ServiceCall call, $0.ListAccountsRequest request);
+
   $async.Future<$0.EditAccountResult> editAccount_Pre($grpc.ServiceCall $call, $async.Future<$0.EditAccountRequest> $request) async {
     return editAccount($call, await $request);
   }
 
+  $async.Future<$0.EditAccountResult> editAccount($grpc.ServiceCall call, $0.EditAccountRequest request);
+
   $async.Future<$0.DeleteAccountResult> deleteAccount_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAccountRequest> $request) async {
     return deleteAccount($call, await $request);
   }
 
+  $async.Future<$0.DeleteAccountResult> deleteAccount($grpc.ServiceCall call, $0.DeleteAccountRequest request);
+
   $async.Future<$0.PushAccountsResult> pushAccounts_Pre($grpc.ServiceCall $call, $async.Future<$0.PushAccountsRequest> $request) async {
     return pushAccounts($call, await $request);
   }
 
+  $async.Future<$0.PushAccountsResult> pushAccounts($grpc.ServiceCall call, $0.PushAccountsRequest request);
+
   $async.Future<$0.AddExportResult> addExport_Pre($grpc.ServiceCall $call, $async.Future<$0.AddExportRequest> $request) async {
     return addExport($call, await $request);
   }
 
+  $async.Future<$0.AddExportResult> addExport($grpc.ServiceCall call, $0.AddExportRequest request);
+
   $async.Future<$0.AddImportResult> addImport_Pre($grpc.ServiceCall $call, $async.Future<$0.AddImportRequest> $request) async {
     return addImport($call, await $request);
   }
 
+  $async.Future<$0.AddImportResult> addImport($grpc.ServiceCall call, $0.AddImportRequest request);
+
   $async.Future<$0.DeleteExportResult> deleteExport_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteExportRequest> $request) async {
     return deleteExport($call, await $request);
   }
 
+  $async.Future<$0.DeleteExportResult> deleteExport($grpc.ServiceCall call, $0.DeleteExportRequest request);
+
   $async.Future<$0.DeleteImportResult> deleteImport_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteImportRequest> $request) async {
     return deleteImport($call, await $request);
   }
 
-  $async.Future<$0.CreateAccountResult> createAccount($grpc.ServiceCall call, $0.CreateAccountRequest request);
-  $async.Future<$0.GetAccountResult> getAccount($grpc.ServiceCall call, $0.GetAccountRequest request);
-  $async.Future<$0.ListAccountsResult> listAccounts($grpc.ServiceCall call, $0.ListAccountsRequest request);
-  $async.Future<$0.EditAccountResult> editAccount($grpc.ServiceCall call, $0.EditAccountRequest request);
-  $async.Future<$0.DeleteAccountResult> deleteAccount($grpc.ServiceCall call, $0.DeleteAccountRequest request);
-  $async.Future<$0.PushAccountsResult> pushAccounts($grpc.ServiceCall call, $0.PushAccountsRequest request);
-  $async.Future<$0.AddExportResult> addExport($grpc.ServiceCall call, $0.AddExportRequest request);
-  $async.Future<$0.AddImportResult> addImport($grpc.ServiceCall call, $0.AddImportRequest request);
-  $async.Future<$0.DeleteExportResult> deleteExport($grpc.ServiceCall call, $0.DeleteExportRequest request);
   $async.Future<$0.DeleteImportResult> deleteImport($grpc.ServiceCall call, $0.DeleteImportRequest request);
+
 }

lib/accounts.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from accounts.proto.
-//  source: accounts.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/actor.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from actor.proto.
-//  source: actor.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,10 +14,10 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'partner.pb.dart' as $72;
+import 'partner.pb.dart' as $3;
-import 'repositoryShared.pb.dart' as $70;
+import 'repositoryShared.pb.dart' as $1;
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $0;
-import 'slotbooking.pb.dart' as $71;
+import 'slotbooking.pb.dart' as $2;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
@@ -25,8 +25,8 @@ export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 /// Aggregation object message
 class Actor extends $pb.GeneratedMessage {
   factory Actor({
-    $3.EventHeader? lastEventHeader,
+    $0.EventHeader? lastEventHeader,
-    $3.EntityID? iD,
+    $0.EntityID? iD,
     ActorPayload? payload,
   }) {
     final result = create();
@@ -42,8 +42,8 @@ class Actor extends $pb.GeneratedMessage {
   factory Actor.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Actor', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.EventHeader>(1, _omitFieldNames ? '' : 'LastEventHeader', protoName: 'LastEventHeader', subBuilder: $3.EventHeader.create)
+    ..aOM<$0.EventHeader>(1, _omitFieldNames ? '' : 'LastEventHeader', protoName: 'LastEventHeader', subBuilder: $0.EventHeader.create)
-    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
+    ..aOM<$0.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $0.EntityID.create)
     ..aOM<ActorPayload>(3, _omitFieldNames ? '' : 'Payload', protoName: 'Payload', subBuilder: ActorPayload.create)
     ..hasRequiredFields = false
   ;
@@ -66,26 +66,26 @@ class Actor extends $pb.GeneratedMessage {
   static Actor? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.EventHeader get lastEventHeader => $_getN(0);
+  $0.EventHeader get lastEventHeader => $_getN(0);
   @$pb.TagNumber(1)
-  set lastEventHeader($3.EventHeader value) => $_setField(1, value);
+  set lastEventHeader($0.EventHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasLastEventHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearLastEventHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.EventHeader ensureLastEventHeader() => $_ensure(0);
+  $0.EventHeader ensureLastEventHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $3.EntityID get iD => $_getN(1);
+  $0.EntityID get iD => $_getN(1);
   @$pb.TagNumber(2)
-  set iD($3.EntityID value) => $_setField(2, value);
+  set iD($0.EntityID value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasID() => $_has(1);
   @$pb.TagNumber(2)
   void clearID() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.EntityID ensureID() => $_ensure(1);
+  $0.EntityID ensureID() => $_ensure(1);
 
   @$pb.TagNumber(3)
   ActorPayload get payload => $_getN(2);
@@ -102,32 +102,32 @@ class Actor extends $pb.GeneratedMessage {
 class ActorPayload extends $pb.GeneratedMessage {
   factory ActorPayload({
     $core.String? name,
-    $70.IdType? idType,
+    $1.IdType? idType,
-    $core.Iterable<$3.MetadataElement>? metaData,
+    $core.Iterable<$0.MetadataElement>? metaData,
-    $70.Address? address,
+    $1.Address? address,
-    $70.ActorStatusStruct? status,
+    $1.ActorStatusStruct? status,
     $core.String? partnerID,
-    $70.ActorTypology? typology,
+    $1.ActorTypology? typology,
-    $70.ActorSnapshot? snapshot,
+    $1.ActorSnapshot? snapshot,
     $core.Iterable<$core.String>? emails,
     $core.Iterable<$core.String>? phones,
     $core.bool? managedStock,
     $core.String? additionalInformation,
     $core.bool? isCarrier,
-    $core.Iterable<$70.CarrierService>? carrierServices,
+    $core.Iterable<$1.CarrierService>? carrierServices,
     $core.bool? isShipToConnected,
     $core.bool? isShipFromConnected,
     $core.String? shipToPartnerAppID,
     $core.String? shipFromPartnerAppID,
-    $core.Iterable<$3.AttachmentSummary>? attachments,
+    $core.Iterable<$0.AttachmentSummary>? attachments,
     $core.int? attachmentNumber,
-    $core.Iterable<$3.ClaimSummary>? claims,
+    $core.Iterable<$0.ClaimSummary>? claims,
     $core.int? claimNumber,
     $core.String? photoURI,
     $core.Iterable<$core.String>? connectionIdentifierPrefixes,
     $core.bool? isSlotBookingEnabled,
-    $70.SiteAlias? siteAlias,
+    $1.SiteAlias? siteAlias,
-    $71.ActorAuthorisation? appointmentConstraints,
+    $2.ActorAuthorisation? appointmentConstraints,
   }) {
     final result = create();
     if (name != null) result.name = name;
@@ -167,32 +167,32 @@ class ActorPayload extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorPayload', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'Name', protoName: 'Name')
-    ..e<$70.IdType>(2, _omitFieldNames ? '' : 'IdType', $pb.PbFieldType.OE, protoName: 'IdType', defaultOrMaker: $70.IdType.IDTYPE_UNKNOWN, valueOf: $70.IdType.valueOf, enumValues: $70.IdType.values)
+    ..e<$1.IdType>(2, _omitFieldNames ? '' : 'IdType', $pb.PbFieldType.OE, protoName: 'IdType', defaultOrMaker: $1.IdType.IDTYPE_UNKNOWN, valueOf: $1.IdType.valueOf, enumValues: $1.IdType.values)
-    ..pc<$3.MetadataElement>(3, _omitFieldNames ? '' : 'MetaData', $pb.PbFieldType.PM, protoName: 'MetaData', subBuilder: $3.MetadataElement.create)
+    ..pc<$0.MetadataElement>(3, _omitFieldNames ? '' : 'MetaData', $pb.PbFieldType.PM, protoName: 'MetaData', subBuilder: $0.MetadataElement.create)
-    ..aOM<$70.Address>(4, _omitFieldNames ? '' : 'Address', protoName: 'Address', subBuilder: $70.Address.create)
+    ..aOM<$1.Address>(4, _omitFieldNames ? '' : 'Address', protoName: 'Address', subBuilder: $1.Address.create)
-    ..aOM<$70.ActorStatusStruct>(6, _omitFieldNames ? '' : 'Status', protoName: 'Status', subBuilder: $70.ActorStatusStruct.create)
+    ..aOM<$1.ActorStatusStruct>(6, _omitFieldNames ? '' : 'Status', protoName: 'Status', subBuilder: $1.ActorStatusStruct.create)
     ..aOS(7, _omitFieldNames ? '' : 'PartnerID', protoName: 'PartnerID')
-    ..e<$70.ActorTypology>(10, _omitFieldNames ? '' : 'Typology', $pb.PbFieldType.OE, protoName: 'Typology', defaultOrMaker: $70.ActorTypology.TYPOLOGY_UNKNOWN, valueOf: $70.ActorTypology.valueOf, enumValues: $70.ActorTypology.values)
+    ..e<$1.ActorTypology>(10, _omitFieldNames ? '' : 'Typology', $pb.PbFieldType.OE, protoName: 'Typology', defaultOrMaker: $1.ActorTypology.TYPOLOGY_UNKNOWN, valueOf: $1.ActorTypology.valueOf, enumValues: $1.ActorTypology.values)
-    ..aOM<$70.ActorSnapshot>(11, _omitFieldNames ? '' : 'Snapshot', protoName: 'Snapshot', subBuilder: $70.ActorSnapshot.create)
+    ..aOM<$1.ActorSnapshot>(11, _omitFieldNames ? '' : 'Snapshot', protoName: 'Snapshot', subBuilder: $1.ActorSnapshot.create)
     ..pPS(12, _omitFieldNames ? '' : 'Emails', protoName: 'Emails')
     ..pPS(13, _omitFieldNames ? '' : 'Phones', protoName: 'Phones')
     ..aOB(14, _omitFieldNames ? '' : 'ManagedStock', protoName: 'ManagedStock')
     ..aOS(15, _omitFieldNames ? '' : 'AdditionalInformation', protoName: 'AdditionalInformation')
     ..aOB(16, _omitFieldNames ? '' : 'IsCarrier', protoName: 'IsCarrier')
-    ..pc<$70.CarrierService>(17, _omitFieldNames ? '' : 'CarrierServices', $pb.PbFieldType.PM, protoName: 'CarrierServices', subBuilder: $70.CarrierService.create)
+    ..pc<$1.CarrierService>(17, _omitFieldNames ? '' : 'CarrierServices', $pb.PbFieldType.PM, protoName: 'CarrierServices', subBuilder: $1.CarrierService.create)
     ..aOB(18, _omitFieldNames ? '' : 'IsShipToConnected', protoName: 'IsShipToConnected')
     ..aOB(19, _omitFieldNames ? '' : 'IsShipFromConnected', protoName: 'IsShipFromConnected')
     ..aOS(20, _omitFieldNames ? '' : 'ShipToPartnerAppID', protoName: 'ShipToPartnerAppID')
     ..aOS(21, _omitFieldNames ? '' : 'ShipFromPartnerAppID', protoName: 'ShipFromPartnerAppID')
-    ..pc<$3.AttachmentSummary>(22, _omitFieldNames ? '' : 'Attachments', $pb.PbFieldType.PM, protoName: 'Attachments', subBuilder: $3.AttachmentSummary.create)
+    ..pc<$0.AttachmentSummary>(22, _omitFieldNames ? '' : 'Attachments', $pb.PbFieldType.PM, protoName: 'Attachments', subBuilder: $0.AttachmentSummary.create)
     ..a<$core.int>(23, _omitFieldNames ? '' : 'AttachmentNumber', $pb.PbFieldType.O3, protoName: 'AttachmentNumber')
-    ..pc<$3.ClaimSummary>(24, _omitFieldNames ? '' : 'Claims', $pb.PbFieldType.PM, protoName: 'Claims', subBuilder: $3.ClaimSummary.create)
+    ..pc<$0.ClaimSummary>(24, _omitFieldNames ? '' : 'Claims', $pb.PbFieldType.PM, protoName: 'Claims', subBuilder: $0.ClaimSummary.create)
     ..a<$core.int>(25, _omitFieldNames ? '' : 'ClaimNumber', $pb.PbFieldType.O3, protoName: 'ClaimNumber')
     ..aOS(26, _omitFieldNames ? '' : 'PhotoURI', protoName: 'PhotoURI')
     ..pPS(28, _omitFieldNames ? '' : 'ConnectionIdentifierPrefixes', protoName: 'ConnectionIdentifierPrefixes')
     ..aOB(29, _omitFieldNames ? '' : 'IsSlotBookingEnabled', protoName: 'IsSlotBookingEnabled')
-    ..aOM<$70.SiteAlias>(30, _omitFieldNames ? '' : 'SiteAlias', protoName: 'SiteAlias', subBuilder: $70.SiteAlias.create)
+    ..aOM<$1.SiteAlias>(30, _omitFieldNames ? '' : 'SiteAlias', protoName: 'SiteAlias', subBuilder: $1.SiteAlias.create)
-    ..aOM<$71.ActorAuthorisation>(31, _omitFieldNames ? '' : 'AppointmentConstraints', protoName: 'AppointmentConstraints', subBuilder: $71.ActorAuthorisation.create)
+    ..aOM<$2.ActorAuthorisation>(31, _omitFieldNames ? '' : 'AppointmentConstraints', protoName: 'AppointmentConstraints', subBuilder: $2.ActorAuthorisation.create)
     ..hasRequiredFields = false
   ;
 
@@ -224,39 +224,39 @@ class ActorPayload extends $pb.GeneratedMessage {
   void clearName() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $70.IdType get idType => $_getN(1);
+  $1.IdType get idType => $_getN(1);
   @$pb.TagNumber(2)
-  set idType($70.IdType value) => $_setField(2, value);
+  set idType($1.IdType value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasIdType() => $_has(1);
   @$pb.TagNumber(2)
   void clearIdType() => $_clearField(2);
 
   @$pb.TagNumber(3)
-  $pb.PbList<$3.MetadataElement> get metaData => $_getList(2);
+  $pb.PbList<$0.MetadataElement> get metaData => $_getList(2);
 
   @$pb.TagNumber(4)
-  $70.Address get address => $_getN(3);
+  $1.Address get address => $_getN(3);
   @$pb.TagNumber(4)
-  set address($70.Address value) => $_setField(4, value);
+  set address($1.Address value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasAddress() => $_has(3);
   @$pb.TagNumber(4)
   void clearAddress() => $_clearField(4);
   @$pb.TagNumber(4)
-  $70.Address ensureAddress() => $_ensure(3);
+  $1.Address ensureAddress() => $_ensure(3);
 
   /// Status field is not accessible from APIs
   @$pb.TagNumber(6)
-  $70.ActorStatusStruct get status => $_getN(4);
+  $1.ActorStatusStruct get status => $_getN(4);
   @$pb.TagNumber(6)
-  set status($70.ActorStatusStruct value) => $_setField(6, value);
+  set status($1.ActorStatusStruct value) => $_setField(6, value);
   @$pb.TagNumber(6)
   $core.bool hasStatus() => $_has(4);
   @$pb.TagNumber(6)
   void clearStatus() => $_clearField(6);
   @$pb.TagNumber(6)
-  $70.ActorStatusStruct ensureStatus() => $_ensure(4);
+  $1.ActorStatusStruct ensureStatus() => $_ensure(4);
 
   /// Existing PartnerID
   @$pb.TagNumber(7)
@@ -269,24 +269,24 @@ class ActorPayload extends $pb.GeneratedMessage {
   void clearPartnerID() => $_clearField(7);
 
   @$pb.TagNumber(10)
-  $70.ActorTypology get typology => $_getN(6);
+  $1.ActorTypology get typology => $_getN(6);
   @$pb.TagNumber(10)
-  set typology($70.ActorTypology value) => $_setField(10, value);
+  set typology($1.ActorTypology value) => $_setField(10, value);
   @$pb.TagNumber(10)
   $core.bool hasTypology() => $_has(6);
   @$pb.TagNumber(10)
   void clearTypology() => $_clearField(10);
 
   @$pb.TagNumber(11)
-  $70.ActorSnapshot get snapshot => $_getN(7);
+  $1.ActorSnapshot get snapshot => $_getN(7);
   @$pb.TagNumber(11)
-  set snapshot($70.ActorSnapshot value) => $_setField(11, value);
+  set snapshot($1.ActorSnapshot value) => $_setField(11, value);
   @$pb.TagNumber(11)
   $core.bool hasSnapshot() => $_has(7);
   @$pb.TagNumber(11)
   void clearSnapshot() => $_clearField(11);
   @$pb.TagNumber(11)
-  $70.ActorSnapshot ensureSnapshot() => $_ensure(7);
+  $1.ActorSnapshot ensureSnapshot() => $_ensure(7);
 
   /// Must be a valid email address
   @$pb.TagNumber(12)
@@ -326,7 +326,7 @@ class ActorPayload extends $pb.GeneratedMessage {
 
   /// List of carrier services
   @$pb.TagNumber(17)
-  $pb.PbList<$70.CarrierService> get carrierServices => $_getList(13);
+  $pb.PbList<$1.CarrierService> get carrierServices => $_getList(13);
 
   @$pb.TagNumber(18)
   $core.bool get isShipToConnected => $_getBF(14);
@@ -367,7 +367,7 @@ class ActorPayload extends $pb.GeneratedMessage {
   void clearShipFromPartnerAppID() => $_clearField(21);
 
   @$pb.TagNumber(22)
-  $pb.PbList<$3.AttachmentSummary> get attachments => $_getList(18);
+  $pb.PbList<$0.AttachmentSummary> get attachments => $_getList(18);
 
   @$pb.TagNumber(23)
   $core.int get attachmentNumber => $_getIZ(19);
@@ -379,7 +379,7 @@ class ActorPayload extends $pb.GeneratedMessage {
   void clearAttachmentNumber() => $_clearField(23);
 
   @$pb.TagNumber(24)
-  $pb.PbList<$3.ClaimSummary> get claims => $_getList(20);
+  $pb.PbList<$0.ClaimSummary> get claims => $_getList(20);
 
   @$pb.TagNumber(25)
   $core.int get claimNumber => $_getIZ(21);
@@ -413,26 +413,26 @@ class ActorPayload extends $pb.GeneratedMessage {
   void clearIsSlotBookingEnabled() => $_clearField(29);
 
   @$pb.TagNumber(30)
-  $70.SiteAlias get siteAlias => $_getN(25);
+  $1.SiteAlias get siteAlias => $_getN(25);
   @$pb.TagNumber(30)
-  set siteAlias($70.SiteAlias value) => $_setField(30, value);
+  set siteAlias($1.SiteAlias value) => $_setField(30, value);
   @$pb.TagNumber(30)
   $core.bool hasSiteAlias() => $_has(25);
   @$pb.TagNumber(30)
   void clearSiteAlias() => $_clearField(30);
   @$pb.TagNumber(30)
-  $70.SiteAlias ensureSiteAlias() => $_ensure(25);
+  $1.SiteAlias ensureSiteAlias() => $_ensure(25);
 
   @$pb.TagNumber(31)
-  $71.ActorAuthorisation get appointmentConstraints => $_getN(26);
+  $2.ActorAuthorisation get appointmentConstraints => $_getN(26);
   @$pb.TagNumber(31)
-  set appointmentConstraints($71.ActorAuthorisation value) => $_setField(31, value);
+  set appointmentConstraints($2.ActorAuthorisation value) => $_setField(31, value);
   @$pb.TagNumber(31)
   $core.bool hasAppointmentConstraints() => $_has(26);
   @$pb.TagNumber(31)
   void clearAppointmentConstraints() => $_clearField(31);
   @$pb.TagNumber(31)
-  $71.ActorAuthorisation ensureAppointmentConstraints() => $_ensure(26);
+  $2.ActorAuthorisation ensureAppointmentConstraints() => $_ensure(26);
 }
 
 enum ActorEnrichment_Content {
@@ -451,7 +451,7 @@ class ActorEnrichment extends $pb.GeneratedMessage {
     $core.String? project,
     $core.String? parentEntityName,
     $core.String? parentEntityID,
-    $72.PartnerPayload? partner,
+    $3.PartnerPayload? partner,
   }) {
     final result = create();
     if (parentEventID != null) result.parentEventID = parentEventID;
@@ -485,7 +485,7 @@ class ActorEnrichment extends $pb.GeneratedMessage {
     ..aOS(6, _omitFieldNames ? '' : 'Project', protoName: 'Project')
     ..aOS(7, _omitFieldNames ? '' : 'ParentEntityName', protoName: 'ParentEntityName')
     ..aOS(8, _omitFieldNames ? '' : 'ParentEntityID', protoName: 'ParentEntityID')
-    ..aOM<$72.PartnerPayload>(10, _omitFieldNames ? '' : 'Partner', protoName: 'Partner', subBuilder: $72.PartnerPayload.create)
+    ..aOM<$3.PartnerPayload>(10, _omitFieldNames ? '' : 'Partner', protoName: 'Partner', subBuilder: $3.PartnerPayload.create)
     ..hasRequiredFields = false
   ;
 
@@ -582,15 +582,15 @@ class ActorEnrichment extends $pb.GeneratedMessage {
   void clearParentEntityID() => $_clearField(8);
 
   @$pb.TagNumber(10)
-  $72.PartnerPayload get partner => $_getN(8);
+  $3.PartnerPayload get partner => $_getN(8);
   @$pb.TagNumber(10)
-  set partner($72.PartnerPayload value) => $_setField(10, value);
+  set partner($3.PartnerPayload value) => $_setField(10, value);
   @$pb.TagNumber(10)
   $core.bool hasPartner() => $_has(8);
   @$pb.TagNumber(10)
   void clearPartner() => $_clearField(10);
   @$pb.TagNumber(10)
-  $72.PartnerPayload ensurePartner() => $_ensure(8);
+  $3.PartnerPayload ensurePartner() => $_ensure(8);
 }
 
 class ActorTriplet extends $pb.GeneratedMessage {

lib/actor.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from actor.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/actor.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from actor.proto.
-//  source: actor.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/actorAction.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from actorAction.proto.
-//  source: actorAction.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,8 +14,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'repositoryShared.pb.dart' as $70;
+import 'repositoryShared.pb.dart' as $0;
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
@@ -25,7 +25,7 @@ export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 /// by reseting the quantity of missing stock entry for the current snapshot
 class ActorCompleteSnapshotPayload extends $pb.GeneratedMessage {
   factory ActorCompleteSnapshotPayload({
-    $70.ActorSnapshot? snapshot,
+    $0.ActorSnapshot? snapshot,
   }) {
     final result = create();
     if (snapshot != null) result.snapshot = snapshot;
@@ -38,7 +38,7 @@ class ActorCompleteSnapshotPayload extends $pb.GeneratedMessage {
   factory ActorCompleteSnapshotPayload.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorCompleteSnapshotPayload', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$70.ActorSnapshot>(1, _omitFieldNames ? '' : 'Snapshot', protoName: 'Snapshot', subBuilder: $70.ActorSnapshot.create)
+    ..aOM<$0.ActorSnapshot>(1, _omitFieldNames ? '' : 'Snapshot', protoName: 'Snapshot', subBuilder: $0.ActorSnapshot.create)
     ..hasRequiredFields = false
   ;
 
@@ -60,21 +60,21 @@ class ActorCompleteSnapshotPayload extends $pb.GeneratedMessage {
   static ActorCompleteSnapshotPayload? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $70.ActorSnapshot get snapshot => $_getN(0);
+  $0.ActorSnapshot get snapshot => $_getN(0);
   @$pb.TagNumber(1)
-  set snapshot($70.ActorSnapshot value) => $_setField(1, value);
+  set snapshot($0.ActorSnapshot value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasSnapshot() => $_has(0);
   @$pb.TagNumber(1)
   void clearSnapshot() => $_clearField(1);
   @$pb.TagNumber(1)
-  $70.ActorSnapshot ensureSnapshot() => $_ensure(0);
+  $0.ActorSnapshot ensureSnapshot() => $_ensure(0);
 }
 
 class ActorCompleteSnapshot extends $pb.GeneratedMessage {
   factory ActorCompleteSnapshot({
-    $3.CommandHeader? header,
+    $1.CommandHeader? header,
-    $3.EntityID? iD,
+    $1.EntityID? iD,
     ActorCompleteSnapshotPayload? payload,
     ActorCompleteSnapshotPayload? eventPayload,
     ActorCompleteSnapshotPayload? previousPayload,
@@ -94,8 +94,8 @@ class ActorCompleteSnapshot extends $pb.GeneratedMessage {
   factory ActorCompleteSnapshot.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorCompleteSnapshot', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.CommandHeader.create)
+    ..aOM<$1.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.CommandHeader.create)
-    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
+    ..aOM<$1.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $1.EntityID.create)
     ..aOM<ActorCompleteSnapshotPayload>(3, _omitFieldNames ? '' : 'Payload', protoName: 'Payload', subBuilder: ActorCompleteSnapshotPayload.create)
     ..aOM<ActorCompleteSnapshotPayload>(4, _omitFieldNames ? '' : 'EventPayload', protoName: 'EventPayload', subBuilder: ActorCompleteSnapshotPayload.create)
     ..aOM<ActorCompleteSnapshotPayload>(5, _omitFieldNames ? '' : 'PreviousPayload', protoName: 'PreviousPayload', subBuilder: ActorCompleteSnapshotPayload.create)
@@ -120,26 +120,26 @@ class ActorCompleteSnapshot extends $pb.GeneratedMessage {
   static ActorCompleteSnapshot? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.CommandHeader get header => $_getN(0);
+  $1.CommandHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.CommandHeader value) => $_setField(1, value);
+  set header($1.CommandHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.CommandHeader ensureHeader() => $_ensure(0);
+  $1.CommandHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $3.EntityID get iD => $_getN(1);
+  $1.EntityID get iD => $_getN(1);
   @$pb.TagNumber(2)
-  set iD($3.EntityID value) => $_setField(2, value);
+  set iD($1.EntityID value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasID() => $_has(1);
   @$pb.TagNumber(2)
   void clearID() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.EntityID ensureID() => $_ensure(1);
+  $1.EntityID ensureID() => $_ensure(1);
 
   @$pb.TagNumber(3)
   ActorCompleteSnapshotPayload get payload => $_getN(2);

lib/actorAction.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from actorAction.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/actorAction.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from actorAction.proto.
-//  source: actorAction.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/actorInput.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from actorInput.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/actorInput.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from actorInput.proto.
-//  source: actorInput.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,7 +16,7 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'actorInput.pb.dart' as $1;
+import 'actorInput.pb.dart' as $0;
 
 export 'actorInput.pb.dart';
 
@@ -32,72 +32,74 @@ class ActorInputAPIClient extends $grpc.Client {
     '',
   ];
 
-  static final _$created = $grpc.ClientMethod<$1.ActorCreatedRequest, $1.ActorCreatedResponse>(
-      '/api.ActorInputAPI/Created',
-      ($1.ActorCreatedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $1.ActorCreatedResponse.fromBuffer(value));
-  static final _$createdv2 = $grpc.ClientMethod<$1.ActorCreatedv2Request, $1.ActorCreatedv2Response>(
-      '/api.ActorInputAPI/Createdv2',
-      ($1.ActorCreatedv2Request value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $1.ActorCreatedv2Response.fromBuffer(value));
-  static final _$deleted = $grpc.ClientMethod<$1.ActorDeletedRequest, $1.ActorDeletedResponse>(
-      '/api.ActorInputAPI/Deleted',
-      ($1.ActorDeletedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $1.ActorDeletedResponse.fromBuffer(value));
-  static final _$snapshotCompleted = $grpc.ClientMethod<$1.ActorSnapshotCompletedRequest, $1.ActorSnapshotCompletedResponse>(
-      '/api.ActorInputAPI/SnapshotCompleted',
-      ($1.ActorSnapshotCompletedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $1.ActorSnapshotCompletedResponse.fromBuffer(value));
-  static final _$attachmentAdded = $grpc.ClientMethod<$1.ActorAttachmentAddedRequest, $1.ActorAttachmentAddedResponse>(
-      '/api.ActorInputAPI/AttachmentAdded',
-      ($1.ActorAttachmentAddedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $1.ActorAttachmentAddedResponse.fromBuffer(value));
-  static final _$attachmentRemoved = $grpc.ClientMethod<$1.ActorAttachmentRemovedRequest, $1.ActorAttachmentRemovedResponse>(
-      '/api.ActorInputAPI/AttachmentRemoved',
-      ($1.ActorAttachmentRemovedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $1.ActorAttachmentRemovedResponse.fromBuffer(value));
-  static final _$claimAdded = $grpc.ClientMethod<$1.ActorClaimAddedRequest, $1.ActorClaimAddedResponse>(
-      '/api.ActorInputAPI/ClaimAdded',
-      ($1.ActorClaimAddedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $1.ActorClaimAddedResponse.fromBuffer(value));
-  static final _$metaDataUpdated = $grpc.ClientMethod<$1.ActorMetaDataUpdatedRequest, $1.ActorMetaDataUpdatedResponse>(
-      '/api.ActorInputAPI/MetaDataUpdated',
-      ($1.ActorMetaDataUpdatedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $1.ActorMetaDataUpdatedResponse.fromBuffer(value));
-
   ActorInputAPIClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$1.ActorCreatedResponse> created($1.ActorCreatedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ActorCreatedResponse> created($0.ActorCreatedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$created, request, options: options);
   }
 
-  $grpc.ResponseFuture<$1.ActorCreatedv2Response> createdv2($1.ActorCreatedv2Request request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ActorCreatedv2Response> createdv2($0.ActorCreatedv2Request request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$createdv2, request, options: options);
   }
 
-  $grpc.ResponseFuture<$1.ActorDeletedResponse> deleted($1.ActorDeletedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ActorDeletedResponse> deleted($0.ActorDeletedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$deleted, request, options: options);
   }
 
-  $grpc.ResponseFuture<$1.ActorSnapshotCompletedResponse> snapshotCompleted($1.ActorSnapshotCompletedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ActorSnapshotCompletedResponse> snapshotCompleted($0.ActorSnapshotCompletedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$snapshotCompleted, request, options: options);
   }
 
-  $grpc.ResponseFuture<$1.ActorAttachmentAddedResponse> attachmentAdded($1.ActorAttachmentAddedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ActorAttachmentAddedResponse> attachmentAdded($0.ActorAttachmentAddedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$attachmentAdded, request, options: options);
   }
 
-  $grpc.ResponseFuture<$1.ActorAttachmentRemovedResponse> attachmentRemoved($1.ActorAttachmentRemovedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ActorAttachmentRemovedResponse> attachmentRemoved($0.ActorAttachmentRemovedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$attachmentRemoved, request, options: options);
   }
 
-  $grpc.ResponseFuture<$1.ActorClaimAddedResponse> claimAdded($1.ActorClaimAddedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ActorClaimAddedResponse> claimAdded($0.ActorClaimAddedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$claimAdded, request, options: options);
   }
 
-  $grpc.ResponseFuture<$1.ActorMetaDataUpdatedResponse> metaDataUpdated($1.ActorMetaDataUpdatedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ActorMetaDataUpdatedResponse> metaDataUpdated($0.ActorMetaDataUpdatedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$metaDataUpdated, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$created = $grpc.ClientMethod<$0.ActorCreatedRequest, $0.ActorCreatedResponse>(
+      '/api.ActorInputAPI/Created',
+      ($0.ActorCreatedRequest value) => value.writeToBuffer(),
+      $0.ActorCreatedResponse.fromBuffer);
+  static final _$createdv2 = $grpc.ClientMethod<$0.ActorCreatedv2Request, $0.ActorCreatedv2Response>(
+      '/api.ActorInputAPI/Createdv2',
+      ($0.ActorCreatedv2Request value) => value.writeToBuffer(),
+      $0.ActorCreatedv2Response.fromBuffer);
+  static final _$deleted = $grpc.ClientMethod<$0.ActorDeletedRequest, $0.ActorDeletedResponse>(
+      '/api.ActorInputAPI/Deleted',
+      ($0.ActorDeletedRequest value) => value.writeToBuffer(),
+      $0.ActorDeletedResponse.fromBuffer);
+  static final _$snapshotCompleted = $grpc.ClientMethod<$0.ActorSnapshotCompletedRequest, $0.ActorSnapshotCompletedResponse>(
+      '/api.ActorInputAPI/SnapshotCompleted',
+      ($0.ActorSnapshotCompletedRequest value) => value.writeToBuffer(),
+      $0.ActorSnapshotCompletedResponse.fromBuffer);
+  static final _$attachmentAdded = $grpc.ClientMethod<$0.ActorAttachmentAddedRequest, $0.ActorAttachmentAddedResponse>(
+      '/api.ActorInputAPI/AttachmentAdded',
+      ($0.ActorAttachmentAddedRequest value) => value.writeToBuffer(),
+      $0.ActorAttachmentAddedResponse.fromBuffer);
+  static final _$attachmentRemoved = $grpc.ClientMethod<$0.ActorAttachmentRemovedRequest, $0.ActorAttachmentRemovedResponse>(
+      '/api.ActorInputAPI/AttachmentRemoved',
+      ($0.ActorAttachmentRemovedRequest value) => value.writeToBuffer(),
+      $0.ActorAttachmentRemovedResponse.fromBuffer);
+  static final _$claimAdded = $grpc.ClientMethod<$0.ActorClaimAddedRequest, $0.ActorClaimAddedResponse>(
+      '/api.ActorInputAPI/ClaimAdded',
+      ($0.ActorClaimAddedRequest value) => value.writeToBuffer(),
+      $0.ActorClaimAddedResponse.fromBuffer);
+  static final _$metaDataUpdated = $grpc.ClientMethod<$0.ActorMetaDataUpdatedRequest, $0.ActorMetaDataUpdatedResponse>(
+      '/api.ActorInputAPI/MetaDataUpdated',
+      ($0.ActorMetaDataUpdatedRequest value) => value.writeToBuffer(),
+      $0.ActorMetaDataUpdatedResponse.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.ActorInputAPI')
@@ -105,102 +107,110 @@ abstract class ActorInputAPIServiceBase extends $grpc.Service {
   $core.String get $name => 'api.ActorInputAPI';
 
   ActorInputAPIServiceBase() {
-    $addMethod($grpc.ServiceMethod<$1.ActorCreatedRequest, $1.ActorCreatedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ActorCreatedRequest, $0.ActorCreatedResponse>(
         'Created',
         created_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $1.ActorCreatedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ActorCreatedRequest.fromBuffer(value),
-        ($1.ActorCreatedResponse value) => value.writeToBuffer()));
+        ($0.ActorCreatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.ActorCreatedv2Request, $1.ActorCreatedv2Response>(
+    $addMethod($grpc.ServiceMethod<$0.ActorCreatedv2Request, $0.ActorCreatedv2Response>(
         'Createdv2',
         createdv2_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $1.ActorCreatedv2Request.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ActorCreatedv2Request.fromBuffer(value),
-        ($1.ActorCreatedv2Response value) => value.writeToBuffer()));
+        ($0.ActorCreatedv2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.ActorDeletedRequest, $1.ActorDeletedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ActorDeletedRequest, $0.ActorDeletedResponse>(
         'Deleted',
         deleted_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $1.ActorDeletedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ActorDeletedRequest.fromBuffer(value),
-        ($1.ActorDeletedResponse value) => value.writeToBuffer()));
+        ($0.ActorDeletedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.ActorSnapshotCompletedRequest, $1.ActorSnapshotCompletedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ActorSnapshotCompletedRequest, $0.ActorSnapshotCompletedResponse>(
         'SnapshotCompleted',
         snapshotCompleted_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $1.ActorSnapshotCompletedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ActorSnapshotCompletedRequest.fromBuffer(value),
-        ($1.ActorSnapshotCompletedResponse value) => value.writeToBuffer()));
+        ($0.ActorSnapshotCompletedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.ActorAttachmentAddedRequest, $1.ActorAttachmentAddedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ActorAttachmentAddedRequest, $0.ActorAttachmentAddedResponse>(
         'AttachmentAdded',
         attachmentAdded_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $1.ActorAttachmentAddedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ActorAttachmentAddedRequest.fromBuffer(value),
-        ($1.ActorAttachmentAddedResponse value) => value.writeToBuffer()));
+        ($0.ActorAttachmentAddedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.ActorAttachmentRemovedRequest, $1.ActorAttachmentRemovedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ActorAttachmentRemovedRequest, $0.ActorAttachmentRemovedResponse>(
         'AttachmentRemoved',
         attachmentRemoved_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $1.ActorAttachmentRemovedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ActorAttachmentRemovedRequest.fromBuffer(value),
-        ($1.ActorAttachmentRemovedResponse value) => value.writeToBuffer()));
+        ($0.ActorAttachmentRemovedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.ActorClaimAddedRequest, $1.ActorClaimAddedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ActorClaimAddedRequest, $0.ActorClaimAddedResponse>(
         'ClaimAdded',
         claimAdded_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $1.ActorClaimAddedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ActorClaimAddedRequest.fromBuffer(value),
-        ($1.ActorClaimAddedResponse value) => value.writeToBuffer()));
+        ($0.ActorClaimAddedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.ActorMetaDataUpdatedRequest, $1.ActorMetaDataUpdatedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ActorMetaDataUpdatedRequest, $0.ActorMetaDataUpdatedResponse>(
         'MetaDataUpdated',
         metaDataUpdated_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $1.ActorMetaDataUpdatedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ActorMetaDataUpdatedRequest.fromBuffer(value),
-        ($1.ActorMetaDataUpdatedResponse value) => value.writeToBuffer()));
+        ($0.ActorMetaDataUpdatedResponse value) => value.writeToBuffer()));
   }
 
-  $async.Future<$1.ActorCreatedResponse> created_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorCreatedRequest> $request) async {
+  $async.Future<$0.ActorCreatedResponse> created_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorCreatedRequest> $request) async {
     return created($call, await $request);
   }
 
-  $async.Future<$1.ActorCreatedv2Response> createdv2_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorCreatedv2Request> $request) async {
+  $async.Future<$0.ActorCreatedResponse> created($grpc.ServiceCall call, $0.ActorCreatedRequest request);
+
+  $async.Future<$0.ActorCreatedv2Response> createdv2_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorCreatedv2Request> $request) async {
     return createdv2($call, await $request);
   }
 
-  $async.Future<$1.ActorDeletedResponse> deleted_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorDeletedRequest> $request) async {
+  $async.Future<$0.ActorCreatedv2Response> createdv2($grpc.ServiceCall call, $0.ActorCreatedv2Request request);
+
+  $async.Future<$0.ActorDeletedResponse> deleted_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorDeletedRequest> $request) async {
     return deleted($call, await $request);
   }
 
-  $async.Future<$1.ActorSnapshotCompletedResponse> snapshotCompleted_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorSnapshotCompletedRequest> $request) async {
+  $async.Future<$0.ActorDeletedResponse> deleted($grpc.ServiceCall call, $0.ActorDeletedRequest request);
+
+  $async.Future<$0.ActorSnapshotCompletedResponse> snapshotCompleted_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorSnapshotCompletedRequest> $request) async {
     return snapshotCompleted($call, await $request);
   }
 
-  $async.Future<$1.ActorAttachmentAddedResponse> attachmentAdded_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorAttachmentAddedRequest> $request) async {
+  $async.Future<$0.ActorSnapshotCompletedResponse> snapshotCompleted($grpc.ServiceCall call, $0.ActorSnapshotCompletedRequest request);
+
+  $async.Future<$0.ActorAttachmentAddedResponse> attachmentAdded_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorAttachmentAddedRequest> $request) async {
     return attachmentAdded($call, await $request);
   }
 
-  $async.Future<$1.ActorAttachmentRemovedResponse> attachmentRemoved_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorAttachmentRemovedRequest> $request) async {
+  $async.Future<$0.ActorAttachmentAddedResponse> attachmentAdded($grpc.ServiceCall call, $0.ActorAttachmentAddedRequest request);
+
+  $async.Future<$0.ActorAttachmentRemovedResponse> attachmentRemoved_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorAttachmentRemovedRequest> $request) async {
     return attachmentRemoved($call, await $request);
   }
 
-  $async.Future<$1.ActorClaimAddedResponse> claimAdded_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorClaimAddedRequest> $request) async {
+  $async.Future<$0.ActorAttachmentRemovedResponse> attachmentRemoved($grpc.ServiceCall call, $0.ActorAttachmentRemovedRequest request);
+
+  $async.Future<$0.ActorClaimAddedResponse> claimAdded_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorClaimAddedRequest> $request) async {
     return claimAdded($call, await $request);
   }
 
-  $async.Future<$1.ActorMetaDataUpdatedResponse> metaDataUpdated_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorMetaDataUpdatedRequest> $request) async {
+  $async.Future<$0.ActorClaimAddedResponse> claimAdded($grpc.ServiceCall call, $0.ActorClaimAddedRequest request);
+
+  $async.Future<$0.ActorMetaDataUpdatedResponse> metaDataUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorMetaDataUpdatedRequest> $request) async {
     return metaDataUpdated($call, await $request);
   }
 
-  $async.Future<$1.ActorCreatedResponse> created($grpc.ServiceCall call, $1.ActorCreatedRequest request);
+  $async.Future<$0.ActorMetaDataUpdatedResponse> metaDataUpdated($grpc.ServiceCall call, $0.ActorMetaDataUpdatedRequest request);
-  $async.Future<$1.ActorCreatedv2Response> createdv2($grpc.ServiceCall call, $1.ActorCreatedv2Request request);
+
-  $async.Future<$1.ActorDeletedResponse> deleted($grpc.ServiceCall call, $1.ActorDeletedRequest request);
-  $async.Future<$1.ActorSnapshotCompletedResponse> snapshotCompleted($grpc.ServiceCall call, $1.ActorSnapshotCompletedRequest request);
-  $async.Future<$1.ActorAttachmentAddedResponse> attachmentAdded($grpc.ServiceCall call, $1.ActorAttachmentAddedRequest request);
-  $async.Future<$1.ActorAttachmentRemovedResponse> attachmentRemoved($grpc.ServiceCall call, $1.ActorAttachmentRemovedRequest request);
-  $async.Future<$1.ActorClaimAddedResponse> claimAdded($grpc.ServiceCall call, $1.ActorClaimAddedRequest request);
-  $async.Future<$1.ActorMetaDataUpdatedResponse> metaDataUpdated($grpc.ServiceCall call, $1.ActorMetaDataUpdatedRequest request);
 }

lib/actorInput.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from actorInput.proto.
-//  source: actorInput.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/actorQuery.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from actorQuery.proto.
-//  source: actorQuery.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,15 +14,15 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'actor.pb.dart' as $73;
+import 'actor.pb.dart' as $2;
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
 class ActorByIdQuery extends $pb.GeneratedMessage {
   factory ActorByIdQuery({
-    $3.QueryProjectHeader? header,
+    $1.QueryProjectHeader? header,
-    $core.Iterable<$3.EntityID>? iDs,
+    $core.Iterable<$1.EntityID>? iDs,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -36,8 +36,8 @@ class ActorByIdQuery extends $pb.GeneratedMessage {
   factory ActorByIdQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorByIdQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
-    ..pc<$3.EntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $3.EntityID.create)
+    ..pc<$1.EntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.EntityID.create)
     ..hasRequiredFields = false
   ;
 
@@ -59,24 +59,24 @@ class ActorByIdQuery extends $pb.GeneratedMessage {
   static ActorByIdQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader get header => $_getN(0);
+  $1.QueryProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.QueryProjectHeader value) => $_setField(1, value);
+  set header($1.QueryProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $pb.PbList<$3.EntityID> get iDs => $_getList(1);
+  $pb.PbList<$1.EntityID> get iDs => $_getList(1);
 }
 
 class ActorByIdResult extends $pb.GeneratedMessage {
   factory ActorByIdResult({
-    $3.ResultHeader? header,
+    $1.ResultHeader? header,
-    $core.Iterable<$73.Actor>? objects,
+    $core.Iterable<$2.Actor>? objects,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -90,8 +90,8 @@ class ActorByIdResult extends $pb.GeneratedMessage {
   factory ActorByIdResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.ResultHeader.create)
+    ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
-    ..pc<$73.Actor>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $73.Actor.create)
+    ..pc<$2.Actor>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $2.Actor.create)
     ..hasRequiredFields = false
   ;
 
@@ -113,26 +113,26 @@ class ActorByIdResult extends $pb.GeneratedMessage {
   static ActorByIdResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.ResultHeader get header => $_getN(0);
+  $1.ResultHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.ResultHeader value) => $_setField(1, value);
+  set header($1.ResultHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.ResultHeader ensureHeader() => $_ensure(0);
+  $1.ResultHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $pb.PbList<$73.Actor> get objects => $_getList(1);
+  $pb.PbList<$2.Actor> get objects => $_getList(1);
 }
 
 class ActorByFilterQuery extends $pb.GeneratedMessage {
   factory ActorByFilterQuery({
-    $3.QueryProjectHeader? header,
+    $1.QueryProjectHeader? header,
     $core.String? limitFilter,
     $core.String? queryContext,
-    $core.Iterable<$3.BlockFilter>? blockFilters,
+    $core.Iterable<$1.BlockFilter>? blockFilters,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -148,10 +148,10 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
   factory ActorByFilterQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorByFilterQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
     ..aOS(4, _omitFieldNames ? '' : 'limitFilter', protoName: 'limitFilter')
     ..aOS(5, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
-    ..pc<$3.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $3.BlockFilter.create)
+    ..pc<$1.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
     ..hasRequiredFields = false
   ;
 
@@ -173,15 +173,15 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
   static ActorByFilterQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader get header => $_getN(0);
+  $1.QueryProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.QueryProjectHeader value) => $_setField(1, value);
+  set header($1.QueryProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
   /// Number of maximum result
   @$pb.TagNumber(4)
@@ -204,13 +204,13 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
 
   /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
   @$pb.TagNumber(6)
-  $pb.PbList<$3.BlockFilter> get blockFilters => $_getList(3);
+  $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 }
 
 class ActorByFilterResult extends $pb.GeneratedMessage {
   factory ActorByFilterResult({
-    $3.ResultHeader? header,
+    $1.ResultHeader? header,
-    $core.Iterable<$73.Actor>? objects,
+    $core.Iterable<$2.Actor>? objects,
     $core.String? queryContext,
   }) {
     final result = create();
@@ -226,8 +226,8 @@ class ActorByFilterResult extends $pb.GeneratedMessage {
   factory ActorByFilterResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorByFilterResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.ResultHeader.create)
+    ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
-    ..pc<$73.Actor>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $73.Actor.create)
+    ..pc<$2.Actor>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $2.Actor.create)
     ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
     ..hasRequiredFields = false
   ;
@@ -250,18 +250,18 @@ class ActorByFilterResult extends $pb.GeneratedMessage {
   static ActorByFilterResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.ResultHeader get header => $_getN(0);
+  $1.ResultHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.ResultHeader value) => $_setField(1, value);
+  set header($1.ResultHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.ResultHeader ensureHeader() => $_ensure(0);
+  $1.ResultHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $pb.PbList<$73.Actor> get objects => $_getList(1);
+  $pb.PbList<$2.Actor> get objects => $_getList(1);
 
   @$pb.TagNumber(3)
   $core.String get queryContext => $_getSZ(2);
@@ -275,9 +275,9 @@ class ActorByFilterResult extends $pb.GeneratedMessage {
 
 class ActorByMatchQuery extends $pb.GeneratedMessage {
   factory ActorByMatchQuery({
-    $3.QueryProjectHeader? header,
+    $1.QueryProjectHeader? header,
-    $core.Iterable<$3.BlockFilter>? blockFilters,
+    $core.Iterable<$1.BlockFilter>? blockFilters,
-    $core.Iterable<$3.MatchField>? matchFields,
+    $core.Iterable<$1.MatchField>? matchFields,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -292,9 +292,9 @@ class ActorByMatchQuery extends $pb.GeneratedMessage {
   factory ActorByMatchQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorByMatchQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
-    ..pc<$3.BlockFilter>(5, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $3.BlockFilter.create)
+    ..pc<$1.BlockFilter>(5, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
-    ..pc<$3.MatchField>(6, _omitFieldNames ? '' : 'MatchFields', $pb.PbFieldType.PM, protoName: 'MatchFields', subBuilder: $3.MatchField.create)
+    ..pc<$1.MatchField>(6, _omitFieldNames ? '' : 'MatchFields', $pb.PbFieldType.PM, protoName: 'MatchFields', subBuilder: $1.MatchField.create)
     ..hasRequiredFields = false
   ;
 
@@ -316,28 +316,28 @@ class ActorByMatchQuery extends $pb.GeneratedMessage {
   static ActorByMatchQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader get header => $_getN(0);
+  $1.QueryProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.QueryProjectHeader value) => $_setField(1, value);
+  set header($1.QueryProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
   /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
   @$pb.TagNumber(5)
-  $pb.PbList<$3.BlockFilter> get blockFilters => $_getList(1);
+  $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
 
   /// MatchField list structure, for FindMatching query
   @$pb.TagNumber(6)
-  $pb.PbList<$3.MatchField> get matchFields => $_getList(2);
+  $pb.PbList<$1.MatchField> get matchFields => $_getList(2);
 }
 
 class ActorByMatchResult extends $pb.GeneratedMessage {
   factory ActorByMatchResult({
-    $core.Iterable<$3.MatchFieldResult>? matchResults,
+    $core.Iterable<$1.MatchFieldResult>? matchResults,
   }) {
     final result = create();
     if (matchResults != null) result.matchResults.addAll(matchResults);
@@ -350,7 +350,7 @@ class ActorByMatchResult extends $pb.GeneratedMessage {
   factory ActorByMatchResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorByMatchResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$3.MatchFieldResult>(2, _omitFieldNames ? '' : 'MatchResults', $pb.PbFieldType.PM, protoName: 'MatchResults', subBuilder: $3.MatchFieldResult.create)
+    ..pc<$1.MatchFieldResult>(2, _omitFieldNames ? '' : 'MatchResults', $pb.PbFieldType.PM, protoName: 'MatchResults', subBuilder: $1.MatchFieldResult.create)
     ..hasRequiredFields = false
   ;
 
@@ -372,7 +372,7 @@ class ActorByMatchResult extends $pb.GeneratedMessage {
   static ActorByMatchResult? _defaultInstance;
 
   @$pb.TagNumber(2)
-  $pb.PbList<$3.MatchFieldResult> get matchResults => $_getList(0);
+  $pb.PbList<$1.MatchFieldResult> get matchResults => $_getList(0);
 }
 
 

lib/actorQuery.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from actorQuery.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/actorQuery.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from actorQuery.proto.
-//  source: actorQuery.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,8 +16,8 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'actorQuery.pb.dart' as $2;
+import 'actorQuery.pb.dart' as $0;
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
 
 export 'actorQuery.pb.dart';
 
@@ -31,56 +31,58 @@ class ActorQueryClient extends $grpc.Client {
     '',
   ];
 
-  static final _$getByIds = $grpc.ClientMethod<$2.ActorByIdQuery, $2.ActorByIdResult>(
-      '/api.ActorQuery/GetByIds',
-      ($2.ActorByIdQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $2.ActorByIdResult.fromBuffer(value));
-  static final _$find = $grpc.ClientMethod<$2.ActorByFilterQuery, $2.ActorByFilterResult>(
-      '/api.ActorQuery/Find',
-      ($2.ActorByFilterQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $2.ActorByFilterResult.fromBuffer(value));
-  static final _$findMatchingFieldValues = $grpc.ClientMethod<$2.ActorByMatchQuery, $2.ActorByMatchResult>(
-      '/api.ActorQuery/FindMatchingFieldValues',
-      ($2.ActorByMatchQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $2.ActorByMatchResult.fromBuffer(value));
-  static final _$findMatchingFieldElements = $grpc.ClientMethod<$3.ElementByMatchQuery, $3.ElementByMatchResult>(
-      '/api.ActorQuery/FindMatchingFieldElements',
-      ($3.ElementByMatchQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $3.ElementByMatchResult.fromBuffer(value));
-  static final _$extract = $grpc.ClientMethod<$3.ExtractQuery, $3.ExtractResult>(
-      '/api.ActorQuery/Extract',
-      ($3.ExtractQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $3.ExtractResult.fromBuffer(value));
-  static final _$countLines = $grpc.ClientMethod<$3.CountLinesQuery, $3.CountLinesResult>(
-      '/api.ActorQuery/CountLines',
-      ($3.CountLinesQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $3.CountLinesResult.fromBuffer(value));
-
   ActorQueryClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$2.ActorByIdResult> getByIds($2.ActorByIdQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ActorByIdResult> getByIds($0.ActorByIdQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$getByIds, request, options: options);
   }
 
-  $grpc.ResponseFuture<$2.ActorByFilterResult> find($2.ActorByFilterQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ActorByFilterResult> find($0.ActorByFilterQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$find, request, options: options);
   }
 
-  $grpc.ResponseFuture<$2.ActorByMatchResult> findMatchingFieldValues($2.ActorByMatchQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ActorByMatchResult> findMatchingFieldValues($0.ActorByMatchQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$findMatchingFieldValues, request, options: options);
   }
 
-  $grpc.ResponseFuture<$3.ElementByMatchResult> findMatchingFieldElements($3.ElementByMatchQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$1.ElementByMatchResult> findMatchingFieldElements($1.ElementByMatchQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$findMatchingFieldElements, request, options: options);
   }
 
-  $grpc.ResponseFuture<$3.ExtractResult> extract($3.ExtractQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$1.ExtractResult> extract($1.ExtractQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$extract, request, options: options);
   }
 
-  $grpc.ResponseFuture<$3.CountLinesResult> countLines($3.CountLinesQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$1.CountLinesResult> countLines($1.CountLinesQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$countLines, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$getByIds = $grpc.ClientMethod<$0.ActorByIdQuery, $0.ActorByIdResult>(
+      '/api.ActorQuery/GetByIds',
+      ($0.ActorByIdQuery value) => value.writeToBuffer(),
+      $0.ActorByIdResult.fromBuffer);
+  static final _$find = $grpc.ClientMethod<$0.ActorByFilterQuery, $0.ActorByFilterResult>(
+      '/api.ActorQuery/Find',
+      ($0.ActorByFilterQuery value) => value.writeToBuffer(),
+      $0.ActorByFilterResult.fromBuffer);
+  static final _$findMatchingFieldValues = $grpc.ClientMethod<$0.ActorByMatchQuery, $0.ActorByMatchResult>(
+      '/api.ActorQuery/FindMatchingFieldValues',
+      ($0.ActorByMatchQuery value) => value.writeToBuffer(),
+      $0.ActorByMatchResult.fromBuffer);
+  static final _$findMatchingFieldElements = $grpc.ClientMethod<$1.ElementByMatchQuery, $1.ElementByMatchResult>(
+      '/api.ActorQuery/FindMatchingFieldElements',
+      ($1.ElementByMatchQuery value) => value.writeToBuffer(),
+      $1.ElementByMatchResult.fromBuffer);
+  static final _$extract = $grpc.ClientMethod<$1.ExtractQuery, $1.ExtractResult>(
+      '/api.ActorQuery/Extract',
+      ($1.ExtractQuery value) => value.writeToBuffer(),
+      $1.ExtractResult.fromBuffer);
+  static final _$countLines = $grpc.ClientMethod<$1.CountLinesQuery, $1.CountLinesResult>(
+      '/api.ActorQuery/CountLines',
+      ($1.CountLinesQuery value) => value.writeToBuffer(),
+      $1.CountLinesResult.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.ActorQuery')
@@ -88,78 +90,84 @@ abstract class ActorQueryServiceBase extends $grpc.Service {
   $core.String get $name => 'api.ActorQuery';
 
   ActorQueryServiceBase() {
-    $addMethod($grpc.ServiceMethod<$2.ActorByIdQuery, $2.ActorByIdResult>(
+    $addMethod($grpc.ServiceMethod<$0.ActorByIdQuery, $0.ActorByIdResult>(
         'GetByIds',
         getByIds_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $2.ActorByIdQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ActorByIdQuery.fromBuffer(value),
-        ($2.ActorByIdResult value) => value.writeToBuffer()));
+        ($0.ActorByIdResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$2.ActorByFilterQuery, $2.ActorByFilterResult>(
+    $addMethod($grpc.ServiceMethod<$0.ActorByFilterQuery, $0.ActorByFilterResult>(
         'Find',
         find_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $2.ActorByFilterQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ActorByFilterQuery.fromBuffer(value),
-        ($2.ActorByFilterResult value) => value.writeToBuffer()));
+        ($0.ActorByFilterResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$2.ActorByMatchQuery, $2.ActorByMatchResult>(
+    $addMethod($grpc.ServiceMethod<$0.ActorByMatchQuery, $0.ActorByMatchResult>(
         'FindMatchingFieldValues',
         findMatchingFieldValues_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $2.ActorByMatchQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ActorByMatchQuery.fromBuffer(value),
-        ($2.ActorByMatchResult value) => value.writeToBuffer()));
+        ($0.ActorByMatchResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$3.ElementByMatchQuery, $3.ElementByMatchResult>(
+    $addMethod($grpc.ServiceMethod<$1.ElementByMatchQuery, $1.ElementByMatchResult>(
         'FindMatchingFieldElements',
         findMatchingFieldElements_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $3.ElementByMatchQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $1.ElementByMatchQuery.fromBuffer(value),
-        ($3.ElementByMatchResult value) => value.writeToBuffer()));
+        ($1.ElementByMatchResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$3.ExtractQuery, $3.ExtractResult>(
+    $addMethod($grpc.ServiceMethod<$1.ExtractQuery, $1.ExtractResult>(
         'Extract',
         extract_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $3.ExtractQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $1.ExtractQuery.fromBuffer(value),
-        ($3.ExtractResult value) => value.writeToBuffer()));
+        ($1.ExtractResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$3.CountLinesQuery, $3.CountLinesResult>(
+    $addMethod($grpc.ServiceMethod<$1.CountLinesQuery, $1.CountLinesResult>(
         'CountLines',
         countLines_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $3.CountLinesQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $1.CountLinesQuery.fromBuffer(value),
-        ($3.CountLinesResult value) => value.writeToBuffer()));
+        ($1.CountLinesResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$2.ActorByIdResult> getByIds_Pre($grpc.ServiceCall $call, $async.Future<$2.ActorByIdQuery> $request) async {
+  $async.Future<$0.ActorByIdResult> getByIds_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorByIdQuery> $request) async {
     return getByIds($call, await $request);
   }
 
-  $async.Future<$2.ActorByFilterResult> find_Pre($grpc.ServiceCall $call, $async.Future<$2.ActorByFilterQuery> $request) async {
+  $async.Future<$0.ActorByIdResult> getByIds($grpc.ServiceCall call, $0.ActorByIdQuery request);
+
+  $async.Future<$0.ActorByFilterResult> find_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorByFilterQuery> $request) async {
     return find($call, await $request);
   }
 
-  $async.Future<$2.ActorByMatchResult> findMatchingFieldValues_Pre($grpc.ServiceCall $call, $async.Future<$2.ActorByMatchQuery> $request) async {
+  $async.Future<$0.ActorByFilterResult> find($grpc.ServiceCall call, $0.ActorByFilterQuery request);
+
+  $async.Future<$0.ActorByMatchResult> findMatchingFieldValues_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorByMatchQuery> $request) async {
     return findMatchingFieldValues($call, await $request);
   }
 
-  $async.Future<$3.ElementByMatchResult> findMatchingFieldElements_Pre($grpc.ServiceCall $call, $async.Future<$3.ElementByMatchQuery> $request) async {
+  $async.Future<$0.ActorByMatchResult> findMatchingFieldValues($grpc.ServiceCall call, $0.ActorByMatchQuery request);
+
+  $async.Future<$1.ElementByMatchResult> findMatchingFieldElements_Pre($grpc.ServiceCall $call, $async.Future<$1.ElementByMatchQuery> $request) async {
     return findMatchingFieldElements($call, await $request);
   }
 
-  $async.Future<$3.ExtractResult> extract_Pre($grpc.ServiceCall $call, $async.Future<$3.ExtractQuery> $request) async {
+  $async.Future<$1.ElementByMatchResult> findMatchingFieldElements($grpc.ServiceCall call, $1.ElementByMatchQuery request);
+
+  $async.Future<$1.ExtractResult> extract_Pre($grpc.ServiceCall $call, $async.Future<$1.ExtractQuery> $request) async {
     return extract($call, await $request);
   }
 
-  $async.Future<$3.CountLinesResult> countLines_Pre($grpc.ServiceCall $call, $async.Future<$3.CountLinesQuery> $request) async {
+  $async.Future<$1.ExtractResult> extract($grpc.ServiceCall call, $1.ExtractQuery request);
+
+  $async.Future<$1.CountLinesResult> countLines_Pre($grpc.ServiceCall $call, $async.Future<$1.CountLinesQuery> $request) async {
     return countLines($call, await $request);
   }
 
-  $async.Future<$2.ActorByIdResult> getByIds($grpc.ServiceCall call, $2.ActorByIdQuery request);
+  $async.Future<$1.CountLinesResult> countLines($grpc.ServiceCall call, $1.CountLinesQuery request);
-  $async.Future<$2.ActorByFilterResult> find($grpc.ServiceCall call, $2.ActorByFilterQuery request);
+
-  $async.Future<$2.ActorByMatchResult> findMatchingFieldValues($grpc.ServiceCall call, $2.ActorByMatchQuery request);
-  $async.Future<$3.ElementByMatchResult> findMatchingFieldElements($grpc.ServiceCall call, $3.ElementByMatchQuery request);
-  $async.Future<$3.ExtractResult> extract($grpc.ServiceCall call, $3.ExtractQuery request);
-  $async.Future<$3.CountLinesResult> countLines($grpc.ServiceCall call, $3.CountLinesQuery request);
 }

lib/actorQuery.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from actorQuery.proto.
-//  source: actorQuery.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/adaptiveCard.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from adaptiveCard.proto.
-//  source: adaptiveCard.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references

lib/adaptiveCard.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from adaptiveCard.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/adaptiveCard.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from adaptiveCard.proto.
-//  source: adaptiveCard.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,7 +16,7 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'adaptiveCard.pb.dart' as $4;
+import 'adaptiveCard.pb.dart' as $0;
 
 export 'adaptiveCard.pb.dart';
 
@@ -30,48 +30,50 @@ class AdaptiveCardServiceClient extends $grpc.Client {
     '',
   ];
 
-  static final _$get = $grpc.ClientMethod<$4.GetAdaptiveCardRequest, $4.GetAdaptiveCardResult>(
-      '/api.AdaptiveCardService/Get',
-      ($4.GetAdaptiveCardRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $4.GetAdaptiveCardResult.fromBuffer(value));
-  static final _$list = $grpc.ClientMethod<$4.ListAdaptiveCardRequest, $4.ListAdaptiveCardResult>(
-      '/api.AdaptiveCardService/List',
-      ($4.ListAdaptiveCardRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $4.ListAdaptiveCardResult.fromBuffer(value));
-  static final _$create = $grpc.ClientMethod<$4.CreateAdaptiveCardRequest, $4.CreateAdaptiveCardResult>(
-      '/api.AdaptiveCardService/Create',
-      ($4.CreateAdaptiveCardRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $4.CreateAdaptiveCardResult.fromBuffer(value));
-  static final _$update = $grpc.ClientMethod<$4.UpdateAdaptiveCardRequest, $4.UpdateAdaptiveCardResult>(
-      '/api.AdaptiveCardService/Update',
-      ($4.UpdateAdaptiveCardRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $4.UpdateAdaptiveCardResult.fromBuffer(value));
-  static final _$delete = $grpc.ClientMethod<$4.DeleteAdaptiveCardRequest, $4.DeleteAdaptiveCardResult>(
-      '/api.AdaptiveCardService/Delete',
-      ($4.DeleteAdaptiveCardRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $4.DeleteAdaptiveCardResult.fromBuffer(value));
-
   AdaptiveCardServiceClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$4.GetAdaptiveCardResult> get($4.GetAdaptiveCardRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.GetAdaptiveCardResult> get($0.GetAdaptiveCardRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$get, request, options: options);
   }
 
-  $grpc.ResponseFuture<$4.ListAdaptiveCardResult> list($4.ListAdaptiveCardRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ListAdaptiveCardResult> list($0.ListAdaptiveCardRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$list, request, options: options);
   }
 
-  $grpc.ResponseFuture<$4.CreateAdaptiveCardResult> create($4.CreateAdaptiveCardRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.CreateAdaptiveCardResult> create($0.CreateAdaptiveCardRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$create, request, options: options);
   }
 
-  $grpc.ResponseFuture<$4.UpdateAdaptiveCardResult> update($4.UpdateAdaptiveCardRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.UpdateAdaptiveCardResult> update($0.UpdateAdaptiveCardRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$update, request, options: options);
   }
 
-  $grpc.ResponseFuture<$4.DeleteAdaptiveCardResult> delete($4.DeleteAdaptiveCardRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.DeleteAdaptiveCardResult> delete($0.DeleteAdaptiveCardRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$delete, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$get = $grpc.ClientMethod<$0.GetAdaptiveCardRequest, $0.GetAdaptiveCardResult>(
+      '/api.AdaptiveCardService/Get',
+      ($0.GetAdaptiveCardRequest value) => value.writeToBuffer(),
+      $0.GetAdaptiveCardResult.fromBuffer);
+  static final _$list = $grpc.ClientMethod<$0.ListAdaptiveCardRequest, $0.ListAdaptiveCardResult>(
+      '/api.AdaptiveCardService/List',
+      ($0.ListAdaptiveCardRequest value) => value.writeToBuffer(),
+      $0.ListAdaptiveCardResult.fromBuffer);
+  static final _$create = $grpc.ClientMethod<$0.CreateAdaptiveCardRequest, $0.CreateAdaptiveCardResult>(
+      '/api.AdaptiveCardService/Create',
+      ($0.CreateAdaptiveCardRequest value) => value.writeToBuffer(),
+      $0.CreateAdaptiveCardResult.fromBuffer);
+  static final _$update = $grpc.ClientMethod<$0.UpdateAdaptiveCardRequest, $0.UpdateAdaptiveCardResult>(
+      '/api.AdaptiveCardService/Update',
+      ($0.UpdateAdaptiveCardRequest value) => value.writeToBuffer(),
+      $0.UpdateAdaptiveCardResult.fromBuffer);
+  static final _$delete = $grpc.ClientMethod<$0.DeleteAdaptiveCardRequest, $0.DeleteAdaptiveCardResult>(
+      '/api.AdaptiveCardService/Delete',
+      ($0.DeleteAdaptiveCardRequest value) => value.writeToBuffer(),
+      $0.DeleteAdaptiveCardResult.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.AdaptiveCardService')
@@ -79,66 +81,71 @@ abstract class AdaptiveCardServiceBase extends $grpc.Service {
   $core.String get $name => 'api.AdaptiveCardService';
 
   AdaptiveCardServiceBase() {
-    $addMethod($grpc.ServiceMethod<$4.GetAdaptiveCardRequest, $4.GetAdaptiveCardResult>(
+    $addMethod($grpc.ServiceMethod<$0.GetAdaptiveCardRequest, $0.GetAdaptiveCardResult>(
         'Get',
         get_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $4.GetAdaptiveCardRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.GetAdaptiveCardRequest.fromBuffer(value),
-        ($4.GetAdaptiveCardResult value) => value.writeToBuffer()));
+        ($0.GetAdaptiveCardResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$4.ListAdaptiveCardRequest, $4.ListAdaptiveCardResult>(
+    $addMethod($grpc.ServiceMethod<$0.ListAdaptiveCardRequest, $0.ListAdaptiveCardResult>(
         'List',
         list_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $4.ListAdaptiveCardRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ListAdaptiveCardRequest.fromBuffer(value),
-        ($4.ListAdaptiveCardResult value) => value.writeToBuffer()));
+        ($0.ListAdaptiveCardResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$4.CreateAdaptiveCardRequest, $4.CreateAdaptiveCardResult>(
+    $addMethod($grpc.ServiceMethod<$0.CreateAdaptiveCardRequest, $0.CreateAdaptiveCardResult>(
         'Create',
         create_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $4.CreateAdaptiveCardRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.CreateAdaptiveCardRequest.fromBuffer(value),
-        ($4.CreateAdaptiveCardResult value) => value.writeToBuffer()));
+        ($0.CreateAdaptiveCardResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$4.UpdateAdaptiveCardRequest, $4.UpdateAdaptiveCardResult>(
+    $addMethod($grpc.ServiceMethod<$0.UpdateAdaptiveCardRequest, $0.UpdateAdaptiveCardResult>(
         'Update',
         update_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $4.UpdateAdaptiveCardRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.UpdateAdaptiveCardRequest.fromBuffer(value),
-        ($4.UpdateAdaptiveCardResult value) => value.writeToBuffer()));
+        ($0.UpdateAdaptiveCardResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$4.DeleteAdaptiveCardRequest, $4.DeleteAdaptiveCardResult>(
+    $addMethod($grpc.ServiceMethod<$0.DeleteAdaptiveCardRequest, $0.DeleteAdaptiveCardResult>(
         'Delete',
         delete_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $4.DeleteAdaptiveCardRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.DeleteAdaptiveCardRequest.fromBuffer(value),
-        ($4.DeleteAdaptiveCardResult value) => value.writeToBuffer()));
+        ($0.DeleteAdaptiveCardResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$4.GetAdaptiveCardResult> get_Pre($grpc.ServiceCall $call, $async.Future<$4.GetAdaptiveCardRequest> $request) async {
+  $async.Future<$0.GetAdaptiveCardResult> get_Pre($grpc.ServiceCall $call, $async.Future<$0.GetAdaptiveCardRequest> $request) async {
     return get($call, await $request);
   }
 
-  $async.Future<$4.ListAdaptiveCardResult> list_Pre($grpc.ServiceCall $call, $async.Future<$4.ListAdaptiveCardRequest> $request) async {
+  $async.Future<$0.GetAdaptiveCardResult> get($grpc.ServiceCall call, $0.GetAdaptiveCardRequest request);
+
+  $async.Future<$0.ListAdaptiveCardResult> list_Pre($grpc.ServiceCall $call, $async.Future<$0.ListAdaptiveCardRequest> $request) async {
     return list($call, await $request);
   }
 
-  $async.Future<$4.CreateAdaptiveCardResult> create_Pre($grpc.ServiceCall $call, $async.Future<$4.CreateAdaptiveCardRequest> $request) async {
+  $async.Future<$0.ListAdaptiveCardResult> list($grpc.ServiceCall call, $0.ListAdaptiveCardRequest request);
+
+  $async.Future<$0.CreateAdaptiveCardResult> create_Pre($grpc.ServiceCall $call, $async.Future<$0.CreateAdaptiveCardRequest> $request) async {
     return create($call, await $request);
   }
 
-  $async.Future<$4.UpdateAdaptiveCardResult> update_Pre($grpc.ServiceCall $call, $async.Future<$4.UpdateAdaptiveCardRequest> $request) async {
+  $async.Future<$0.CreateAdaptiveCardResult> create($grpc.ServiceCall call, $0.CreateAdaptiveCardRequest request);
+
+  $async.Future<$0.UpdateAdaptiveCardResult> update_Pre($grpc.ServiceCall $call, $async.Future<$0.UpdateAdaptiveCardRequest> $request) async {
     return update($call, await $request);
   }
 
-  $async.Future<$4.DeleteAdaptiveCardResult> delete_Pre($grpc.ServiceCall $call, $async.Future<$4.DeleteAdaptiveCardRequest> $request) async {
+  $async.Future<$0.UpdateAdaptiveCardResult> update($grpc.ServiceCall call, $0.UpdateAdaptiveCardRequest request);
+
+  $async.Future<$0.DeleteAdaptiveCardResult> delete_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAdaptiveCardRequest> $request) async {
     return delete($call, await $request);
   }
 
-  $async.Future<$4.GetAdaptiveCardResult> get($grpc.ServiceCall call, $4.GetAdaptiveCardRequest request);
+  $async.Future<$0.DeleteAdaptiveCardResult> delete($grpc.ServiceCall call, $0.DeleteAdaptiveCardRequest request);
-  $async.Future<$4.ListAdaptiveCardResult> list($grpc.ServiceCall call, $4.ListAdaptiveCardRequest request);
+
-  $async.Future<$4.CreateAdaptiveCardResult> create($grpc.ServiceCall call, $4.CreateAdaptiveCardRequest request);
-  $async.Future<$4.UpdateAdaptiveCardResult> update($grpc.ServiceCall call, $4.UpdateAdaptiveCardRequest request);
-  $async.Future<$4.DeleteAdaptiveCardResult> delete($grpc.ServiceCall call, $4.DeleteAdaptiveCardRequest request);
 }

lib/adaptiveCard.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from adaptiveCard.proto.
-//  source: adaptiveCard.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/admin-actor.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from admin-actor.proto.
-//  source: admin-actor.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,7 +14,7 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'repositoryShared.pb.dart' as $70;
+import 'repositoryShared.pb.dart' as $0;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
@@ -24,9 +24,9 @@ class AdminActor extends $pb.GeneratedMessage {
     $core.String? name,
     $core.String? organisationID,
     $core.String? partnerID,
-    $70.Address? address,
+    $0.Address? address,
-    $70.ActorContact? contact,
+    $0.ActorContact? contact,
-    $70.ActorTypology? typology,
+    $0.ActorTypology? typology,
     $core.String? additionalInformation,
   }) {
     final result = create();
@@ -51,9 +51,9 @@ class AdminActor extends $pb.GeneratedMessage {
     ..aOS(2, _omitFieldNames ? '' : 'Name', protoName: 'Name')
     ..aOS(3, _omitFieldNames ? '' : 'OrganisationID', protoName: 'OrganisationID')
     ..aOS(4, _omitFieldNames ? '' : 'PartnerID', protoName: 'PartnerID')
-    ..aOM<$70.Address>(6, _omitFieldNames ? '' : 'Address', protoName: 'Address', subBuilder: $70.Address.create)
+    ..aOM<$0.Address>(6, _omitFieldNames ? '' : 'Address', protoName: 'Address', subBuilder: $0.Address.create)
-    ..aOM<$70.ActorContact>(7, _omitFieldNames ? '' : 'Contact', protoName: 'Contact', subBuilder: $70.ActorContact.create)
+    ..aOM<$0.ActorContact>(7, _omitFieldNames ? '' : 'Contact', protoName: 'Contact', subBuilder: $0.ActorContact.create)
-    ..e<$70.ActorTypology>(8, _omitFieldNames ? '' : 'Typology', $pb.PbFieldType.OE, protoName: 'Typology', defaultOrMaker: $70.ActorTypology.TYPOLOGY_UNKNOWN, valueOf: $70.ActorTypology.valueOf, enumValues: $70.ActorTypology.values)
+    ..e<$0.ActorTypology>(8, _omitFieldNames ? '' : 'Typology', $pb.PbFieldType.OE, protoName: 'Typology', defaultOrMaker: $0.ActorTypology.TYPOLOGY_UNKNOWN, valueOf: $0.ActorTypology.valueOf, enumValues: $0.ActorTypology.values)
     ..aOS(9, _omitFieldNames ? '' : 'AdditionalInformation', protoName: 'AdditionalInformation')
     ..hasRequiredFields = false
   ;
@@ -112,31 +112,31 @@ class AdminActor extends $pb.GeneratedMessage {
   void clearPartnerID() => $_clearField(4);
 
   @$pb.TagNumber(6)
-  $70.Address get address => $_getN(4);
+  $0.Address get address => $_getN(4);
   @$pb.TagNumber(6)
-  set address($70.Address value) => $_setField(6, value);
+  set address($0.Address value) => $_setField(6, value);
   @$pb.TagNumber(6)
   $core.bool hasAddress() => $_has(4);
   @$pb.TagNumber(6)
   void clearAddress() => $_clearField(6);
   @$pb.TagNumber(6)
-  $70.Address ensureAddress() => $_ensure(4);
+  $0.Address ensureAddress() => $_ensure(4);
 
   @$pb.TagNumber(7)
-  $70.ActorContact get contact => $_getN(5);
+  $0.ActorContact get contact => $_getN(5);
   @$pb.TagNumber(7)
-  set contact($70.ActorContact value) => $_setField(7, value);
+  set contact($0.ActorContact value) => $_setField(7, value);
   @$pb.TagNumber(7)
   $core.bool hasContact() => $_has(5);
   @$pb.TagNumber(7)
   void clearContact() => $_clearField(7);
   @$pb.TagNumber(7)
-  $70.ActorContact ensureContact() => $_ensure(5);
+  $0.ActorContact ensureContact() => $_ensure(5);
 
   @$pb.TagNumber(8)
-  $70.ActorTypology get typology => $_getN(6);
+  $0.ActorTypology get typology => $_getN(6);
   @$pb.TagNumber(8)
-  set typology($70.ActorTypology value) => $_setField(8, value);
+  set typology($0.ActorTypology value) => $_setField(8, value);
   @$pb.TagNumber(8)
   $core.bool hasTypology() => $_has(6);
   @$pb.TagNumber(8)

lib/admin-actor.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from admin-actor.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/admin-actor.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from admin-actor.proto.
-//  source: admin-actor.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/admin-partner.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from admin-partner.proto.
-//  source: admin-partner.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,8 +14,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'admin-actor.pb.dart' as $74;
+import 'admin-actor.pb.dart' as $1;
-import 'repositoryShared.pb.dart' as $70;
+import 'repositoryShared.pb.dart' as $0;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
@@ -24,10 +24,10 @@ class AdminPartner extends $pb.GeneratedMessage {
     $core.String? iD,
     $core.String? name,
     $core.String? legalStructure,
-    $70.Address? address,
+    $0.Address? address,
     $core.String? organisationID,
     $core.Iterable<$core.String>? actorIDs,
-    $core.Iterable<$74.AdminActor>? actors,
+    $core.Iterable<$1.AdminActor>? actors,
     $core.String? photoURI,
   }) {
     final result = create();
@@ -51,10 +51,10 @@ class AdminPartner extends $pb.GeneratedMessage {
     ..aOS(1, _omitFieldNames ? '' : 'ID', protoName: 'ID')
     ..aOS(2, _omitFieldNames ? '' : 'Name', protoName: 'Name')
     ..aOS(3, _omitFieldNames ? '' : 'LegalStructure', protoName: 'LegalStructure')
-    ..aOM<$70.Address>(4, _omitFieldNames ? '' : 'Address', protoName: 'Address', subBuilder: $70.Address.create)
+    ..aOM<$0.Address>(4, _omitFieldNames ? '' : 'Address', protoName: 'Address', subBuilder: $0.Address.create)
     ..aOS(5, _omitFieldNames ? '' : 'OrganisationID', protoName: 'OrganisationID')
     ..pPS(6, _omitFieldNames ? '' : 'ActorIDs', protoName: 'ActorIDs')
-    ..pc<$74.AdminActor>(7, _omitFieldNames ? '' : 'Actors', $pb.PbFieldType.PM, protoName: 'Actors', subBuilder: $74.AdminActor.create)
+    ..pc<$1.AdminActor>(7, _omitFieldNames ? '' : 'Actors', $pb.PbFieldType.PM, protoName: 'Actors', subBuilder: $1.AdminActor.create)
     ..aOS(8, _omitFieldNames ? '' : 'PhotoURI', protoName: 'PhotoURI')
     ..hasRequiredFields = false
   ;
@@ -104,15 +104,15 @@ class AdminPartner extends $pb.GeneratedMessage {
   void clearLegalStructure() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $70.Address get address => $_getN(3);
+  $0.Address get address => $_getN(3);
   @$pb.TagNumber(4)
-  set address($70.Address value) => $_setField(4, value);
+  set address($0.Address value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasAddress() => $_has(3);
   @$pb.TagNumber(4)
   void clearAddress() => $_clearField(4);
   @$pb.TagNumber(4)
-  $70.Address ensureAddress() => $_ensure(3);
+  $0.Address ensureAddress() => $_ensure(3);
 
   @$pb.TagNumber(5)
   $core.String get organisationID => $_getSZ(4);
@@ -129,7 +129,7 @@ class AdminPartner extends $pb.GeneratedMessage {
 
   /// In not accepted / Out Actors are returned
   @$pb.TagNumber(7)
-  $pb.PbList<$74.AdminActor> get actors => $_getList(6);
+  $pb.PbList<$1.AdminActor> get actors => $_getList(6);
 
   @$pb.TagNumber(8)
   $core.String get photoURI => $_getSZ(7);

lib/admin-partner.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from admin-partner.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/admin-partner.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from admin-partner.proto.
-//  source: admin-partner.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/adminConnection.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from adminConnection.proto.
-//  source: adminConnection.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,7 +14,7 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
@@ -85,7 +85,7 @@ class AdminConnection extends $pb.GeneratedMessage {
 class ArgElement extends $pb.GeneratedMessage {
   factory ArgElement({
     $core.String? key,
-    $3.ValueType? value,
+    $1.ValueType? value,
   }) {
     final result = create();
     if (key != null) result.key = key;
@@ -100,7 +100,7 @@ class ArgElement extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ArgElement', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'Key', protoName: 'Key')
-    ..aOM<$3.ValueType>(2, _omitFieldNames ? '' : 'Value', protoName: 'Value', subBuilder: $3.ValueType.create)
+    ..aOM<$1.ValueType>(2, _omitFieldNames ? '' : 'Value', protoName: 'Value', subBuilder: $1.ValueType.create)
     ..hasRequiredFields = false
   ;
 
@@ -131,15 +131,15 @@ class ArgElement extends $pb.GeneratedMessage {
   void clearKey() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $3.ValueType get value => $_getN(1);
+  $1.ValueType get value => $_getN(1);
   @$pb.TagNumber(2)
-  set value($3.ValueType value) => $_setField(2, value);
+  set value($1.ValueType value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasValue() => $_has(1);
   @$pb.TagNumber(2)
   void clearValue() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.ValueType ensureValue() => $_ensure(1);
+  $1.ValueType ensureValue() => $_ensure(1);
 }
 
 class RegisterConnectionManagerRequest extends $pb.GeneratedMessage {

lib/adminConnection.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from adminConnection.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/adminConnection.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from adminConnection.proto.
-//  source: adminConnection.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,7 +16,7 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'adminConnection.pb.dart' as $5;
+import 'adminConnection.pb.dart' as $0;
 
 export 'adminConnection.pb.dart';
 
@@ -30,24 +30,26 @@ class AdminConnectionServiceClient extends $grpc.Client {
     '',
   ];
 
-  static final _$registerConnectionManager = $grpc.ClientMethod<$5.RegisterConnectionManagerRequest, $5.RegisterConnectionManagerResult>(
-      '/api.AdminConnectionService/RegisterConnectionManager',
-      ($5.RegisterConnectionManagerRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $5.RegisterConnectionManagerResult.fromBuffer(value));
-  static final _$listConnectionManager = $grpc.ClientMethod<$5.ListConnectionManagerRequest, $5.ListConnectionManagerResult>(
-      '/api.AdminConnectionService/ListConnectionManager',
-      ($5.ListConnectionManagerRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $5.ListConnectionManagerResult.fromBuffer(value));
-
   AdminConnectionServiceClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$5.RegisterConnectionManagerResult> registerConnectionManager($5.RegisterConnectionManagerRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.RegisterConnectionManagerResult> registerConnectionManager($0.RegisterConnectionManagerRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$registerConnectionManager, request, options: options);
   }
 
-  $grpc.ResponseFuture<$5.ListConnectionManagerResult> listConnectionManager($5.ListConnectionManagerRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ListConnectionManagerResult> listConnectionManager($0.ListConnectionManagerRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$listConnectionManager, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$registerConnectionManager = $grpc.ClientMethod<$0.RegisterConnectionManagerRequest, $0.RegisterConnectionManagerResult>(
+      '/api.AdminConnectionService/RegisterConnectionManager',
+      ($0.RegisterConnectionManagerRequest value) => value.writeToBuffer(),
+      $0.RegisterConnectionManagerResult.fromBuffer);
+  static final _$listConnectionManager = $grpc.ClientMethod<$0.ListConnectionManagerRequest, $0.ListConnectionManagerResult>(
+      '/api.AdminConnectionService/ListConnectionManager',
+      ($0.ListConnectionManagerRequest value) => value.writeToBuffer(),
+      $0.ListConnectionManagerResult.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.AdminConnectionService')
@@ -55,30 +57,32 @@ abstract class AdminConnectionServiceBase extends $grpc.Service {
   $core.String get $name => 'api.AdminConnectionService';
 
   AdminConnectionServiceBase() {
-    $addMethod($grpc.ServiceMethod<$5.RegisterConnectionManagerRequest, $5.RegisterConnectionManagerResult>(
+    $addMethod($grpc.ServiceMethod<$0.RegisterConnectionManagerRequest, $0.RegisterConnectionManagerResult>(
         'RegisterConnectionManager',
         registerConnectionManager_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $5.RegisterConnectionManagerRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.RegisterConnectionManagerRequest.fromBuffer(value),
-        ($5.RegisterConnectionManagerResult value) => value.writeToBuffer()));
+        ($0.RegisterConnectionManagerResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$5.ListConnectionManagerRequest, $5.ListConnectionManagerResult>(
+    $addMethod($grpc.ServiceMethod<$0.ListConnectionManagerRequest, $0.ListConnectionManagerResult>(
         'ListConnectionManager',
         listConnectionManager_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $5.ListConnectionManagerRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ListConnectionManagerRequest.fromBuffer(value),
-        ($5.ListConnectionManagerResult value) => value.writeToBuffer()));
+        ($0.ListConnectionManagerResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$5.RegisterConnectionManagerResult> registerConnectionManager_Pre($grpc.ServiceCall $call, $async.Future<$5.RegisterConnectionManagerRequest> $request) async {
+  $async.Future<$0.RegisterConnectionManagerResult> registerConnectionManager_Pre($grpc.ServiceCall $call, $async.Future<$0.RegisterConnectionManagerRequest> $request) async {
     return registerConnectionManager($call, await $request);
   }
 
-  $async.Future<$5.ListConnectionManagerResult> listConnectionManager_Pre($grpc.ServiceCall $call, $async.Future<$5.ListConnectionManagerRequest> $request) async {
+  $async.Future<$0.RegisterConnectionManagerResult> registerConnectionManager($grpc.ServiceCall call, $0.RegisterConnectionManagerRequest request);
+
+  $async.Future<$0.ListConnectionManagerResult> listConnectionManager_Pre($grpc.ServiceCall $call, $async.Future<$0.ListConnectionManagerRequest> $request) async {
     return listConnectionManager($call, await $request);
   }
 
-  $async.Future<$5.RegisterConnectionManagerResult> registerConnectionManager($grpc.ServiceCall call, $5.RegisterConnectionManagerRequest request);
+  $async.Future<$0.ListConnectionManagerResult> listConnectionManager($grpc.ServiceCall call, $0.ListConnectionManagerRequest request);
-  $async.Future<$5.ListConnectionManagerResult> listConnectionManager($grpc.ServiceCall call, $5.ListConnectionManagerRequest request);
+
 }

lib/adminConnection.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from adminConnection.proto.
-//  source: adminConnection.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/annotations.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from annotations.proto.
-//  source: annotations.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,16 +14,16 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'openapiv2.pb.dart' as $75;
+import 'openapiv2.pb.dart' as $0;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
 class Annotations {
-  static final openapiv2Swagger = $pb.Extension<$75.Swagger>(_omitMessageNames ? '' : 'google.protobuf.FileOptions', _omitFieldNames ? '' : 'openapiv2Swagger', 1042, $pb.PbFieldType.OM, defaultOrMaker: $75.Swagger.getDefault, subBuilder: $75.Swagger.create);
+  static final openapiv2Swagger = $pb.Extension<$0.Swagger>(_omitMessageNames ? '' : 'google.protobuf.FileOptions', _omitFieldNames ? '' : 'openapiv2Swagger', 1042, $pb.PbFieldType.OM, defaultOrMaker: $0.Swagger.getDefault, subBuilder: $0.Swagger.create);
-  static final openapiv2Operation = $pb.Extension<$75.Operation>(_omitMessageNames ? '' : 'google.protobuf.MethodOptions', _omitFieldNames ? '' : 'openapiv2Operation', 1042, $pb.PbFieldType.OM, defaultOrMaker: $75.Operation.getDefault, subBuilder: $75.Operation.create);
+  static final openapiv2Operation = $pb.Extension<$0.Operation>(_omitMessageNames ? '' : 'google.protobuf.MethodOptions', _omitFieldNames ? '' : 'openapiv2Operation', 1042, $pb.PbFieldType.OM, defaultOrMaker: $0.Operation.getDefault, subBuilder: $0.Operation.create);
-  static final openapiv2Schema = $pb.Extension<$75.Schema>(_omitMessageNames ? '' : 'google.protobuf.MessageOptions', _omitFieldNames ? '' : 'openapiv2Schema', 1042, $pb.PbFieldType.OM, defaultOrMaker: $75.Schema.getDefault, subBuilder: $75.Schema.create);
+  static final openapiv2Schema = $pb.Extension<$0.Schema>(_omitMessageNames ? '' : 'google.protobuf.MessageOptions', _omitFieldNames ? '' : 'openapiv2Schema', 1042, $pb.PbFieldType.OM, defaultOrMaker: $0.Schema.getDefault, subBuilder: $0.Schema.create);
-  static final openapiv2Tag = $pb.Extension<$75.Tag>(_omitMessageNames ? '' : 'google.protobuf.ServiceOptions', _omitFieldNames ? '' : 'openapiv2Tag', 1042, $pb.PbFieldType.OM, defaultOrMaker: $75.Tag.getDefault, subBuilder: $75.Tag.create);
+  static final openapiv2Tag = $pb.Extension<$0.Tag>(_omitMessageNames ? '' : 'google.protobuf.ServiceOptions', _omitFieldNames ? '' : 'openapiv2Tag', 1042, $pb.PbFieldType.OM, defaultOrMaker: $0.Tag.getDefault, subBuilder: $0.Tag.create);
-  static final openapiv2Field = $pb.Extension<$75.JSONSchema>(_omitMessageNames ? '' : 'google.protobuf.FieldOptions', _omitFieldNames ? '' : 'openapiv2Field', 1042, $pb.PbFieldType.OM, defaultOrMaker: $75.JSONSchema.getDefault, subBuilder: $75.JSONSchema.create);
+  static final openapiv2Field = $pb.Extension<$0.JSONSchema>(_omitMessageNames ? '' : 'google.protobuf.FieldOptions', _omitFieldNames ? '' : 'openapiv2Field', 1042, $pb.PbFieldType.OM, defaultOrMaker: $0.JSONSchema.getDefault, subBuilder: $0.JSONSchema.create);
   static void registerAllExtensions($pb.ExtensionRegistry registry) {
     registry.add(openapiv2Swagger);
     registry.add(openapiv2Operation);

lib/annotations.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from annotations.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/annotations.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from annotations.proto.
-//  source: annotations.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/api.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from api.proto.
-//  source: api.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,15 +14,15 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'module.pb.dart' as $37;
+import 'module.pb.dart' as $3;
-import 'role.pb.dart' as $55;
+import 'role.pb.dart' as $2;
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
 class GetPermissionsRequest extends $pb.GeneratedMessage {
   factory GetPermissionsRequest({
-    $3.ResourceType? rscType,
+    $1.ResourceType? rscType,
     $core.String? client,
     $core.String? service,
   }) {
@@ -39,7 +39,7 @@ class GetPermissionsRequest extends $pb.GeneratedMessage {
   factory GetPermissionsRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetPermissionsRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..e<$3.ResourceType>(1, _omitFieldNames ? '' : 'RscType', $pb.PbFieldType.OE, protoName: 'RscType', defaultOrMaker: $3.ResourceType.RESOURCE_TYPE_UNKNOWN, valueOf: $3.ResourceType.valueOf, enumValues: $3.ResourceType.values)
+    ..e<$1.ResourceType>(1, _omitFieldNames ? '' : 'RscType', $pb.PbFieldType.OE, protoName: 'RscType', defaultOrMaker: $1.ResourceType.RESOURCE_TYPE_UNKNOWN, valueOf: $1.ResourceType.valueOf, enumValues: $1.ResourceType.values)
     ..aOS(2, _omitFieldNames ? '' : 'Client', protoName: 'Client')
     ..aOS(3, _omitFieldNames ? '' : 'Service', protoName: 'Service')
     ..hasRequiredFields = false
@@ -63,9 +63,9 @@ class GetPermissionsRequest extends $pb.GeneratedMessage {
   static GetPermissionsRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.ResourceType get rscType => $_getN(0);
+  $1.ResourceType get rscType => $_getN(0);
   @$pb.TagNumber(1)
-  set rscType($3.ResourceType value) => $_setField(1, value);
+  set rscType($1.ResourceType value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasRscType() => $_has(0);
   @$pb.TagNumber(1)
@@ -92,7 +92,7 @@ class GetPermissionsRequest extends $pb.GeneratedMessage {
 
 class GetPermissionsResult extends $pb.GeneratedMessage {
   factory GetPermissionsResult({
-    $core.Iterable<$3.Permission>? permissions,
+    $core.Iterable<$1.Permission>? permissions,
   }) {
     final result = create();
     if (permissions != null) result.permissions.addAll(permissions);
@@ -105,7 +105,7 @@ class GetPermissionsResult extends $pb.GeneratedMessage {
   factory GetPermissionsResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetPermissionsResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$3.Permission>(5, _omitFieldNames ? '' : 'Permissions', $pb.PbFieldType.PM, protoName: 'Permissions', subBuilder: $3.Permission.create)
+    ..pc<$1.Permission>(5, _omitFieldNames ? '' : 'Permissions', $pb.PbFieldType.PM, protoName: 'Permissions', subBuilder: $1.Permission.create)
     ..hasRequiredFields = false
   ;
 
@@ -127,12 +127,12 @@ class GetPermissionsResult extends $pb.GeneratedMessage {
   static GetPermissionsResult? _defaultInstance;
 
   @$pb.TagNumber(5)
-  $pb.PbList<$3.Permission> get permissions => $_getList(0);
+  $pb.PbList<$1.Permission> get permissions => $_getList(0);
 }
 
 class GetUIPermissionsRequest extends $pb.GeneratedMessage {
   factory GetUIPermissionsRequest({
-    $3.ResourceType? rscType,
+    $1.ResourceType? rscType,
     $core.String? client,
     $core.String? service,
   }) {
@@ -149,7 +149,7 @@ class GetUIPermissionsRequest extends $pb.GeneratedMessage {
   factory GetUIPermissionsRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetUIPermissionsRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..e<$3.ResourceType>(1, _omitFieldNames ? '' : 'RscType', $pb.PbFieldType.OE, protoName: 'RscType', defaultOrMaker: $3.ResourceType.RESOURCE_TYPE_UNKNOWN, valueOf: $3.ResourceType.valueOf, enumValues: $3.ResourceType.values)
+    ..e<$1.ResourceType>(1, _omitFieldNames ? '' : 'RscType', $pb.PbFieldType.OE, protoName: 'RscType', defaultOrMaker: $1.ResourceType.RESOURCE_TYPE_UNKNOWN, valueOf: $1.ResourceType.valueOf, enumValues: $1.ResourceType.values)
     ..aOS(2, _omitFieldNames ? '' : 'Client', protoName: 'Client')
     ..aOS(3, _omitFieldNames ? '' : 'Service', protoName: 'Service')
     ..hasRequiredFields = false
@@ -173,9 +173,9 @@ class GetUIPermissionsRequest extends $pb.GeneratedMessage {
   static GetUIPermissionsRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.ResourceType get rscType => $_getN(0);
+  $1.ResourceType get rscType => $_getN(0);
   @$pb.TagNumber(1)
-  set rscType($3.ResourceType value) => $_setField(1, value);
+  set rscType($1.ResourceType value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasRscType() => $_has(0);
   @$pb.TagNumber(1)
@@ -202,7 +202,7 @@ class GetUIPermissionsRequest extends $pb.GeneratedMessage {
 
 class GetUIPermissionsResult extends $pb.GeneratedMessage {
   factory GetUIPermissionsResult({
-    $core.Iterable<$3.Permission>? permissions,
+    $core.Iterable<$1.Permission>? permissions,
   }) {
     final result = create();
     if (permissions != null) result.permissions.addAll(permissions);
@@ -215,7 +215,7 @@ class GetUIPermissionsResult extends $pb.GeneratedMessage {
   factory GetUIPermissionsResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetUIPermissionsResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$3.Permission>(1, _omitFieldNames ? '' : 'Permissions', $pb.PbFieldType.PM, protoName: 'Permissions', subBuilder: $3.Permission.create)
+    ..pc<$1.Permission>(1, _omitFieldNames ? '' : 'Permissions', $pb.PbFieldType.PM, protoName: 'Permissions', subBuilder: $1.Permission.create)
     ..hasRequiredFields = false
   ;
 
@@ -237,7 +237,7 @@ class GetUIPermissionsResult extends $pb.GeneratedMessage {
   static GetUIPermissionsResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $pb.PbList<$3.Permission> get permissions => $_getList(0);
+  $pb.PbList<$1.Permission> get permissions => $_getList(0);
 }
 
 class ListUserUIPermissionsRequest extends $pb.GeneratedMessage {
@@ -288,7 +288,7 @@ class ListUserUIPermissionsRequest extends $pb.GeneratedMessage {
 
 class ListUserUIPermissionsResult extends $pb.GeneratedMessage {
   factory ListUserUIPermissionsResult({
-    $core.Iterable<$3.UserUIPermissions>? permissions,
+    $core.Iterable<$1.UserUIPermissions>? permissions,
   }) {
     final result = create();
     if (permissions != null) result.permissions.addAll(permissions);
@@ -301,7 +301,7 @@ class ListUserUIPermissionsResult extends $pb.GeneratedMessage {
   factory ListUserUIPermissionsResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListUserUIPermissionsResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$3.UserUIPermissions>(2, _omitFieldNames ? '' : 'Permissions', $pb.PbFieldType.PM, protoName: 'Permissions', subBuilder: $3.UserUIPermissions.create)
+    ..pc<$1.UserUIPermissions>(2, _omitFieldNames ? '' : 'Permissions', $pb.PbFieldType.PM, protoName: 'Permissions', subBuilder: $1.UserUIPermissions.create)
     ..hasRequiredFields = false
   ;
 
@@ -323,17 +323,17 @@ class ListUserUIPermissionsResult extends $pb.GeneratedMessage {
   static ListUserUIPermissionsResult? _defaultInstance;
 
   @$pb.TagNumber(2)
-  $pb.PbList<$3.UserUIPermissions> get permissions => $_getList(0);
+  $pb.PbList<$1.UserUIPermissions> get permissions => $_getList(0);
 }
 
 class RegisterPackageRequest extends $pb.GeneratedMessage {
   factory RegisterPackageRequest({
     $core.String? packageName,
-    $core.Iterable<$3.ClientAPI>? clients,
+    $core.Iterable<$1.ClientAPI>? clients,
     $core.bool? forceFullScopeCreation,
-    $core.Iterable<$55.Role>? roles,
+    $core.Iterable<$2.Role>? roles,
-    $core.Iterable<$3.ModuleRegistration>? workflows,
+    $core.Iterable<$1.ModuleRegistration>? workflows,
-    $core.Iterable<$37.Module>? modules,
+    $core.Iterable<$3.Module>? modules,
   }) {
     final result = create();
     if (packageName != null) result.packageName = packageName;
@@ -352,11 +352,11 @@ class RegisterPackageRequest extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RegisterPackageRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'PackageName', protoName: 'PackageName')
-    ..pc<$3.ClientAPI>(2, _omitFieldNames ? '' : 'Clients', $pb.PbFieldType.PM, protoName: 'Clients', subBuilder: $3.ClientAPI.create)
+    ..pc<$1.ClientAPI>(2, _omitFieldNames ? '' : 'Clients', $pb.PbFieldType.PM, protoName: 'Clients', subBuilder: $1.ClientAPI.create)
     ..aOB(3, _omitFieldNames ? '' : 'ForceFullScopeCreation', protoName: 'ForceFullScopeCreation')
-    ..pc<$55.Role>(4, _omitFieldNames ? '' : 'Roles', $pb.PbFieldType.PM, protoName: 'Roles', subBuilder: $55.Role.create)
+    ..pc<$2.Role>(4, _omitFieldNames ? '' : 'Roles', $pb.PbFieldType.PM, protoName: 'Roles', subBuilder: $2.Role.create)
-    ..pc<$3.ModuleRegistration>(5, _omitFieldNames ? '' : 'Workflows', $pb.PbFieldType.PM, protoName: 'Workflows', subBuilder: $3.ModuleRegistration.create)
+    ..pc<$1.ModuleRegistration>(5, _omitFieldNames ? '' : 'Workflows', $pb.PbFieldType.PM, protoName: 'Workflows', subBuilder: $1.ModuleRegistration.create)
-    ..pc<$37.Module>(6, _omitFieldNames ? '' : 'Modules', $pb.PbFieldType.PM, protoName: 'Modules', subBuilder: $37.Module.create)
+    ..pc<$3.Module>(6, _omitFieldNames ? '' : 'Modules', $pb.PbFieldType.PM, protoName: 'Modules', subBuilder: $3.Module.create)
     ..hasRequiredFields = false
   ;
 
@@ -387,7 +387,7 @@ class RegisterPackageRequest extends $pb.GeneratedMessage {
   void clearPackageName() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $pb.PbList<$3.ClientAPI> get clients => $_getList(1);
+  $pb.PbList<$1.ClientAPI> get clients => $_getList(1);
 
   @$pb.TagNumber(3)
   $core.bool get forceFullScopeCreation => $_getBF(2);
@@ -399,13 +399,13 @@ class RegisterPackageRequest extends $pb.GeneratedMessage {
   void clearForceFullScopeCreation() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $pb.PbList<$55.Role> get roles => $_getList(3);
+  $pb.PbList<$2.Role> get roles => $_getList(3);
 
   @$pb.TagNumber(5)
-  $pb.PbList<$3.ModuleRegistration> get workflows => $_getList(4);
+  $pb.PbList<$1.ModuleRegistration> get workflows => $_getList(4);
 
   @$pb.TagNumber(6)
-  $pb.PbList<$37.Module> get modules => $_getList(5);
+  $pb.PbList<$3.Module> get modules => $_getList(5);
 }
 
 class RegisterPackageResult extends $pb.GeneratedMessage {
@@ -442,7 +442,7 @@ class CreateScopeRequest extends $pb.GeneratedMessage {
   factory CreateScopeRequest({
     $core.String? moduleName,
     $core.String? client,
-    $3.Scope? scope,
+    $1.Scope? scope,
   }) {
     final result = create();
     if (moduleName != null) result.moduleName = moduleName;
@@ -459,7 +459,7 @@ class CreateScopeRequest extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateScopeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'ModuleName', protoName: 'ModuleName')
     ..aOS(2, _omitFieldNames ? '' : 'Client', protoName: 'Client')
-    ..aOM<$3.Scope>(3, _omitFieldNames ? '' : 'Scope', protoName: 'Scope', subBuilder: $3.Scope.create)
+    ..aOM<$1.Scope>(3, _omitFieldNames ? '' : 'Scope', protoName: 'Scope', subBuilder: $1.Scope.create)
     ..hasRequiredFields = false
   ;
 
@@ -499,15 +499,15 @@ class CreateScopeRequest extends $pb.GeneratedMessage {
   void clearClient() => $_clearField(2);
 
   @$pb.TagNumber(3)
-  $3.Scope get scope => $_getN(2);
+  $1.Scope get scope => $_getN(2);
   @$pb.TagNumber(3)
-  set scope($3.Scope value) => $_setField(3, value);
+  set scope($1.Scope value) => $_setField(3, value);
   @$pb.TagNumber(3)
   $core.bool hasScope() => $_has(2);
   @$pb.TagNumber(3)
   void clearScope() => $_clearField(3);
   @$pb.TagNumber(3)
-  $3.Scope ensureScope() => $_ensure(2);
+  $1.Scope ensureScope() => $_ensure(2);
 }
 
 class CreateScopeResult extends $pb.GeneratedMessage {
@@ -544,7 +544,7 @@ class DeleteScopeRequest extends $pb.GeneratedMessage {
   factory DeleteScopeRequest({
     $core.String? moduleName,
     $core.String? client,
-    $3.Scope? scope,
+    $1.Scope? scope,
   }) {
     final result = create();
     if (moduleName != null) result.moduleName = moduleName;
@@ -561,7 +561,7 @@ class DeleteScopeRequest extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteScopeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'ModuleName', protoName: 'ModuleName')
     ..aOS(2, _omitFieldNames ? '' : 'Client', protoName: 'Client')
-    ..aOM<$3.Scope>(3, _omitFieldNames ? '' : 'Scope', protoName: 'Scope', subBuilder: $3.Scope.create)
+    ..aOM<$1.Scope>(3, _omitFieldNames ? '' : 'Scope', protoName: 'Scope', subBuilder: $1.Scope.create)
     ..hasRequiredFields = false
   ;
 
@@ -601,15 +601,15 @@ class DeleteScopeRequest extends $pb.GeneratedMessage {
   void clearClient() => $_clearField(2);
 
   @$pb.TagNumber(3)
-  $3.Scope get scope => $_getN(2);
+  $1.Scope get scope => $_getN(2);
   @$pb.TagNumber(3)
-  set scope($3.Scope value) => $_setField(3, value);
+  set scope($1.Scope value) => $_setField(3, value);
   @$pb.TagNumber(3)
   $core.bool hasScope() => $_has(2);
   @$pb.TagNumber(3)
   void clearScope() => $_clearField(3);
   @$pb.TagNumber(3)
-  $3.Scope ensureScope() => $_ensure(2);
+  $1.Scope ensureScope() => $_ensure(2);
 }
 
 class DeleteScopeResult extends $pb.GeneratedMessage {
@@ -645,7 +645,7 @@ class DeleteScopeResult extends $pb.GeneratedMessage {
 class CleanScopeRequest extends $pb.GeneratedMessage {
   factory CleanScopeRequest({
     $core.String? client,
-    $3.Scope? scope,
+    $1.Scope? scope,
   }) {
     final result = create();
     if (client != null) result.client = client;
@@ -660,7 +660,7 @@ class CleanScopeRequest extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CleanScopeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'Client', protoName: 'Client')
-    ..aOM<$3.Scope>(2, _omitFieldNames ? '' : 'Scope', protoName: 'Scope', subBuilder: $3.Scope.create)
+    ..aOM<$1.Scope>(2, _omitFieldNames ? '' : 'Scope', protoName: 'Scope', subBuilder: $1.Scope.create)
     ..hasRequiredFields = false
   ;
 
@@ -691,15 +691,15 @@ class CleanScopeRequest extends $pb.GeneratedMessage {
   void clearClient() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $3.Scope get scope => $_getN(1);
+  $1.Scope get scope => $_getN(1);
   @$pb.TagNumber(2)
-  set scope($3.Scope value) => $_setField(2, value);
+  set scope($1.Scope value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasScope() => $_has(1);
   @$pb.TagNumber(2)
   void clearScope() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.Scope ensureScope() => $_ensure(1);
+  $1.Scope ensureScope() => $_ensure(1);
 }
 
 class CleanScopeResult extends $pb.GeneratedMessage {

lib/api.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from api.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/api.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from api.proto.
-//  source: api.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,7 +16,7 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'api.pb.dart' as $6;
+import 'api.pb.dart' as $0;
 
 export 'api.pb.dart';
 
@@ -30,64 +30,66 @@ class APIServiceClient extends $grpc.Client {
     '',
   ];
 
-  static final _$getPermissions = $grpc.ClientMethod<$6.GetPermissionsRequest, $6.GetPermissionsResult>(
-      '/api.APIService/GetPermissions',
-      ($6.GetPermissionsRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $6.GetPermissionsResult.fromBuffer(value));
-  static final _$getUIPermissions = $grpc.ClientMethod<$6.GetUIPermissionsRequest, $6.GetUIPermissionsResult>(
-      '/api.APIService/GetUIPermissions',
-      ($6.GetUIPermissionsRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $6.GetUIPermissionsResult.fromBuffer(value));
-  static final _$listUserUIPermissions = $grpc.ClientMethod<$6.ListUserUIPermissionsRequest, $6.ListUserUIPermissionsResult>(
-      '/api.APIService/ListUserUIPermissions',
-      ($6.ListUserUIPermissionsRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $6.ListUserUIPermissionsResult.fromBuffer(value));
-  static final _$registerPackage = $grpc.ClientMethod<$6.RegisterPackageRequest, $6.RegisterPackageResult>(
-      '/api.APIService/RegisterPackage',
-      ($6.RegisterPackageRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $6.RegisterPackageResult.fromBuffer(value));
-  static final _$createScope = $grpc.ClientMethod<$6.CreateScopeRequest, $6.CreateScopeResult>(
-      '/api.APIService/CreateScope',
-      ($6.CreateScopeRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $6.CreateScopeResult.fromBuffer(value));
-  static final _$deleteScope = $grpc.ClientMethod<$6.DeleteScopeRequest, $6.DeleteScopeResult>(
-      '/api.APIService/DeleteScope',
-      ($6.DeleteScopeRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $6.DeleteScopeResult.fromBuffer(value));
-  static final _$cleanScope = $grpc.ClientMethod<$6.CleanScopeRequest, $6.CleanScopeResult>(
-      '/api.APIService/CleanScope',
-      ($6.CleanScopeRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $6.CleanScopeResult.fromBuffer(value));
-
   APIServiceClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$6.GetPermissionsResult> getPermissions($6.GetPermissionsRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.GetPermissionsResult> getPermissions($0.GetPermissionsRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$getPermissions, request, options: options);
   }
 
-  $grpc.ResponseFuture<$6.GetUIPermissionsResult> getUIPermissions($6.GetUIPermissionsRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.GetUIPermissionsResult> getUIPermissions($0.GetUIPermissionsRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$getUIPermissions, request, options: options);
   }
 
-  $grpc.ResponseFuture<$6.ListUserUIPermissionsResult> listUserUIPermissions($6.ListUserUIPermissionsRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ListUserUIPermissionsResult> listUserUIPermissions($0.ListUserUIPermissionsRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$listUserUIPermissions, request, options: options);
   }
 
-  $grpc.ResponseFuture<$6.RegisterPackageResult> registerPackage($6.RegisterPackageRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.RegisterPackageResult> registerPackage($0.RegisterPackageRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$registerPackage, request, options: options);
   }
 
-  $grpc.ResponseFuture<$6.CreateScopeResult> createScope($6.CreateScopeRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.CreateScopeResult> createScope($0.CreateScopeRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$createScope, request, options: options);
   }
 
-  $grpc.ResponseFuture<$6.DeleteScopeResult> deleteScope($6.DeleteScopeRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.DeleteScopeResult> deleteScope($0.DeleteScopeRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$deleteScope, request, options: options);
   }
 
-  $grpc.ResponseFuture<$6.CleanScopeResult> cleanScope($6.CleanScopeRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.CleanScopeResult> cleanScope($0.CleanScopeRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$cleanScope, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$getPermissions = $grpc.ClientMethod<$0.GetPermissionsRequest, $0.GetPermissionsResult>(
+      '/api.APIService/GetPermissions',
+      ($0.GetPermissionsRequest value) => value.writeToBuffer(),
+      $0.GetPermissionsResult.fromBuffer);
+  static final _$getUIPermissions = $grpc.ClientMethod<$0.GetUIPermissionsRequest, $0.GetUIPermissionsResult>(
+      '/api.APIService/GetUIPermissions',
+      ($0.GetUIPermissionsRequest value) => value.writeToBuffer(),
+      $0.GetUIPermissionsResult.fromBuffer);
+  static final _$listUserUIPermissions = $grpc.ClientMethod<$0.ListUserUIPermissionsRequest, $0.ListUserUIPermissionsResult>(
+      '/api.APIService/ListUserUIPermissions',
+      ($0.ListUserUIPermissionsRequest value) => value.writeToBuffer(),
+      $0.ListUserUIPermissionsResult.fromBuffer);
+  static final _$registerPackage = $grpc.ClientMethod<$0.RegisterPackageRequest, $0.RegisterPackageResult>(
+      '/api.APIService/RegisterPackage',
+      ($0.RegisterPackageRequest value) => value.writeToBuffer(),
+      $0.RegisterPackageResult.fromBuffer);
+  static final _$createScope = $grpc.ClientMethod<$0.CreateScopeRequest, $0.CreateScopeResult>(
+      '/api.APIService/CreateScope',
+      ($0.CreateScopeRequest value) => value.writeToBuffer(),
+      $0.CreateScopeResult.fromBuffer);
+  static final _$deleteScope = $grpc.ClientMethod<$0.DeleteScopeRequest, $0.DeleteScopeResult>(
+      '/api.APIService/DeleteScope',
+      ($0.DeleteScopeRequest value) => value.writeToBuffer(),
+      $0.DeleteScopeResult.fromBuffer);
+  static final _$cleanScope = $grpc.ClientMethod<$0.CleanScopeRequest, $0.CleanScopeResult>(
+      '/api.APIService/CleanScope',
+      ($0.CleanScopeRequest value) => value.writeToBuffer(),
+      $0.CleanScopeResult.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.APIService')
@@ -95,90 +97,97 @@ abstract class APIServiceBase extends $grpc.Service {
   $core.String get $name => 'api.APIService';
 
   APIServiceBase() {
-    $addMethod($grpc.ServiceMethod<$6.GetPermissionsRequest, $6.GetPermissionsResult>(
+    $addMethod($grpc.ServiceMethod<$0.GetPermissionsRequest, $0.GetPermissionsResult>(
         'GetPermissions',
         getPermissions_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $6.GetPermissionsRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.GetPermissionsRequest.fromBuffer(value),
-        ($6.GetPermissionsResult value) => value.writeToBuffer()));
+        ($0.GetPermissionsResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$6.GetUIPermissionsRequest, $6.GetUIPermissionsResult>(
+    $addMethod($grpc.ServiceMethod<$0.GetUIPermissionsRequest, $0.GetUIPermissionsResult>(
         'GetUIPermissions',
         getUIPermissions_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $6.GetUIPermissionsRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.GetUIPermissionsRequest.fromBuffer(value),
-        ($6.GetUIPermissionsResult value) => value.writeToBuffer()));
+        ($0.GetUIPermissionsResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$6.ListUserUIPermissionsRequest, $6.ListUserUIPermissionsResult>(
+    $addMethod($grpc.ServiceMethod<$0.ListUserUIPermissionsRequest, $0.ListUserUIPermissionsResult>(
         'ListUserUIPermissions',
         listUserUIPermissions_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $6.ListUserUIPermissionsRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ListUserUIPermissionsRequest.fromBuffer(value),
-        ($6.ListUserUIPermissionsResult value) => value.writeToBuffer()));
+        ($0.ListUserUIPermissionsResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$6.RegisterPackageRequest, $6.RegisterPackageResult>(
+    $addMethod($grpc.ServiceMethod<$0.RegisterPackageRequest, $0.RegisterPackageResult>(
         'RegisterPackage',
         registerPackage_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $6.RegisterPackageRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.RegisterPackageRequest.fromBuffer(value),
-        ($6.RegisterPackageResult value) => value.writeToBuffer()));
+        ($0.RegisterPackageResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$6.CreateScopeRequest, $6.CreateScopeResult>(
+    $addMethod($grpc.ServiceMethod<$0.CreateScopeRequest, $0.CreateScopeResult>(
         'CreateScope',
         createScope_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $6.CreateScopeRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.CreateScopeRequest.fromBuffer(value),
-        ($6.CreateScopeResult value) => value.writeToBuffer()));
+        ($0.CreateScopeResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$6.DeleteScopeRequest, $6.DeleteScopeResult>(
+    $addMethod($grpc.ServiceMethod<$0.DeleteScopeRequest, $0.DeleteScopeResult>(
         'DeleteScope',
         deleteScope_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $6.DeleteScopeRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.DeleteScopeRequest.fromBuffer(value),
-        ($6.DeleteScopeResult value) => value.writeToBuffer()));
+        ($0.DeleteScopeResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$6.CleanScopeRequest, $6.CleanScopeResult>(
+    $addMethod($grpc.ServiceMethod<$0.CleanScopeRequest, $0.CleanScopeResult>(
         'CleanScope',
         cleanScope_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $6.CleanScopeRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.CleanScopeRequest.fromBuffer(value),
-        ($6.CleanScopeResult value) => value.writeToBuffer()));
+        ($0.CleanScopeResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$6.GetPermissionsResult> getPermissions_Pre($grpc.ServiceCall $call, $async.Future<$6.GetPermissionsRequest> $request) async {
+  $async.Future<$0.GetPermissionsResult> getPermissions_Pre($grpc.ServiceCall $call, $async.Future<$0.GetPermissionsRequest> $request) async {
     return getPermissions($call, await $request);
   }
 
-  $async.Future<$6.GetUIPermissionsResult> getUIPermissions_Pre($grpc.ServiceCall $call, $async.Future<$6.GetUIPermissionsRequest> $request) async {
+  $async.Future<$0.GetPermissionsResult> getPermissions($grpc.ServiceCall call, $0.GetPermissionsRequest request);
+
+  $async.Future<$0.GetUIPermissionsResult> getUIPermissions_Pre($grpc.ServiceCall $call, $async.Future<$0.GetUIPermissionsRequest> $request) async {
     return getUIPermissions($call, await $request);
   }
 
-  $async.Future<$6.ListUserUIPermissionsResult> listUserUIPermissions_Pre($grpc.ServiceCall $call, $async.Future<$6.ListUserUIPermissionsRequest> $request) async {
+  $async.Future<$0.GetUIPermissionsResult> getUIPermissions($grpc.ServiceCall call, $0.GetUIPermissionsRequest request);
+
+  $async.Future<$0.ListUserUIPermissionsResult> listUserUIPermissions_Pre($grpc.ServiceCall $call, $async.Future<$0.ListUserUIPermissionsRequest> $request) async {
     return listUserUIPermissions($call, await $request);
   }
 
-  $async.Future<$6.RegisterPackageResult> registerPackage_Pre($grpc.ServiceCall $call, $async.Future<$6.RegisterPackageRequest> $request) async {
+  $async.Future<$0.ListUserUIPermissionsResult> listUserUIPermissions($grpc.ServiceCall call, $0.ListUserUIPermissionsRequest request);
+
+  $async.Future<$0.RegisterPackageResult> registerPackage_Pre($grpc.ServiceCall $call, $async.Future<$0.RegisterPackageRequest> $request) async {
     return registerPackage($call, await $request);
   }
 
-  $async.Future<$6.CreateScopeResult> createScope_Pre($grpc.ServiceCall $call, $async.Future<$6.CreateScopeRequest> $request) async {
+  $async.Future<$0.RegisterPackageResult> registerPackage($grpc.ServiceCall call, $0.RegisterPackageRequest request);
+
+  $async.Future<$0.CreateScopeResult> createScope_Pre($grpc.ServiceCall $call, $async.Future<$0.CreateScopeRequest> $request) async {
     return createScope($call, await $request);
   }
 
-  $async.Future<$6.DeleteScopeResult> deleteScope_Pre($grpc.ServiceCall $call, $async.Future<$6.DeleteScopeRequest> $request) async {
+  $async.Future<$0.CreateScopeResult> createScope($grpc.ServiceCall call, $0.CreateScopeRequest request);
+
+  $async.Future<$0.DeleteScopeResult> deleteScope_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteScopeRequest> $request) async {
     return deleteScope($call, await $request);
   }
 
-  $async.Future<$6.CleanScopeResult> cleanScope_Pre($grpc.ServiceCall $call, $async.Future<$6.CleanScopeRequest> $request) async {
+  $async.Future<$0.DeleteScopeResult> deleteScope($grpc.ServiceCall call, $0.DeleteScopeRequest request);
+
+  $async.Future<$0.CleanScopeResult> cleanScope_Pre($grpc.ServiceCall $call, $async.Future<$0.CleanScopeRequest> $request) async {
     return cleanScope($call, await $request);
   }
 
-  $async.Future<$6.GetPermissionsResult> getPermissions($grpc.ServiceCall call, $6.GetPermissionsRequest request);
+  $async.Future<$0.CleanScopeResult> cleanScope($grpc.ServiceCall call, $0.CleanScopeRequest request);
-  $async.Future<$6.GetUIPermissionsResult> getUIPermissions($grpc.ServiceCall call, $6.GetUIPermissionsRequest request);
+
-  $async.Future<$6.ListUserUIPermissionsResult> listUserUIPermissions($grpc.ServiceCall call, $6.ListUserUIPermissionsRequest request);
-  $async.Future<$6.RegisterPackageResult> registerPackage($grpc.ServiceCall call, $6.RegisterPackageRequest request);
-  $async.Future<$6.CreateScopeResult> createScope($grpc.ServiceCall call, $6.CreateScopeRequest request);
-  $async.Future<$6.DeleteScopeResult> deleteScope($grpc.ServiceCall call, $6.DeleteScopeRequest request);
-  $async.Future<$6.CleanScopeResult> cleanScope($grpc.ServiceCall call, $6.CleanScopeRequest request);
 }

lib/api.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from api.proto.
-//  source: api.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/appointment.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from appointment.proto.
-//  source: appointment.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,9 +14,9 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'collabShared.pb.dart' as $76;
+import 'collabShared.pb.dart' as $2;
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $0;
-import 'slotbooking.pb.dart' as $71;
+import 'slotbooking.pb.dart' as $1;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
@@ -24,8 +24,8 @@ export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 /// Aggregation object message
 class Appointment extends $pb.GeneratedMessage {
   factory Appointment({
-    $3.EventHeader? lastEventHeader,
+    $0.EventHeader? lastEventHeader,
-    $3.EntityID? iD,
+    $0.EntityID? iD,
     AppointmentPayload? payload,
   }) {
     final result = create();
@@ -41,8 +41,8 @@ class Appointment extends $pb.GeneratedMessage {
   factory Appointment.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Appointment', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.EventHeader>(1, _omitFieldNames ? '' : 'LastEventHeader', protoName: 'LastEventHeader', subBuilder: $3.EventHeader.create)
+    ..aOM<$0.EventHeader>(1, _omitFieldNames ? '' : 'LastEventHeader', protoName: 'LastEventHeader', subBuilder: $0.EventHeader.create)
-    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
+    ..aOM<$0.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $0.EntityID.create)
     ..aOM<AppointmentPayload>(3, _omitFieldNames ? '' : 'Payload', protoName: 'Payload', subBuilder: AppointmentPayload.create)
     ..hasRequiredFields = false
   ;
@@ -65,26 +65,26 @@ class Appointment extends $pb.GeneratedMessage {
   static Appointment? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.EventHeader get lastEventHeader => $_getN(0);
+  $0.EventHeader get lastEventHeader => $_getN(0);
   @$pb.TagNumber(1)
-  set lastEventHeader($3.EventHeader value) => $_setField(1, value);
+  set lastEventHeader($0.EventHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasLastEventHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearLastEventHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.EventHeader ensureLastEventHeader() => $_ensure(0);
+  $0.EventHeader ensureLastEventHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $3.EntityID get iD => $_getN(1);
+  $0.EntityID get iD => $_getN(1);
   @$pb.TagNumber(2)
-  set iD($3.EntityID value) => $_setField(2, value);
+  set iD($0.EntityID value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasID() => $_has(1);
   @$pb.TagNumber(2)
   void clearID() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.EntityID ensureID() => $_ensure(1);
+  $0.EntityID ensureID() => $_ensure(1);
 
   @$pb.TagNumber(3)
   AppointmentPayload get payload => $_getN(2);
@@ -100,15 +100,15 @@ class Appointment extends $pb.GeneratedMessage {
 
 class AppointmentPayload extends $pb.GeneratedMessage {
   factory AppointmentPayload({
-    $71.AppointmentType? appointmentType,
+    $1.AppointmentType? appointmentType,
-    $core.Iterable<$71.Commission>? commissions,
+    $core.Iterable<$1.Commission>? commissions,
-    $core.Iterable<$71.SegmentationSelection>? segmentationSelections,
+    $core.Iterable<$1.SegmentationSelection>? segmentationSelections,
-    $core.Iterable<$71.CarrierInformationWithValue>? carrierInformation,
+    $core.Iterable<$1.CarrierInformationWithValue>? carrierInformation,
-    $71.Slot? slot,
+    $1.Slot? slot,
     $core.Iterable<$core.String>? emails,
-    $76.AppointmentStatusStruct? status,
+    $2.AppointmentStatusStruct? status,
     $core.String? creationDate,
-    $core.Iterable<$3.MetadataElement>? metaData,
+    $core.Iterable<$0.MetadataElement>? metaData,
     $core.String? carrierID,
     $core.String? carrierName,
   }) {
@@ -133,15 +133,15 @@ class AppointmentPayload extends $pb.GeneratedMessage {
   factory AppointmentPayload.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentPayload', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..e<$71.AppointmentType>(1, _omitFieldNames ? '' : 'AppointmentType', $pb.PbFieldType.OE, protoName: 'AppointmentType', defaultOrMaker: $71.AppointmentType.APPOINTMENT_TYPE_UNKNOWN, valueOf: $71.AppointmentType.valueOf, enumValues: $71.AppointmentType.values)
+    ..e<$1.AppointmentType>(1, _omitFieldNames ? '' : 'AppointmentType', $pb.PbFieldType.OE, protoName: 'AppointmentType', defaultOrMaker: $1.AppointmentType.APPOINTMENT_TYPE_UNKNOWN, valueOf: $1.AppointmentType.valueOf, enumValues: $1.AppointmentType.values)
-    ..pc<$71.Commission>(2, _omitFieldNames ? '' : 'Commissions', $pb.PbFieldType.PM, protoName: 'Commissions', subBuilder: $71.Commission.create)
+    ..pc<$1.Commission>(2, _omitFieldNames ? '' : 'Commissions', $pb.PbFieldType.PM, protoName: 'Commissions', subBuilder: $1.Commission.create)
-    ..pc<$71.SegmentationSelection>(4, _omitFieldNames ? '' : 'SegmentationSelections', $pb.PbFieldType.PM, protoName: 'SegmentationSelections', subBuilder: $71.SegmentationSelection.create)
+    ..pc<$1.SegmentationSelection>(4, _omitFieldNames ? '' : 'SegmentationSelections', $pb.PbFieldType.PM, protoName: 'SegmentationSelections', subBuilder: $1.SegmentationSelection.create)
-    ..pc<$71.CarrierInformationWithValue>(5, _omitFieldNames ? '' : 'CarrierInformation', $pb.PbFieldType.PM, protoName: 'CarrierInformation', subBuilder: $71.CarrierInformationWithValue.create)
+    ..pc<$1.CarrierInformationWithValue>(5, _omitFieldNames ? '' : 'CarrierInformation', $pb.PbFieldType.PM, protoName: 'CarrierInformation', subBuilder: $1.CarrierInformationWithValue.create)
-    ..aOM<$71.Slot>(6, _omitFieldNames ? '' : 'Slot', protoName: 'Slot', subBuilder: $71.Slot.create)
+    ..aOM<$1.Slot>(6, _omitFieldNames ? '' : 'Slot', protoName: 'Slot', subBuilder: $1.Slot.create)
     ..pPS(7, _omitFieldNames ? '' : 'Emails', protoName: 'Emails')
-    ..aOM<$76.AppointmentStatusStruct>(8, _omitFieldNames ? '' : 'Status', protoName: 'Status', subBuilder: $76.AppointmentStatusStruct.create)
+    ..aOM<$2.AppointmentStatusStruct>(8, _omitFieldNames ? '' : 'Status', protoName: 'Status', subBuilder: $2.AppointmentStatusStruct.create)
     ..aOS(9, _omitFieldNames ? '' : 'CreationDate', protoName: 'CreationDate')
-    ..pc<$3.MetadataElement>(10, _omitFieldNames ? '' : 'MetaData', $pb.PbFieldType.PM, protoName: 'MetaData', subBuilder: $3.MetadataElement.create)
+    ..pc<$0.MetadataElement>(10, _omitFieldNames ? '' : 'MetaData', $pb.PbFieldType.PM, protoName: 'MetaData', subBuilder: $0.MetadataElement.create)
     ..aOS(11, _omitFieldNames ? '' : 'CarrierID', protoName: 'CarrierID')
     ..aOS(12, _omitFieldNames ? '' : 'CarrierName', protoName: 'CarrierName')
     ..hasRequiredFields = false
@@ -166,9 +166,9 @@ class AppointmentPayload extends $pb.GeneratedMessage {
 
   /// Type of appointment : Expedition / Reception / Both
   @$pb.TagNumber(1)
-  $71.AppointmentType get appointmentType => $_getN(0);
+  $1.AppointmentType get appointmentType => $_getN(0);
   @$pb.TagNumber(1)
-  set appointmentType($71.AppointmentType value) => $_setField(1, value);
+  set appointmentType($1.AppointmentType value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasAppointmentType() => $_has(0);
   @$pb.TagNumber(1)
@@ -177,27 +177,27 @@ class AppointmentPayload extends $pb.GeneratedMessage {
   /// List of the orders and projects for which the appointment is made, with the quantities
   /// TODO  ??
   @$pb.TagNumber(2)
-  $pb.PbList<$71.Commission> get commissions => $_getList(1);
+  $pb.PbList<$1.Commission> get commissions => $_getList(1);
 
   /// Set of segmentation constraining the slot booking
   @$pb.TagNumber(4)
-  $pb.PbList<$71.SegmentationSelection> get segmentationSelections => $_getList(2);
+  $pb.PbList<$1.SegmentationSelection> get segmentationSelections => $_getList(2);
 
   /// Required carrierInformation, some can be obligatory
   @$pb.TagNumber(5)
-  $pb.PbList<$71.CarrierInformationWithValue> get carrierInformation => $_getList(3);
+  $pb.PbList<$1.CarrierInformationWithValue> get carrierInformation => $_getList(3);
 
   /// The slot booked for the appointment
   @$pb.TagNumber(6)
-  $71.Slot get slot => $_getN(4);
+  $1.Slot get slot => $_getN(4);
   @$pb.TagNumber(6)
-  set slot($71.Slot value) => $_setField(6, value);
+  set slot($1.Slot value) => $_setField(6, value);
   @$pb.TagNumber(6)
   $core.bool hasSlot() => $_has(4);
   @$pb.TagNumber(6)
   void clearSlot() => $_clearField(6);
   @$pb.TagNumber(6)
-  $71.Slot ensureSlot() => $_ensure(4);
+  $1.Slot ensureSlot() => $_ensure(4);
 
   /// User mails being notified on this appointment
   /// TODO Need to add a structure to store platform user identifiers which can act on this appointment ?
@@ -206,15 +206,15 @@ class AppointmentPayload extends $pb.GeneratedMessage {
 
   /// Appointment Status and status history
   @$pb.TagNumber(8)
-  $76.AppointmentStatusStruct get status => $_getN(6);
+  $2.AppointmentStatusStruct get status => $_getN(6);
   @$pb.TagNumber(8)
-  set status($76.AppointmentStatusStruct value) => $_setField(8, value);
+  set status($2.AppointmentStatusStruct value) => $_setField(8, value);
   @$pb.TagNumber(8)
   $core.bool hasStatus() => $_has(6);
   @$pb.TagNumber(8)
   void clearStatus() => $_clearField(8);
   @$pb.TagNumber(8)
-  $76.AppointmentStatusStruct ensureStatus() => $_ensure(6);
+  $2.AppointmentStatusStruct ensureStatus() => $_ensure(6);
 
   /// Creation date of the appointment
   @$pb.TagNumber(9)
@@ -227,7 +227,7 @@ class AppointmentPayload extends $pb.GeneratedMessage {
   void clearCreationDate() => $_clearField(9);
 
   @$pb.TagNumber(10)
-  $pb.PbList<$3.MetadataElement> get metaData => $_getList(8);
+  $pb.PbList<$0.MetadataElement> get metaData => $_getList(8);
 
   @$pb.TagNumber(11)
   $core.String get carrierID => $_getSZ(9);

lib/appointment.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from appointment.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/appointment.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from appointment.proto.
-//  source: appointment.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/appointmentAction.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from appointmentAction.proto.
-//  source: appointmentAction.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references

lib/appointmentAction.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from appointmentAction.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/appointmentAction.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from appointmentAction.proto.
-//  source: appointmentAction.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/appointmentInput.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from appointmentInput.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/appointmentInput.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from appointmentInput.proto.
-//  source: appointmentInput.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,7 +16,7 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'appointmentInput.pb.dart' as $7;
+import 'appointmentInput.pb.dart' as $0;
 
 export 'appointmentInput.pb.dart';
 
@@ -32,96 +32,98 @@ class AppointmentInputAPIClient extends $grpc.Client {
     '',
   ];
 
-  static final _$created = $grpc.ClientMethod<$7.AppointmentCreatedRequest, $7.AppointmentCreatedResponse>(
-      '/api.AppointmentInputAPI/Created',
-      ($7.AppointmentCreatedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $7.AppointmentCreatedResponse.fromBuffer(value));
-  static final _$canceled = $grpc.ClientMethod<$7.AppointmentCanceledRequest, $7.AppointmentCanceledResponse>(
-      '/api.AppointmentInputAPI/Canceled',
-      ($7.AppointmentCanceledRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $7.AppointmentCanceledResponse.fromBuffer(value));
-  static final _$carrierInformationUpdated = $grpc.ClientMethod<$7.AppointmentCarrierInformationUpdatedRequest, $7.AppointmentCarrierInformationUpdatedResponse>(
-      '/api.AppointmentInputAPI/CarrierInformationUpdated',
-      ($7.AppointmentCarrierInformationUpdatedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $7.AppointmentCarrierInformationUpdatedResponse.fromBuffer(value));
-  static final _$carrierExpected = $grpc.ClientMethod<$7.AppointmentCarrierExpectedRequest, $7.AppointmentCarrierExpectedResponse>(
-      '/api.AppointmentInputAPI/CarrierExpected',
-      ($7.AppointmentCarrierExpectedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $7.AppointmentCarrierExpectedResponse.fromBuffer(value));
-  static final _$carrierArrived = $grpc.ClientMethod<$7.AppointmentCarrierArrivedRequest, $7.AppointmentCarrierArrivedResponse>(
-      '/api.AppointmentInputAPI/CarrierArrived',
-      ($7.AppointmentCarrierArrivedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $7.AppointmentCarrierArrivedResponse.fromBuffer(value));
-  static final _$expeditionStarted = $grpc.ClientMethod<$7.AppointmentExpeditionStartedRequest, $7.AppointmentExpeditionStartedResponse>(
-      '/api.AppointmentInputAPI/ExpeditionStarted',
-      ($7.AppointmentExpeditionStartedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $7.AppointmentExpeditionStartedResponse.fromBuffer(value));
-  static final _$expeditionLoaded = $grpc.ClientMethod<$7.AppointmentExpeditionLoadedRequest, $7.AppointmentExpeditionLoadedResponse>(
-      '/api.AppointmentInputAPI/ExpeditionLoaded',
-      ($7.AppointmentExpeditionLoadedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $7.AppointmentExpeditionLoadedResponse.fromBuffer(value));
-  static final _$receptionStarted = $grpc.ClientMethod<$7.AppointmentReceptionStartedRequest, $7.AppointmentReceptionStartedResponse>(
-      '/api.AppointmentInputAPI/ReceptionStarted',
-      ($7.AppointmentReceptionStartedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $7.AppointmentReceptionStartedResponse.fromBuffer(value));
-  static final _$receptionUnloaded = $grpc.ClientMethod<$7.AppointmentReceptionUnloadedRequest, $7.AppointmentReceptionUnloadedResponse>(
-      '/api.AppointmentInputAPI/ReceptionUnloaded',
-      ($7.AppointmentReceptionUnloadedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $7.AppointmentReceptionUnloadedResponse.fromBuffer(value));
-  static final _$carrierDeparted = $grpc.ClientMethod<$7.AppointmentCarrierDepartedRequest, $7.AppointmentCarrierDepartedResponse>(
-      '/api.AppointmentInputAPI/CarrierDeparted',
-      ($7.AppointmentCarrierDepartedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $7.AppointmentCarrierDepartedResponse.fromBuffer(value));
-  static final _$metaDataUpdated = $grpc.ClientMethod<$7.AppointmentMetaDataUpdatedRequest, $7.AppointmentMetaDataUpdatedResponse>(
-      '/api.AppointmentInputAPI/MetaDataUpdated',
-      ($7.AppointmentMetaDataUpdatedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $7.AppointmentMetaDataUpdatedResponse.fromBuffer(value));
-
   AppointmentInputAPIClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$7.AppointmentCreatedResponse> created($7.AppointmentCreatedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AppointmentCreatedResponse> created($0.AppointmentCreatedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$created, request, options: options);
   }
 
-  $grpc.ResponseFuture<$7.AppointmentCanceledResponse> canceled($7.AppointmentCanceledRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AppointmentCanceledResponse> canceled($0.AppointmentCanceledRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$canceled, request, options: options);
   }
 
-  $grpc.ResponseFuture<$7.AppointmentCarrierInformationUpdatedResponse> carrierInformationUpdated($7.AppointmentCarrierInformationUpdatedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AppointmentCarrierInformationUpdatedResponse> carrierInformationUpdated($0.AppointmentCarrierInformationUpdatedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$carrierInformationUpdated, request, options: options);
   }
 
-  $grpc.ResponseFuture<$7.AppointmentCarrierExpectedResponse> carrierExpected($7.AppointmentCarrierExpectedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AppointmentCarrierExpectedResponse> carrierExpected($0.AppointmentCarrierExpectedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$carrierExpected, request, options: options);
   }
 
-  $grpc.ResponseFuture<$7.AppointmentCarrierArrivedResponse> carrierArrived($7.AppointmentCarrierArrivedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AppointmentCarrierArrivedResponse> carrierArrived($0.AppointmentCarrierArrivedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$carrierArrived, request, options: options);
   }
 
-  $grpc.ResponseFuture<$7.AppointmentExpeditionStartedResponse> expeditionStarted($7.AppointmentExpeditionStartedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AppointmentExpeditionStartedResponse> expeditionStarted($0.AppointmentExpeditionStartedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$expeditionStarted, request, options: options);
   }
 
-  $grpc.ResponseFuture<$7.AppointmentExpeditionLoadedResponse> expeditionLoaded($7.AppointmentExpeditionLoadedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AppointmentExpeditionLoadedResponse> expeditionLoaded($0.AppointmentExpeditionLoadedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$expeditionLoaded, request, options: options);
   }
 
-  $grpc.ResponseFuture<$7.AppointmentReceptionStartedResponse> receptionStarted($7.AppointmentReceptionStartedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AppointmentReceptionStartedResponse> receptionStarted($0.AppointmentReceptionStartedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$receptionStarted, request, options: options);
   }
 
-  $grpc.ResponseFuture<$7.AppointmentReceptionUnloadedResponse> receptionUnloaded($7.AppointmentReceptionUnloadedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AppointmentReceptionUnloadedResponse> receptionUnloaded($0.AppointmentReceptionUnloadedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$receptionUnloaded, request, options: options);
   }
 
-  $grpc.ResponseFuture<$7.AppointmentCarrierDepartedResponse> carrierDeparted($7.AppointmentCarrierDepartedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AppointmentCarrierDepartedResponse> carrierDeparted($0.AppointmentCarrierDepartedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$carrierDeparted, request, options: options);
   }
 
-  $grpc.ResponseFuture<$7.AppointmentMetaDataUpdatedResponse> metaDataUpdated($7.AppointmentMetaDataUpdatedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AppointmentMetaDataUpdatedResponse> metaDataUpdated($0.AppointmentMetaDataUpdatedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$metaDataUpdated, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$created = $grpc.ClientMethod<$0.AppointmentCreatedRequest, $0.AppointmentCreatedResponse>(
+      '/api.AppointmentInputAPI/Created',
+      ($0.AppointmentCreatedRequest value) => value.writeToBuffer(),
+      $0.AppointmentCreatedResponse.fromBuffer);
+  static final _$canceled = $grpc.ClientMethod<$0.AppointmentCanceledRequest, $0.AppointmentCanceledResponse>(
+      '/api.AppointmentInputAPI/Canceled',
+      ($0.AppointmentCanceledRequest value) => value.writeToBuffer(),
+      $0.AppointmentCanceledResponse.fromBuffer);
+  static final _$carrierInformationUpdated = $grpc.ClientMethod<$0.AppointmentCarrierInformationUpdatedRequest, $0.AppointmentCarrierInformationUpdatedResponse>(
+      '/api.AppointmentInputAPI/CarrierInformationUpdated',
+      ($0.AppointmentCarrierInformationUpdatedRequest value) => value.writeToBuffer(),
+      $0.AppointmentCarrierInformationUpdatedResponse.fromBuffer);
+  static final _$carrierExpected = $grpc.ClientMethod<$0.AppointmentCarrierExpectedRequest, $0.AppointmentCarrierExpectedResponse>(
+      '/api.AppointmentInputAPI/CarrierExpected',
+      ($0.AppointmentCarrierExpectedRequest value) => value.writeToBuffer(),
+      $0.AppointmentCarrierExpectedResponse.fromBuffer);
+  static final _$carrierArrived = $grpc.ClientMethod<$0.AppointmentCarrierArrivedRequest, $0.AppointmentCarrierArrivedResponse>(
+      '/api.AppointmentInputAPI/CarrierArrived',
+      ($0.AppointmentCarrierArrivedRequest value) => value.writeToBuffer(),
+      $0.AppointmentCarrierArrivedResponse.fromBuffer);
+  static final _$expeditionStarted = $grpc.ClientMethod<$0.AppointmentExpeditionStartedRequest, $0.AppointmentExpeditionStartedResponse>(
+      '/api.AppointmentInputAPI/ExpeditionStarted',
+      ($0.AppointmentExpeditionStartedRequest value) => value.writeToBuffer(),
+      $0.AppointmentExpeditionStartedResponse.fromBuffer);
+  static final _$expeditionLoaded = $grpc.ClientMethod<$0.AppointmentExpeditionLoadedRequest, $0.AppointmentExpeditionLoadedResponse>(
+      '/api.AppointmentInputAPI/ExpeditionLoaded',
+      ($0.AppointmentExpeditionLoadedRequest value) => value.writeToBuffer(),
+      $0.AppointmentExpeditionLoadedResponse.fromBuffer);
+  static final _$receptionStarted = $grpc.ClientMethod<$0.AppointmentReceptionStartedRequest, $0.AppointmentReceptionStartedResponse>(
+      '/api.AppointmentInputAPI/ReceptionStarted',
+      ($0.AppointmentReceptionStartedRequest value) => value.writeToBuffer(),
+      $0.AppointmentReceptionStartedResponse.fromBuffer);
+  static final _$receptionUnloaded = $grpc.ClientMethod<$0.AppointmentReceptionUnloadedRequest, $0.AppointmentReceptionUnloadedResponse>(
+      '/api.AppointmentInputAPI/ReceptionUnloaded',
+      ($0.AppointmentReceptionUnloadedRequest value) => value.writeToBuffer(),
+      $0.AppointmentReceptionUnloadedResponse.fromBuffer);
+  static final _$carrierDeparted = $grpc.ClientMethod<$0.AppointmentCarrierDepartedRequest, $0.AppointmentCarrierDepartedResponse>(
+      '/api.AppointmentInputAPI/CarrierDeparted',
+      ($0.AppointmentCarrierDepartedRequest value) => value.writeToBuffer(),
+      $0.AppointmentCarrierDepartedResponse.fromBuffer);
+  static final _$metaDataUpdated = $grpc.ClientMethod<$0.AppointmentMetaDataUpdatedRequest, $0.AppointmentMetaDataUpdatedResponse>(
+      '/api.AppointmentInputAPI/MetaDataUpdated',
+      ($0.AppointmentMetaDataUpdatedRequest value) => value.writeToBuffer(),
+      $0.AppointmentMetaDataUpdatedResponse.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.AppointmentInputAPI')
@@ -129,138 +131,149 @@ abstract class AppointmentInputAPIServiceBase extends $grpc.Service {
   $core.String get $name => 'api.AppointmentInputAPI';
 
   AppointmentInputAPIServiceBase() {
-    $addMethod($grpc.ServiceMethod<$7.AppointmentCreatedRequest, $7.AppointmentCreatedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.AppointmentCreatedRequest, $0.AppointmentCreatedResponse>(
         'Created',
         created_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $7.AppointmentCreatedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AppointmentCreatedRequest.fromBuffer(value),
-        ($7.AppointmentCreatedResponse value) => value.writeToBuffer()));
+        ($0.AppointmentCreatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$7.AppointmentCanceledRequest, $7.AppointmentCanceledResponse>(
+    $addMethod($grpc.ServiceMethod<$0.AppointmentCanceledRequest, $0.AppointmentCanceledResponse>(
         'Canceled',
         canceled_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $7.AppointmentCanceledRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AppointmentCanceledRequest.fromBuffer(value),
-        ($7.AppointmentCanceledResponse value) => value.writeToBuffer()));
+        ($0.AppointmentCanceledResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$7.AppointmentCarrierInformationUpdatedRequest, $7.AppointmentCarrierInformationUpdatedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.AppointmentCarrierInformationUpdatedRequest, $0.AppointmentCarrierInformationUpdatedResponse>(
         'CarrierInformationUpdated',
         carrierInformationUpdated_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $7.AppointmentCarrierInformationUpdatedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AppointmentCarrierInformationUpdatedRequest.fromBuffer(value),
-        ($7.AppointmentCarrierInformationUpdatedResponse value) => value.writeToBuffer()));
+        ($0.AppointmentCarrierInformationUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$7.AppointmentCarrierExpectedRequest, $7.AppointmentCarrierExpectedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.AppointmentCarrierExpectedRequest, $0.AppointmentCarrierExpectedResponse>(
         'CarrierExpected',
         carrierExpected_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $7.AppointmentCarrierExpectedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AppointmentCarrierExpectedRequest.fromBuffer(value),
-        ($7.AppointmentCarrierExpectedResponse value) => value.writeToBuffer()));
+        ($0.AppointmentCarrierExpectedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$7.AppointmentCarrierArrivedRequest, $7.AppointmentCarrierArrivedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.AppointmentCarrierArrivedRequest, $0.AppointmentCarrierArrivedResponse>(
         'CarrierArrived',
         carrierArrived_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $7.AppointmentCarrierArrivedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AppointmentCarrierArrivedRequest.fromBuffer(value),
-        ($7.AppointmentCarrierArrivedResponse value) => value.writeToBuffer()));
+        ($0.AppointmentCarrierArrivedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$7.AppointmentExpeditionStartedRequest, $7.AppointmentExpeditionStartedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.AppointmentExpeditionStartedRequest, $0.AppointmentExpeditionStartedResponse>(
         'ExpeditionStarted',
         expeditionStarted_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $7.AppointmentExpeditionStartedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AppointmentExpeditionStartedRequest.fromBuffer(value),
-        ($7.AppointmentExpeditionStartedResponse value) => value.writeToBuffer()));
+        ($0.AppointmentExpeditionStartedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$7.AppointmentExpeditionLoadedRequest, $7.AppointmentExpeditionLoadedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.AppointmentExpeditionLoadedRequest, $0.AppointmentExpeditionLoadedResponse>(
         'ExpeditionLoaded',
         expeditionLoaded_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $7.AppointmentExpeditionLoadedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AppointmentExpeditionLoadedRequest.fromBuffer(value),
-        ($7.AppointmentExpeditionLoadedResponse value) => value.writeToBuffer()));
+        ($0.AppointmentExpeditionLoadedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$7.AppointmentReceptionStartedRequest, $7.AppointmentReceptionStartedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.AppointmentReceptionStartedRequest, $0.AppointmentReceptionStartedResponse>(
         'ReceptionStarted',
         receptionStarted_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $7.AppointmentReceptionStartedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AppointmentReceptionStartedRequest.fromBuffer(value),
-        ($7.AppointmentReceptionStartedResponse value) => value.writeToBuffer()));
+        ($0.AppointmentReceptionStartedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$7.AppointmentReceptionUnloadedRequest, $7.AppointmentReceptionUnloadedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.AppointmentReceptionUnloadedRequest, $0.AppointmentReceptionUnloadedResponse>(
         'ReceptionUnloaded',
         receptionUnloaded_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $7.AppointmentReceptionUnloadedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AppointmentReceptionUnloadedRequest.fromBuffer(value),
-        ($7.AppointmentReceptionUnloadedResponse value) => value.writeToBuffer()));
+        ($0.AppointmentReceptionUnloadedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$7.AppointmentCarrierDepartedRequest, $7.AppointmentCarrierDepartedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.AppointmentCarrierDepartedRequest, $0.AppointmentCarrierDepartedResponse>(
         'CarrierDeparted',
         carrierDeparted_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $7.AppointmentCarrierDepartedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AppointmentCarrierDepartedRequest.fromBuffer(value),
-        ($7.AppointmentCarrierDepartedResponse value) => value.writeToBuffer()));
+        ($0.AppointmentCarrierDepartedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$7.AppointmentMetaDataUpdatedRequest, $7.AppointmentMetaDataUpdatedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.AppointmentMetaDataUpdatedRequest, $0.AppointmentMetaDataUpdatedResponse>(
         'MetaDataUpdated',
         metaDataUpdated_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $7.AppointmentMetaDataUpdatedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AppointmentMetaDataUpdatedRequest.fromBuffer(value),
-        ($7.AppointmentMetaDataUpdatedResponse value) => value.writeToBuffer()));
+        ($0.AppointmentMetaDataUpdatedResponse value) => value.writeToBuffer()));
   }
 
-  $async.Future<$7.AppointmentCreatedResponse> created_Pre($grpc.ServiceCall $call, $async.Future<$7.AppointmentCreatedRequest> $request) async {
+  $async.Future<$0.AppointmentCreatedResponse> created_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentCreatedRequest> $request) async {
     return created($call, await $request);
   }
 
-  $async.Future<$7.AppointmentCanceledResponse> canceled_Pre($grpc.ServiceCall $call, $async.Future<$7.AppointmentCanceledRequest> $request) async {
+  $async.Future<$0.AppointmentCreatedResponse> created($grpc.ServiceCall call, $0.AppointmentCreatedRequest request);
+
+  $async.Future<$0.AppointmentCanceledResponse> canceled_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentCanceledRequest> $request) async {
     return canceled($call, await $request);
   }
 
-  $async.Future<$7.AppointmentCarrierInformationUpdatedResponse> carrierInformationUpdated_Pre($grpc.ServiceCall $call, $async.Future<$7.AppointmentCarrierInformationUpdatedRequest> $request) async {
+  $async.Future<$0.AppointmentCanceledResponse> canceled($grpc.ServiceCall call, $0.AppointmentCanceledRequest request);
+
+  $async.Future<$0.AppointmentCarrierInformationUpdatedResponse> carrierInformationUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentCarrierInformationUpdatedRequest> $request) async {
     return carrierInformationUpdated($call, await $request);
   }
 
-  $async.Future<$7.AppointmentCarrierExpectedResponse> carrierExpected_Pre($grpc.ServiceCall $call, $async.Future<$7.AppointmentCarrierExpectedRequest> $request) async {
+  $async.Future<$0.AppointmentCarrierInformationUpdatedResponse> carrierInformationUpdated($grpc.ServiceCall call, $0.AppointmentCarrierInformationUpdatedRequest request);
+
+  $async.Future<$0.AppointmentCarrierExpectedResponse> carrierExpected_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentCarrierExpectedRequest> $request) async {
     return carrierExpected($call, await $request);
   }
 
-  $async.Future<$7.AppointmentCarrierArrivedResponse> carrierArrived_Pre($grpc.ServiceCall $call, $async.Future<$7.AppointmentCarrierArrivedRequest> $request) async {
+  $async.Future<$0.AppointmentCarrierExpectedResponse> carrierExpected($grpc.ServiceCall call, $0.AppointmentCarrierExpectedRequest request);
+
+  $async.Future<$0.AppointmentCarrierArrivedResponse> carrierArrived_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentCarrierArrivedRequest> $request) async {
     return carrierArrived($call, await $request);
   }
 
-  $async.Future<$7.AppointmentExpeditionStartedResponse> expeditionStarted_Pre($grpc.ServiceCall $call, $async.Future<$7.AppointmentExpeditionStartedRequest> $request) async {
+  $async.Future<$0.AppointmentCarrierArrivedResponse> carrierArrived($grpc.ServiceCall call, $0.AppointmentCarrierArrivedRequest request);
+
+  $async.Future<$0.AppointmentExpeditionStartedResponse> expeditionStarted_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentExpeditionStartedRequest> $request) async {
     return expeditionStarted($call, await $request);
   }
 
-  $async.Future<$7.AppointmentExpeditionLoadedResponse> expeditionLoaded_Pre($grpc.ServiceCall $call, $async.Future<$7.AppointmentExpeditionLoadedRequest> $request) async {
+  $async.Future<$0.AppointmentExpeditionStartedResponse> expeditionStarted($grpc.ServiceCall call, $0.AppointmentExpeditionStartedRequest request);
+
+  $async.Future<$0.AppointmentExpeditionLoadedResponse> expeditionLoaded_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentExpeditionLoadedRequest> $request) async {
     return expeditionLoaded($call, await $request);
   }
 
-  $async.Future<$7.AppointmentReceptionStartedResponse> receptionStarted_Pre($grpc.ServiceCall $call, $async.Future<$7.AppointmentReceptionStartedRequest> $request) async {
+  $async.Future<$0.AppointmentExpeditionLoadedResponse> expeditionLoaded($grpc.ServiceCall call, $0.AppointmentExpeditionLoadedRequest request);
+
+  $async.Future<$0.AppointmentReceptionStartedResponse> receptionStarted_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentReceptionStartedRequest> $request) async {
     return receptionStarted($call, await $request);
   }
 
-  $async.Future<$7.AppointmentReceptionUnloadedResponse> receptionUnloaded_Pre($grpc.ServiceCall $call, $async.Future<$7.AppointmentReceptionUnloadedRequest> $request) async {
+  $async.Future<$0.AppointmentReceptionStartedResponse> receptionStarted($grpc.ServiceCall call, $0.AppointmentReceptionStartedRequest request);
+
+  $async.Future<$0.AppointmentReceptionUnloadedResponse> receptionUnloaded_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentReceptionUnloadedRequest> $request) async {
     return receptionUnloaded($call, await $request);
   }
 
-  $async.Future<$7.AppointmentCarrierDepartedResponse> carrierDeparted_Pre($grpc.ServiceCall $call, $async.Future<$7.AppointmentCarrierDepartedRequest> $request) async {
+  $async.Future<$0.AppointmentReceptionUnloadedResponse> receptionUnloaded($grpc.ServiceCall call, $0.AppointmentReceptionUnloadedRequest request);
+
+  $async.Future<$0.AppointmentCarrierDepartedResponse> carrierDeparted_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentCarrierDepartedRequest> $request) async {
     return carrierDeparted($call, await $request);
   }
 
-  $async.Future<$7.AppointmentMetaDataUpdatedResponse> metaDataUpdated_Pre($grpc.ServiceCall $call, $async.Future<$7.AppointmentMetaDataUpdatedRequest> $request) async {
+  $async.Future<$0.AppointmentCarrierDepartedResponse> carrierDeparted($grpc.ServiceCall call, $0.AppointmentCarrierDepartedRequest request);
+
+  $async.Future<$0.AppointmentMetaDataUpdatedResponse> metaDataUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentMetaDataUpdatedRequest> $request) async {
     return metaDataUpdated($call, await $request);
   }
 
-  $async.Future<$7.AppointmentCreatedResponse> created($grpc.ServiceCall call, $7.AppointmentCreatedRequest request);
+  $async.Future<$0.AppointmentMetaDataUpdatedResponse> metaDataUpdated($grpc.ServiceCall call, $0.AppointmentMetaDataUpdatedRequest request);
-  $async.Future<$7.AppointmentCanceledResponse> canceled($grpc.ServiceCall call, $7.AppointmentCanceledRequest request);
+
-  $async.Future<$7.AppointmentCarrierInformationUpdatedResponse> carrierInformationUpdated($grpc.ServiceCall call, $7.AppointmentCarrierInformationUpdatedRequest request);
-  $async.Future<$7.AppointmentCarrierExpectedResponse> carrierExpected($grpc.ServiceCall call, $7.AppointmentCarrierExpectedRequest request);
-  $async.Future<$7.AppointmentCarrierArrivedResponse> carrierArrived($grpc.ServiceCall call, $7.AppointmentCarrierArrivedRequest request);
-  $async.Future<$7.AppointmentExpeditionStartedResponse> expeditionStarted($grpc.ServiceCall call, $7.AppointmentExpeditionStartedRequest request);
-  $async.Future<$7.AppointmentExpeditionLoadedResponse> expeditionLoaded($grpc.ServiceCall call, $7.AppointmentExpeditionLoadedRequest request);
-  $async.Future<$7.AppointmentReceptionStartedResponse> receptionStarted($grpc.ServiceCall call, $7.AppointmentReceptionStartedRequest request);
-  $async.Future<$7.AppointmentReceptionUnloadedResponse> receptionUnloaded($grpc.ServiceCall call, $7.AppointmentReceptionUnloadedRequest request);
-  $async.Future<$7.AppointmentCarrierDepartedResponse> carrierDeparted($grpc.ServiceCall call, $7.AppointmentCarrierDepartedRequest request);
-  $async.Future<$7.AppointmentMetaDataUpdatedResponse> metaDataUpdated($grpc.ServiceCall call, $7.AppointmentMetaDataUpdatedRequest request);
 }

lib/appointmentInput.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from appointmentInput.proto.
-//  source: appointmentInput.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/appointmentQuery.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from appointmentQuery.proto.
-//  source: appointmentQuery.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,15 +14,15 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'appointment.pb.dart' as $77;
+import 'appointment.pb.dart' as $3;
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
 class AppointmentByIdQuery extends $pb.GeneratedMessage {
   factory AppointmentByIdQuery({
-    $3.QuerySiteHeader? header,
+    $1.QuerySiteHeader? header,
-    $core.Iterable<$3.EntityID>? iDs,
+    $core.Iterable<$1.EntityID>? iDs,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -36,8 +36,8 @@ class AppointmentByIdQuery extends $pb.GeneratedMessage {
   factory AppointmentByIdQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentByIdQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.QuerySiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QuerySiteHeader.create)
+    ..aOM<$1.QuerySiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QuerySiteHeader.create)
-    ..pc<$3.EntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $3.EntityID.create)
+    ..pc<$1.EntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.EntityID.create)
     ..hasRequiredFields = false
   ;
 
@@ -59,24 +59,24 @@ class AppointmentByIdQuery extends $pb.GeneratedMessage {
   static AppointmentByIdQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.QuerySiteHeader get header => $_getN(0);
+  $1.QuerySiteHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.QuerySiteHeader value) => $_setField(1, value);
+  set header($1.QuerySiteHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.QuerySiteHeader ensureHeader() => $_ensure(0);
+  $1.QuerySiteHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $pb.PbList<$3.EntityID> get iDs => $_getList(1);
+  $pb.PbList<$1.EntityID> get iDs => $_getList(1);
 }
 
 class AppointmentByIdResult extends $pb.GeneratedMessage {
   factory AppointmentByIdResult({
-    $3.ResultHeader? header,
+    $1.ResultHeader? header,
-    $core.Iterable<$77.Appointment>? objects,
+    $core.Iterable<$3.Appointment>? objects,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -90,8 +90,8 @@ class AppointmentByIdResult extends $pb.GeneratedMessage {
   factory AppointmentByIdResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.ResultHeader.create)
+    ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
-    ..pc<$77.Appointment>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $77.Appointment.create)
+    ..pc<$3.Appointment>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Appointment.create)
     ..hasRequiredFields = false
   ;
 
@@ -113,26 +113,26 @@ class AppointmentByIdResult extends $pb.GeneratedMessage {
   static AppointmentByIdResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.ResultHeader get header => $_getN(0);
+  $1.ResultHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.ResultHeader value) => $_setField(1, value);
+  set header($1.ResultHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.ResultHeader ensureHeader() => $_ensure(0);
+  $1.ResultHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $pb.PbList<$77.Appointment> get objects => $_getList(1);
+  $pb.PbList<$3.Appointment> get objects => $_getList(1);
 }
 
 class AppointmentByFilterQuery extends $pb.GeneratedMessage {
   factory AppointmentByFilterQuery({
-    $3.QuerySiteHeader? header,
+    $1.QuerySiteHeader? header,
     $core.String? limitFilter,
     $core.String? queryContext,
-    $core.Iterable<$3.BlockFilter>? blockFilters,
+    $core.Iterable<$1.BlockFilter>? blockFilters,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -148,10 +148,10 @@ class AppointmentByFilterQuery extends $pb.GeneratedMessage {
   factory AppointmentByFilterQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentByFilterQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.QuerySiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QuerySiteHeader.create)
+    ..aOM<$1.QuerySiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QuerySiteHeader.create)
     ..aOS(4, _omitFieldNames ? '' : 'limitFilter', protoName: 'limitFilter')
     ..aOS(5, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
-    ..pc<$3.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $3.BlockFilter.create)
+    ..pc<$1.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
     ..hasRequiredFields = false
   ;
 
@@ -173,15 +173,15 @@ class AppointmentByFilterQuery extends $pb.GeneratedMessage {
   static AppointmentByFilterQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.QuerySiteHeader get header => $_getN(0);
+  $1.QuerySiteHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.QuerySiteHeader value) => $_setField(1, value);
+  set header($1.QuerySiteHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.QuerySiteHeader ensureHeader() => $_ensure(0);
+  $1.QuerySiteHeader ensureHeader() => $_ensure(0);
 
   /// Number of maximum result
   @$pb.TagNumber(4)
@@ -204,13 +204,13 @@ class AppointmentByFilterQuery extends $pb.GeneratedMessage {
 
   /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
   @$pb.TagNumber(6)
-  $pb.PbList<$3.BlockFilter> get blockFilters => $_getList(3);
+  $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 }
 
 class AppointmentByFilterResult extends $pb.GeneratedMessage {
   factory AppointmentByFilterResult({
-    $3.ResultHeader? header,
+    $1.ResultHeader? header,
-    $core.Iterable<$77.Appointment>? objects,
+    $core.Iterable<$3.Appointment>? objects,
     $core.String? queryContext,
   }) {
     final result = create();
@@ -226,8 +226,8 @@ class AppointmentByFilterResult extends $pb.GeneratedMessage {
   factory AppointmentByFilterResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentByFilterResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.ResultHeader.create)
+    ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
-    ..pc<$77.Appointment>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $77.Appointment.create)
+    ..pc<$3.Appointment>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Appointment.create)
     ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
     ..hasRequiredFields = false
   ;
@@ -250,18 +250,18 @@ class AppointmentByFilterResult extends $pb.GeneratedMessage {
   static AppointmentByFilterResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.ResultHeader get header => $_getN(0);
+  $1.ResultHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.ResultHeader value) => $_setField(1, value);
+  set header($1.ResultHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.ResultHeader ensureHeader() => $_ensure(0);
+  $1.ResultHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $pb.PbList<$77.Appointment> get objects => $_getList(1);
+  $pb.PbList<$3.Appointment> get objects => $_getList(1);
 
   @$pb.TagNumber(3)
   $core.String get queryContext => $_getSZ(2);
@@ -275,9 +275,9 @@ class AppointmentByFilterResult extends $pb.GeneratedMessage {
 
 class AppointmentByMatchQuery extends $pb.GeneratedMessage {
   factory AppointmentByMatchQuery({
-    $3.QuerySiteHeader? header,
+    $1.QuerySiteHeader? header,
-    $core.Iterable<$3.BlockFilter>? blockFilters,
+    $core.Iterable<$1.BlockFilter>? blockFilters,
-    $core.Iterable<$3.MatchField>? matchFields,
+    $core.Iterable<$1.MatchField>? matchFields,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -292,9 +292,9 @@ class AppointmentByMatchQuery extends $pb.GeneratedMessage {
   factory AppointmentByMatchQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentByMatchQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.QuerySiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QuerySiteHeader.create)
+    ..aOM<$1.QuerySiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QuerySiteHeader.create)
-    ..pc<$3.BlockFilter>(5, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $3.BlockFilter.create)
+    ..pc<$1.BlockFilter>(5, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
-    ..pc<$3.MatchField>(6, _omitFieldNames ? '' : 'MatchFields', $pb.PbFieldType.PM, protoName: 'MatchFields', subBuilder: $3.MatchField.create)
+    ..pc<$1.MatchField>(6, _omitFieldNames ? '' : 'MatchFields', $pb.PbFieldType.PM, protoName: 'MatchFields', subBuilder: $1.MatchField.create)
     ..hasRequiredFields = false
   ;
 
@@ -316,28 +316,28 @@ class AppointmentByMatchQuery extends $pb.GeneratedMessage {
   static AppointmentByMatchQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.QuerySiteHeader get header => $_getN(0);
+  $1.QuerySiteHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.QuerySiteHeader value) => $_setField(1, value);
+  set header($1.QuerySiteHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.QuerySiteHeader ensureHeader() => $_ensure(0);
+  $1.QuerySiteHeader ensureHeader() => $_ensure(0);
 
   /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
   @$pb.TagNumber(5)
-  $pb.PbList<$3.BlockFilter> get blockFilters => $_getList(1);
+  $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
 
   /// MatchField list structure, for FindMatching query
   @$pb.TagNumber(6)
-  $pb.PbList<$3.MatchField> get matchFields => $_getList(2);
+  $pb.PbList<$1.MatchField> get matchFields => $_getList(2);
 }
 
 class AppointmentByMatchResult extends $pb.GeneratedMessage {
   factory AppointmentByMatchResult({
-    $core.Iterable<$3.MatchFieldResult>? matchResults,
+    $core.Iterable<$1.MatchFieldResult>? matchResults,
   }) {
     final result = create();
     if (matchResults != null) result.matchResults.addAll(matchResults);
@@ -350,7 +350,7 @@ class AppointmentByMatchResult extends $pb.GeneratedMessage {
   factory AppointmentByMatchResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentByMatchResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$3.MatchFieldResult>(2, _omitFieldNames ? '' : 'MatchResults', $pb.PbFieldType.PM, protoName: 'MatchResults', subBuilder: $3.MatchFieldResult.create)
+    ..pc<$1.MatchFieldResult>(2, _omitFieldNames ? '' : 'MatchResults', $pb.PbFieldType.PM, protoName: 'MatchResults', subBuilder: $1.MatchFieldResult.create)
     ..hasRequiredFields = false
   ;
 
@@ -372,7 +372,7 @@ class AppointmentByMatchResult extends $pb.GeneratedMessage {
   static AppointmentByMatchResult? _defaultInstance;
 
   @$pb.TagNumber(2)
-  $pb.PbList<$3.MatchFieldResult> get matchResults => $_getList(0);
+  $pb.PbList<$1.MatchFieldResult> get matchResults => $_getList(0);
 }
 
 

lib/appointmentQuery.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from appointmentQuery.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/appointmentQuery.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from appointmentQuery.proto.
-//  source: appointmentQuery.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,9 +16,9 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'appointmentQuery.pb.dart' as $8;
+import 'appointmentQuery.pb.dart' as $0;
-import 'clickhouse.pb.dart' as $9;
+import 'clickhouse.pb.dart' as $2;
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
 
 export 'appointmentQuery.pb.dart';
 
@@ -32,64 +32,66 @@ class AppointmentQueryClient extends $grpc.Client {
     '',
   ];
 
-  static final _$getByIds = $grpc.ClientMethod<$8.AppointmentByIdQuery, $8.AppointmentByIdResult>(
-      '/api.AppointmentQuery/GetByIds',
-      ($8.AppointmentByIdQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $8.AppointmentByIdResult.fromBuffer(value));
-  static final _$find = $grpc.ClientMethod<$8.AppointmentByFilterQuery, $8.AppointmentByFilterResult>(
-      '/api.AppointmentQuery/Find',
-      ($8.AppointmentByFilterQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $8.AppointmentByFilterResult.fromBuffer(value));
-  static final _$findMatchingFieldValues = $grpc.ClientMethod<$8.AppointmentByMatchQuery, $8.AppointmentByMatchResult>(
-      '/api.AppointmentQuery/FindMatchingFieldValues',
-      ($8.AppointmentByMatchQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $8.AppointmentByMatchResult.fromBuffer(value));
-  static final _$findMatchingFieldElements = $grpc.ClientMethod<$3.ElementByMatchSiteQuery, $3.ElementByMatchResult>(
-      '/api.AppointmentQuery/FindMatchingFieldElements',
-      ($3.ElementByMatchSiteQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $3.ElementByMatchResult.fromBuffer(value));
-  static final _$extract = $grpc.ClientMethod<$3.ExtractSiteQuery, $3.ExtractResult>(
-      '/api.AppointmentQuery/Extract',
-      ($3.ExtractSiteQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $3.ExtractResult.fromBuffer(value));
-  static final _$getKPIData = $grpc.ClientMethod<$9.GetKPIDataSiteQuery, $9.GetKPIDataResult>(
-      '/api.AppointmentQuery/GetKPIData',
-      ($9.GetKPIDataSiteQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $9.GetKPIDataResult.fromBuffer(value));
-  static final _$countLines = $grpc.ClientMethod<$3.CountLinesQuery, $3.CountLinesResult>(
-      '/api.AppointmentQuery/CountLines',
-      ($3.CountLinesQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $3.CountLinesResult.fromBuffer(value));
-
   AppointmentQueryClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$8.AppointmentByIdResult> getByIds($8.AppointmentByIdQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AppointmentByIdResult> getByIds($0.AppointmentByIdQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$getByIds, request, options: options);
   }
 
-  $grpc.ResponseFuture<$8.AppointmentByFilterResult> find($8.AppointmentByFilterQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AppointmentByFilterResult> find($0.AppointmentByFilterQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$find, request, options: options);
   }
 
-  $grpc.ResponseFuture<$8.AppointmentByMatchResult> findMatchingFieldValues($8.AppointmentByMatchQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AppointmentByMatchResult> findMatchingFieldValues($0.AppointmentByMatchQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$findMatchingFieldValues, request, options: options);
   }
 
-  $grpc.ResponseFuture<$3.ElementByMatchResult> findMatchingFieldElements($3.ElementByMatchSiteQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$1.ElementByMatchResult> findMatchingFieldElements($1.ElementByMatchSiteQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$findMatchingFieldElements, request, options: options);
   }
 
-  $grpc.ResponseFuture<$3.ExtractResult> extract($3.ExtractSiteQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$1.ExtractResult> extract($1.ExtractSiteQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$extract, request, options: options);
   }
 
-  $grpc.ResponseFuture<$9.GetKPIDataResult> getKPIData($9.GetKPIDataSiteQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$2.GetKPIDataResult> getKPIData($2.GetKPIDataSiteQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$getKPIData, request, options: options);
   }
 
-  $grpc.ResponseFuture<$3.CountLinesResult> countLines($3.CountLinesQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$1.CountLinesResult> countLines($1.CountLinesQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$countLines, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$getByIds = $grpc.ClientMethod<$0.AppointmentByIdQuery, $0.AppointmentByIdResult>(
+      '/api.AppointmentQuery/GetByIds',
+      ($0.AppointmentByIdQuery value) => value.writeToBuffer(),
+      $0.AppointmentByIdResult.fromBuffer);
+  static final _$find = $grpc.ClientMethod<$0.AppointmentByFilterQuery, $0.AppointmentByFilterResult>(
+      '/api.AppointmentQuery/Find',
+      ($0.AppointmentByFilterQuery value) => value.writeToBuffer(),
+      $0.AppointmentByFilterResult.fromBuffer);
+  static final _$findMatchingFieldValues = $grpc.ClientMethod<$0.AppointmentByMatchQuery, $0.AppointmentByMatchResult>(
+      '/api.AppointmentQuery/FindMatchingFieldValues',
+      ($0.AppointmentByMatchQuery value) => value.writeToBuffer(),
+      $0.AppointmentByMatchResult.fromBuffer);
+  static final _$findMatchingFieldElements = $grpc.ClientMethod<$1.ElementByMatchSiteQuery, $1.ElementByMatchResult>(
+      '/api.AppointmentQuery/FindMatchingFieldElements',
+      ($1.ElementByMatchSiteQuery value) => value.writeToBuffer(),
+      $1.ElementByMatchResult.fromBuffer);
+  static final _$extract = $grpc.ClientMethod<$1.ExtractSiteQuery, $1.ExtractResult>(
+      '/api.AppointmentQuery/Extract',
+      ($1.ExtractSiteQuery value) => value.writeToBuffer(),
+      $1.ExtractResult.fromBuffer);
+  static final _$getKPIData = $grpc.ClientMethod<$2.GetKPIDataSiteQuery, $2.GetKPIDataResult>(
+      '/api.AppointmentQuery/GetKPIData',
+      ($2.GetKPIDataSiteQuery value) => value.writeToBuffer(),
+      $2.GetKPIDataResult.fromBuffer);
+  static final _$countLines = $grpc.ClientMethod<$1.CountLinesQuery, $1.CountLinesResult>(
+      '/api.AppointmentQuery/CountLines',
+      ($1.CountLinesQuery value) => value.writeToBuffer(),
+      $1.CountLinesResult.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.AppointmentQuery')
@@ -97,90 +99,97 @@ abstract class AppointmentQueryServiceBase extends $grpc.Service {
   $core.String get $name => 'api.AppointmentQuery';
 
   AppointmentQueryServiceBase() {
-    $addMethod($grpc.ServiceMethod<$8.AppointmentByIdQuery, $8.AppointmentByIdResult>(
+    $addMethod($grpc.ServiceMethod<$0.AppointmentByIdQuery, $0.AppointmentByIdResult>(
         'GetByIds',
         getByIds_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $8.AppointmentByIdQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AppointmentByIdQuery.fromBuffer(value),
-        ($8.AppointmentByIdResult value) => value.writeToBuffer()));
+        ($0.AppointmentByIdResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$8.AppointmentByFilterQuery, $8.AppointmentByFilterResult>(
+    $addMethod($grpc.ServiceMethod<$0.AppointmentByFilterQuery, $0.AppointmentByFilterResult>(
         'Find',
         find_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $8.AppointmentByFilterQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AppointmentByFilterQuery.fromBuffer(value),
-        ($8.AppointmentByFilterResult value) => value.writeToBuffer()));
+        ($0.AppointmentByFilterResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$8.AppointmentByMatchQuery, $8.AppointmentByMatchResult>(
+    $addMethod($grpc.ServiceMethod<$0.AppointmentByMatchQuery, $0.AppointmentByMatchResult>(
         'FindMatchingFieldValues',
         findMatchingFieldValues_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $8.AppointmentByMatchQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AppointmentByMatchQuery.fromBuffer(value),
-        ($8.AppointmentByMatchResult value) => value.writeToBuffer()));
+        ($0.AppointmentByMatchResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$3.ElementByMatchSiteQuery, $3.ElementByMatchResult>(
+    $addMethod($grpc.ServiceMethod<$1.ElementByMatchSiteQuery, $1.ElementByMatchResult>(
         'FindMatchingFieldElements',
         findMatchingFieldElements_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $3.ElementByMatchSiteQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $1.ElementByMatchSiteQuery.fromBuffer(value),
-        ($3.ElementByMatchResult value) => value.writeToBuffer()));
+        ($1.ElementByMatchResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$3.ExtractSiteQuery, $3.ExtractResult>(
+    $addMethod($grpc.ServiceMethod<$1.ExtractSiteQuery, $1.ExtractResult>(
         'Extract',
         extract_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $3.ExtractSiteQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $1.ExtractSiteQuery.fromBuffer(value),
-        ($3.ExtractResult value) => value.writeToBuffer()));
+        ($1.ExtractResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$9.GetKPIDataSiteQuery, $9.GetKPIDataResult>(
+    $addMethod($grpc.ServiceMethod<$2.GetKPIDataSiteQuery, $2.GetKPIDataResult>(
         'GetKPIData',
         getKPIData_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $9.GetKPIDataSiteQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $2.GetKPIDataSiteQuery.fromBuffer(value),
-        ($9.GetKPIDataResult value) => value.writeToBuffer()));
+        ($2.GetKPIDataResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$3.CountLinesQuery, $3.CountLinesResult>(
+    $addMethod($grpc.ServiceMethod<$1.CountLinesQuery, $1.CountLinesResult>(
         'CountLines',
         countLines_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $3.CountLinesQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $1.CountLinesQuery.fromBuffer(value),
-        ($3.CountLinesResult value) => value.writeToBuffer()));
+        ($1.CountLinesResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$8.AppointmentByIdResult> getByIds_Pre($grpc.ServiceCall $call, $async.Future<$8.AppointmentByIdQuery> $request) async {
+  $async.Future<$0.AppointmentByIdResult> getByIds_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentByIdQuery> $request) async {
     return getByIds($call, await $request);
   }
 
-  $async.Future<$8.AppointmentByFilterResult> find_Pre($grpc.ServiceCall $call, $async.Future<$8.AppointmentByFilterQuery> $request) async {
+  $async.Future<$0.AppointmentByIdResult> getByIds($grpc.ServiceCall call, $0.AppointmentByIdQuery request);
+
+  $async.Future<$0.AppointmentByFilterResult> find_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentByFilterQuery> $request) async {
     return find($call, await $request);
   }
 
-  $async.Future<$8.AppointmentByMatchResult> findMatchingFieldValues_Pre($grpc.ServiceCall $call, $async.Future<$8.AppointmentByMatchQuery> $request) async {
+  $async.Future<$0.AppointmentByFilterResult> find($grpc.ServiceCall call, $0.AppointmentByFilterQuery request);
+
+  $async.Future<$0.AppointmentByMatchResult> findMatchingFieldValues_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentByMatchQuery> $request) async {
     return findMatchingFieldValues($call, await $request);
   }
 
-  $async.Future<$3.ElementByMatchResult> findMatchingFieldElements_Pre($grpc.ServiceCall $call, $async.Future<$3.ElementByMatchSiteQuery> $request) async {
+  $async.Future<$0.AppointmentByMatchResult> findMatchingFieldValues($grpc.ServiceCall call, $0.AppointmentByMatchQuery request);
+
+  $async.Future<$1.ElementByMatchResult> findMatchingFieldElements_Pre($grpc.ServiceCall $call, $async.Future<$1.ElementByMatchSiteQuery> $request) async {
     return findMatchingFieldElements($call, await $request);
   }
 
-  $async.Future<$3.ExtractResult> extract_Pre($grpc.ServiceCall $call, $async.Future<$3.ExtractSiteQuery> $request) async {
+  $async.Future<$1.ElementByMatchResult> findMatchingFieldElements($grpc.ServiceCall call, $1.ElementByMatchSiteQuery request);
+
+  $async.Future<$1.ExtractResult> extract_Pre($grpc.ServiceCall $call, $async.Future<$1.ExtractSiteQuery> $request) async {
     return extract($call, await $request);
   }
 
-  $async.Future<$9.GetKPIDataResult> getKPIData_Pre($grpc.ServiceCall $call, $async.Future<$9.GetKPIDataSiteQuery> $request) async {
+  $async.Future<$1.ExtractResult> extract($grpc.ServiceCall call, $1.ExtractSiteQuery request);
+
+  $async.Future<$2.GetKPIDataResult> getKPIData_Pre($grpc.ServiceCall $call, $async.Future<$2.GetKPIDataSiteQuery> $request) async {
     return getKPIData($call, await $request);
   }
 
-  $async.Future<$3.CountLinesResult> countLines_Pre($grpc.ServiceCall $call, $async.Future<$3.CountLinesQuery> $request) async {
+  $async.Future<$2.GetKPIDataResult> getKPIData($grpc.ServiceCall call, $2.GetKPIDataSiteQuery request);
+
+  $async.Future<$1.CountLinesResult> countLines_Pre($grpc.ServiceCall $call, $async.Future<$1.CountLinesQuery> $request) async {
     return countLines($call, await $request);
   }
 
-  $async.Future<$8.AppointmentByIdResult> getByIds($grpc.ServiceCall call, $8.AppointmentByIdQuery request);
+  $async.Future<$1.CountLinesResult> countLines($grpc.ServiceCall call, $1.CountLinesQuery request);
-  $async.Future<$8.AppointmentByFilterResult> find($grpc.ServiceCall call, $8.AppointmentByFilterQuery request);
+
-  $async.Future<$8.AppointmentByMatchResult> findMatchingFieldValues($grpc.ServiceCall call, $8.AppointmentByMatchQuery request);
-  $async.Future<$3.ElementByMatchResult> findMatchingFieldElements($grpc.ServiceCall call, $3.ElementByMatchSiteQuery request);
-  $async.Future<$3.ExtractResult> extract($grpc.ServiceCall call, $3.ExtractSiteQuery request);
-  $async.Future<$9.GetKPIDataResult> getKPIData($grpc.ServiceCall call, $9.GetKPIDataSiteQuery request);
-  $async.Future<$3.CountLinesResult> countLines($grpc.ServiceCall call, $3.CountLinesQuery request);
 }

lib/appointmentQuery.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from appointmentQuery.proto.
-//  source: appointmentQuery.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/attachmentType.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from attachmentType.proto.
-//  source: attachmentType.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,18 +14,18 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
 /// Create
 class CreateAttachmentTypeRequest extends $pb.GeneratedMessage {
   factory CreateAttachmentTypeRequest({
-    $3.RequestProjectHeader? header,
+    $1.RequestProjectHeader? header,
     $core.String? code,
-    $3.EntityType? entity,
+    $1.EntityType? entity,
     $core.String? label,
-    $3.SharePolicy? sharePolicy,
+    $1.SharePolicy? sharePolicy,
     $core.Iterable<$core.String>? managerRoles,
     $core.Iterable<$core.String>? viewerRoles,
   }) {
@@ -46,11 +46,11 @@ class CreateAttachmentTypeRequest extends $pb.GeneratedMessage {
   factory CreateAttachmentTypeRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateAttachmentTypeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'Code', protoName: 'Code')
-    ..e<$3.EntityType>(3, _omitFieldNames ? '' : 'Entity', $pb.PbFieldType.OE, protoName: 'Entity', defaultOrMaker: $3.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $3.EntityType.valueOf, enumValues: $3.EntityType.values)
+    ..e<$1.EntityType>(3, _omitFieldNames ? '' : 'Entity', $pb.PbFieldType.OE, protoName: 'Entity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..aOS(4, _omitFieldNames ? '' : 'Label', protoName: 'Label')
-    ..e<$3.SharePolicy>(5, _omitFieldNames ? '' : 'SharePolicy', $pb.PbFieldType.OE, protoName: 'SharePolicy', defaultOrMaker: $3.SharePolicy.SHARE_POLICY_UNKNOWN, valueOf: $3.SharePolicy.valueOf, enumValues: $3.SharePolicy.values)
+    ..e<$1.SharePolicy>(5, _omitFieldNames ? '' : 'SharePolicy', $pb.PbFieldType.OE, protoName: 'SharePolicy', defaultOrMaker: $1.SharePolicy.SHARE_POLICY_UNKNOWN, valueOf: $1.SharePolicy.valueOf, enumValues: $1.SharePolicy.values)
     ..pPS(6, _omitFieldNames ? '' : 'ManagerRoles', protoName: 'ManagerRoles')
     ..pPS(7, _omitFieldNames ? '' : 'ViewerRoles', protoName: 'ViewerRoles')
     ..hasRequiredFields = false
@@ -74,15 +74,15 @@ class CreateAttachmentTypeRequest extends $pb.GeneratedMessage {
   static CreateAttachmentTypeRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader get header => $_getN(0);
+  $1.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestProjectHeader value) => $_setField(1, value);
+  set header($1.RequestProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   $core.String get code => $_getSZ(1);
@@ -94,9 +94,9 @@ class CreateAttachmentTypeRequest extends $pb.GeneratedMessage {
   void clearCode() => $_clearField(2);
 
   @$pb.TagNumber(3)
-  $3.EntityType get entity => $_getN(2);
+  $1.EntityType get entity => $_getN(2);
   @$pb.TagNumber(3)
-  set entity($3.EntityType value) => $_setField(3, value);
+  set entity($1.EntityType value) => $_setField(3, value);
   @$pb.TagNumber(3)
   $core.bool hasEntity() => $_has(2);
   @$pb.TagNumber(3)
@@ -112,9 +112,9 @@ class CreateAttachmentTypeRequest extends $pb.GeneratedMessage {
   void clearLabel() => $_clearField(4);
 
   @$pb.TagNumber(5)
-  $3.SharePolicy get sharePolicy => $_getN(4);
+  $1.SharePolicy get sharePolicy => $_getN(4);
   @$pb.TagNumber(5)
-  set sharePolicy($3.SharePolicy value) => $_setField(5, value);
+  set sharePolicy($1.SharePolicy value) => $_setField(5, value);
   @$pb.TagNumber(5)
   $core.bool hasSharePolicy() => $_has(4);
   @$pb.TagNumber(5)
@@ -129,7 +129,7 @@ class CreateAttachmentTypeRequest extends $pb.GeneratedMessage {
 
 class CreateAttachmentTypeResponse extends $pb.GeneratedMessage {
   factory CreateAttachmentTypeResponse({
-    $3.AttachmentType? attachmentType,
+    $1.AttachmentType? attachmentType,
   }) {
     final result = create();
     if (attachmentType != null) result.attachmentType = attachmentType;
@@ -142,7 +142,7 @@ class CreateAttachmentTypeResponse extends $pb.GeneratedMessage {
   factory CreateAttachmentTypeResponse.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateAttachmentTypeResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.AttachmentType>(1, _omitFieldNames ? '' : 'AttachmentType', protoName: 'AttachmentType', subBuilder: $3.AttachmentType.create)
+    ..aOM<$1.AttachmentType>(1, _omitFieldNames ? '' : 'AttachmentType', protoName: 'AttachmentType', subBuilder: $1.AttachmentType.create)
     ..hasRequiredFields = false
   ;
 
@@ -164,25 +164,25 @@ class CreateAttachmentTypeResponse extends $pb.GeneratedMessage {
   static CreateAttachmentTypeResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.AttachmentType get attachmentType => $_getN(0);
+  $1.AttachmentType get attachmentType => $_getN(0);
   @$pb.TagNumber(1)
-  set attachmentType($3.AttachmentType value) => $_setField(1, value);
+  set attachmentType($1.AttachmentType value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasAttachmentType() => $_has(0);
   @$pb.TagNumber(1)
   void clearAttachmentType() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.AttachmentType ensureAttachmentType() => $_ensure(0);
+  $1.AttachmentType ensureAttachmentType() => $_ensure(0);
 }
 
 /// Get
 class GetAttachmentTypeRequest extends $pb.GeneratedMessage {
   factory GetAttachmentTypeRequest({
-    $3.RequestProjectHeader? header,
+    $1.RequestProjectHeader? header,
   @$core.Deprecated('This field is deprecated.')
     $core.String? code,
   @$core.Deprecated('This field is deprecated.')
-    $3.EntityType? entity,
+    $1.EntityType? entity,
     $core.String? iD,
   }) {
     final result = create();
@@ -199,9 +199,9 @@ class GetAttachmentTypeRequest extends $pb.GeneratedMessage {
   factory GetAttachmentTypeRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAttachmentTypeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'Code', protoName: 'Code')
-    ..e<$3.EntityType>(3, _omitFieldNames ? '' : 'Entity', $pb.PbFieldType.OE, protoName: 'Entity', defaultOrMaker: $3.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $3.EntityType.valueOf, enumValues: $3.EntityType.values)
+    ..e<$1.EntityType>(3, _omitFieldNames ? '' : 'Entity', $pb.PbFieldType.OE, protoName: 'Entity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..aOS(4, _omitFieldNames ? '' : 'ID', protoName: 'ID')
     ..hasRequiredFields = false
   ;
@@ -224,15 +224,15 @@ class GetAttachmentTypeRequest extends $pb.GeneratedMessage {
   static GetAttachmentTypeRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader get header => $_getN(0);
+  $1.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestProjectHeader value) => $_setField(1, value);
+  set header($1.RequestProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
 
   @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(2)
@@ -249,10 +249,10 @@ class GetAttachmentTypeRequest extends $pb.GeneratedMessage {
 
   @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
-  $3.EntityType get entity => $_getN(2);
+  $1.EntityType get entity => $_getN(2);
   @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
-  set entity($3.EntityType value) => $_setField(3, value);
+  set entity($1.EntityType value) => $_setField(3, value);
   @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasEntity() => $_has(2);
@@ -272,7 +272,7 @@ class GetAttachmentTypeRequest extends $pb.GeneratedMessage {
 
 class GetAttachmentTypeResponse extends $pb.GeneratedMessage {
   factory GetAttachmentTypeResponse({
-    $3.AttachmentType? attachmentType,
+    $1.AttachmentType? attachmentType,
   }) {
     final result = create();
     if (attachmentType != null) result.attachmentType = attachmentType;
@@ -285,7 +285,7 @@ class GetAttachmentTypeResponse extends $pb.GeneratedMessage {
   factory GetAttachmentTypeResponse.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAttachmentTypeResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.AttachmentType>(1, _omitFieldNames ? '' : 'AttachmentType', protoName: 'AttachmentType', subBuilder: $3.AttachmentType.create)
+    ..aOM<$1.AttachmentType>(1, _omitFieldNames ? '' : 'AttachmentType', protoName: 'AttachmentType', subBuilder: $1.AttachmentType.create)
     ..hasRequiredFields = false
   ;
 
@@ -307,22 +307,22 @@ class GetAttachmentTypeResponse extends $pb.GeneratedMessage {
   static GetAttachmentTypeResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.AttachmentType get attachmentType => $_getN(0);
+  $1.AttachmentType get attachmentType => $_getN(0);
   @$pb.TagNumber(1)
-  set attachmentType($3.AttachmentType value) => $_setField(1, value);
+  set attachmentType($1.AttachmentType value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasAttachmentType() => $_has(0);
   @$pb.TagNumber(1)
   void clearAttachmentType() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.AttachmentType ensureAttachmentType() => $_ensure(0);
+  $1.AttachmentType ensureAttachmentType() => $_ensure(0);
 }
 
 /// List
 class ListAttachmentTypeRequest extends $pb.GeneratedMessage {
   factory ListAttachmentTypeRequest({
-    $3.RequestProjectHeader? header,
+    $1.RequestProjectHeader? header,
-    $3.EntityType? entity,
+    $1.EntityType? entity,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -336,8 +336,8 @@ class ListAttachmentTypeRequest extends $pb.GeneratedMessage {
   factory ListAttachmentTypeRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListAttachmentTypeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
-    ..e<$3.EntityType>(2, _omitFieldNames ? '' : 'Entity', $pb.PbFieldType.OE, protoName: 'Entity', defaultOrMaker: $3.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $3.EntityType.valueOf, enumValues: $3.EntityType.values)
+    ..e<$1.EntityType>(2, _omitFieldNames ? '' : 'Entity', $pb.PbFieldType.OE, protoName: 'Entity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..hasRequiredFields = false
   ;
 
@@ -359,20 +359,20 @@ class ListAttachmentTypeRequest extends $pb.GeneratedMessage {
   static ListAttachmentTypeRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader get header => $_getN(0);
+  $1.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestProjectHeader value) => $_setField(1, value);
+  set header($1.RequestProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $3.EntityType get entity => $_getN(1);
+  $1.EntityType get entity => $_getN(1);
   @$pb.TagNumber(2)
-  set entity($3.EntityType value) => $_setField(2, value);
+  set entity($1.EntityType value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasEntity() => $_has(1);
   @$pb.TagNumber(2)
@@ -381,7 +381,7 @@ class ListAttachmentTypeRequest extends $pb.GeneratedMessage {
 
 class ListAttachmentTypeResponse extends $pb.GeneratedMessage {
   factory ListAttachmentTypeResponse({
-    $core.Iterable<$3.AttachmentType>? attachmentTypes,
+    $core.Iterable<$1.AttachmentType>? attachmentTypes,
   }) {
     final result = create();
     if (attachmentTypes != null) result.attachmentTypes.addAll(attachmentTypes);
@@ -394,7 +394,7 @@ class ListAttachmentTypeResponse extends $pb.GeneratedMessage {
   factory ListAttachmentTypeResponse.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListAttachmentTypeResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$3.AttachmentType>(1, _omitFieldNames ? '' : 'AttachmentTypes', $pb.PbFieldType.PM, protoName: 'AttachmentTypes', subBuilder: $3.AttachmentType.create)
+    ..pc<$1.AttachmentType>(1, _omitFieldNames ? '' : 'AttachmentTypes', $pb.PbFieldType.PM, protoName: 'AttachmentTypes', subBuilder: $1.AttachmentType.create)
     ..hasRequiredFields = false
   ;
 
@@ -416,19 +416,19 @@ class ListAttachmentTypeResponse extends $pb.GeneratedMessage {
   static ListAttachmentTypeResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $pb.PbList<$3.AttachmentType> get attachmentTypes => $_getList(0);
+  $pb.PbList<$1.AttachmentType> get attachmentTypes => $_getList(0);
 }
 
 /// Update
 class UpdateAttachmentTypeRequest extends $pb.GeneratedMessage {
   factory UpdateAttachmentTypeRequest({
-    $3.RequestProjectHeader? header,
+    $1.RequestProjectHeader? header,
   @$core.Deprecated('This field is deprecated.')
     $core.String? code,
   @$core.Deprecated('This field is deprecated.')
-    $3.EntityType? entity,
+    $1.EntityType? entity,
     $core.String? label,
-    $3.SharePolicy? sharePolicy,
+    $1.SharePolicy? sharePolicy,
     $core.String? iD,
     $core.Iterable<$core.String>? managerRoles,
     $core.Iterable<$core.String>? viewerRoles,
@@ -451,11 +451,11 @@ class UpdateAttachmentTypeRequest extends $pb.GeneratedMessage {
   factory UpdateAttachmentTypeRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateAttachmentTypeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'Code', protoName: 'Code')
-    ..e<$3.EntityType>(3, _omitFieldNames ? '' : 'Entity', $pb.PbFieldType.OE, protoName: 'Entity', defaultOrMaker: $3.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $3.EntityType.valueOf, enumValues: $3.EntityType.values)
+    ..e<$1.EntityType>(3, _omitFieldNames ? '' : 'Entity', $pb.PbFieldType.OE, protoName: 'Entity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..aOS(4, _omitFieldNames ? '' : 'Label', protoName: 'Label')
-    ..e<$3.SharePolicy>(5, _omitFieldNames ? '' : 'SharePolicy', $pb.PbFieldType.OE, protoName: 'SharePolicy', defaultOrMaker: $3.SharePolicy.SHARE_POLICY_UNKNOWN, valueOf: $3.SharePolicy.valueOf, enumValues: $3.SharePolicy.values)
+    ..e<$1.SharePolicy>(5, _omitFieldNames ? '' : 'SharePolicy', $pb.PbFieldType.OE, protoName: 'SharePolicy', defaultOrMaker: $1.SharePolicy.SHARE_POLICY_UNKNOWN, valueOf: $1.SharePolicy.valueOf, enumValues: $1.SharePolicy.values)
     ..aOS(6, _omitFieldNames ? '' : 'ID', protoName: 'ID')
     ..pPS(7, _omitFieldNames ? '' : 'ManagerRoles', protoName: 'ManagerRoles')
     ..pPS(8, _omitFieldNames ? '' : 'ViewerRoles', protoName: 'ViewerRoles')
@@ -480,15 +480,15 @@ class UpdateAttachmentTypeRequest extends $pb.GeneratedMessage {
   static UpdateAttachmentTypeRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader get header => $_getN(0);
+  $1.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestProjectHeader value) => $_setField(1, value);
+  set header($1.RequestProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
 
   @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(2)
@@ -505,10 +505,10 @@ class UpdateAttachmentTypeRequest extends $pb.GeneratedMessage {
 
   @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
-  $3.EntityType get entity => $_getN(2);
+  $1.EntityType get entity => $_getN(2);
   @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
-  set entity($3.EntityType value) => $_setField(3, value);
+  set entity($1.EntityType value) => $_setField(3, value);
   @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasEntity() => $_has(2);
@@ -526,9 +526,9 @@ class UpdateAttachmentTypeRequest extends $pb.GeneratedMessage {
   void clearLabel() => $_clearField(4);
 
   @$pb.TagNumber(5)
-  $3.SharePolicy get sharePolicy => $_getN(4);
+  $1.SharePolicy get sharePolicy => $_getN(4);
   @$pb.TagNumber(5)
-  set sharePolicy($3.SharePolicy value) => $_setField(5, value);
+  set sharePolicy($1.SharePolicy value) => $_setField(5, value);
   @$pb.TagNumber(5)
   $core.bool hasSharePolicy() => $_has(4);
   @$pb.TagNumber(5)
@@ -552,7 +552,7 @@ class UpdateAttachmentTypeRequest extends $pb.GeneratedMessage {
 
 class UpdateAttachmentTypeResponse extends $pb.GeneratedMessage {
   factory UpdateAttachmentTypeResponse({
-    $3.AttachmentType? attachmentType,
+    $1.AttachmentType? attachmentType,
   }) {
     final result = create();
     if (attachmentType != null) result.attachmentType = attachmentType;
@@ -565,7 +565,7 @@ class UpdateAttachmentTypeResponse extends $pb.GeneratedMessage {
   factory UpdateAttachmentTypeResponse.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateAttachmentTypeResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.AttachmentType>(1, _omitFieldNames ? '' : 'AttachmentType', protoName: 'AttachmentType', subBuilder: $3.AttachmentType.create)
+    ..aOM<$1.AttachmentType>(1, _omitFieldNames ? '' : 'AttachmentType', protoName: 'AttachmentType', subBuilder: $1.AttachmentType.create)
     ..hasRequiredFields = false
   ;
 
@@ -587,25 +587,25 @@ class UpdateAttachmentTypeResponse extends $pb.GeneratedMessage {
   static UpdateAttachmentTypeResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.AttachmentType get attachmentType => $_getN(0);
+  $1.AttachmentType get attachmentType => $_getN(0);
   @$pb.TagNumber(1)
-  set attachmentType($3.AttachmentType value) => $_setField(1, value);
+  set attachmentType($1.AttachmentType value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasAttachmentType() => $_has(0);
   @$pb.TagNumber(1)
   void clearAttachmentType() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.AttachmentType ensureAttachmentType() => $_ensure(0);
+  $1.AttachmentType ensureAttachmentType() => $_ensure(0);
 }
 
 /// Delete
 class DeleteAttachmentTypeRequest extends $pb.GeneratedMessage {
   factory DeleteAttachmentTypeRequest({
-    $3.RequestProjectHeader? header,
+    $1.RequestProjectHeader? header,
   @$core.Deprecated('This field is deprecated.')
     $core.String? code,
   @$core.Deprecated('This field is deprecated.')
-    $3.EntityType? entity,
+    $1.EntityType? entity,
     $core.String? iD,
   }) {
     final result = create();
@@ -622,9 +622,9 @@ class DeleteAttachmentTypeRequest extends $pb.GeneratedMessage {
   factory DeleteAttachmentTypeRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteAttachmentTypeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'Code', protoName: 'Code')
-    ..e<$3.EntityType>(3, _omitFieldNames ? '' : 'Entity', $pb.PbFieldType.OE, protoName: 'Entity', defaultOrMaker: $3.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $3.EntityType.valueOf, enumValues: $3.EntityType.values)
+    ..e<$1.EntityType>(3, _omitFieldNames ? '' : 'Entity', $pb.PbFieldType.OE, protoName: 'Entity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..aOS(4, _omitFieldNames ? '' : 'ID', protoName: 'ID')
     ..hasRequiredFields = false
   ;
@@ -647,15 +647,15 @@ class DeleteAttachmentTypeRequest extends $pb.GeneratedMessage {
   static DeleteAttachmentTypeRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader get header => $_getN(0);
+  $1.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestProjectHeader value) => $_setField(1, value);
+  set header($1.RequestProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
 
   @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(2)
@@ -672,10 +672,10 @@ class DeleteAttachmentTypeRequest extends $pb.GeneratedMessage {
 
   @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
-  $3.EntityType get entity => $_getN(2);
+  $1.EntityType get entity => $_getN(2);
   @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
-  set entity($3.EntityType value) => $_setField(3, value);
+  set entity($1.EntityType value) => $_setField(3, value);
   @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasEntity() => $_has(2);
@@ -725,7 +725,7 @@ class DeleteAttachmentTypeResponse extends $pb.GeneratedMessage {
 
 class DeleteAllAttachmentsTypeRequest extends $pb.GeneratedMessage {
   factory DeleteAllAttachmentsTypeRequest({
-    $3.RequestProjectHeader? header,
+    $1.RequestProjectHeader? header,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -738,7 +738,7 @@ class DeleteAllAttachmentsTypeRequest extends $pb.GeneratedMessage {
   factory DeleteAllAttachmentsTypeRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteAllAttachmentsTypeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
     ..hasRequiredFields = false
   ;
 
@@ -760,15 +760,15 @@ class DeleteAllAttachmentsTypeRequest extends $pb.GeneratedMessage {
   static DeleteAllAttachmentsTypeRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader get header => $_getN(0);
+  $1.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestProjectHeader value) => $_setField(1, value);
+  set header($1.RequestProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
 }
 
 class DeleteAllAttachmentsTypeResponse extends $pb.GeneratedMessage {

lib/attachmentType.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from attachmentType.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/attachmentType.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from attachmentType.proto.
-//  source: attachmentType.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,7 +16,7 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'attachmentType.pb.dart' as $10;
+import 'attachmentType.pb.dart' as $0;
 
 export 'attachmentType.pb.dart';
 
@@ -30,56 +30,58 @@ class AttachmentTypeServiceClient extends $grpc.Client {
     '',
   ];
 
-  static final _$create = $grpc.ClientMethod<$10.CreateAttachmentTypeRequest, $10.CreateAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/Create',
-      ($10.CreateAttachmentTypeRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $10.CreateAttachmentTypeResponse.fromBuffer(value));
-  static final _$get = $grpc.ClientMethod<$10.GetAttachmentTypeRequest, $10.GetAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/Get',
-      ($10.GetAttachmentTypeRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $10.GetAttachmentTypeResponse.fromBuffer(value));
-  static final _$list = $grpc.ClientMethod<$10.ListAttachmentTypeRequest, $10.ListAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/List',
-      ($10.ListAttachmentTypeRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $10.ListAttachmentTypeResponse.fromBuffer(value));
-  static final _$update = $grpc.ClientMethod<$10.UpdateAttachmentTypeRequest, $10.UpdateAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/Update',
-      ($10.UpdateAttachmentTypeRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $10.UpdateAttachmentTypeResponse.fromBuffer(value));
-  static final _$delete = $grpc.ClientMethod<$10.DeleteAttachmentTypeRequest, $10.DeleteAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/Delete',
-      ($10.DeleteAttachmentTypeRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $10.DeleteAttachmentTypeResponse.fromBuffer(value));
-  static final _$deleteAll = $grpc.ClientMethod<$10.DeleteAllAttachmentsTypeRequest, $10.DeleteAllAttachmentsTypeResponse>(
-      '/api.AttachmentTypeService/DeleteAll',
-      ($10.DeleteAllAttachmentsTypeRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $10.DeleteAllAttachmentsTypeResponse.fromBuffer(value));
-
   AttachmentTypeServiceClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$10.CreateAttachmentTypeResponse> create($10.CreateAttachmentTypeRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.CreateAttachmentTypeResponse> create($0.CreateAttachmentTypeRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$create, request, options: options);
   }
 
-  $grpc.ResponseFuture<$10.GetAttachmentTypeResponse> get($10.GetAttachmentTypeRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.GetAttachmentTypeResponse> get($0.GetAttachmentTypeRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$get, request, options: options);
   }
 
-  $grpc.ResponseFuture<$10.ListAttachmentTypeResponse> list($10.ListAttachmentTypeRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ListAttachmentTypeResponse> list($0.ListAttachmentTypeRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$list, request, options: options);
   }
 
-  $grpc.ResponseFuture<$10.UpdateAttachmentTypeResponse> update($10.UpdateAttachmentTypeRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.UpdateAttachmentTypeResponse> update($0.UpdateAttachmentTypeRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$update, request, options: options);
   }
 
-  $grpc.ResponseFuture<$10.DeleteAttachmentTypeResponse> delete($10.DeleteAttachmentTypeRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.DeleteAttachmentTypeResponse> delete($0.DeleteAttachmentTypeRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$delete, request, options: options);
   }
 
-  $grpc.ResponseFuture<$10.DeleteAllAttachmentsTypeResponse> deleteAll($10.DeleteAllAttachmentsTypeRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.DeleteAllAttachmentsTypeResponse> deleteAll($0.DeleteAllAttachmentsTypeRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$deleteAll, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$create = $grpc.ClientMethod<$0.CreateAttachmentTypeRequest, $0.CreateAttachmentTypeResponse>(
+      '/api.AttachmentTypeService/Create',
+      ($0.CreateAttachmentTypeRequest value) => value.writeToBuffer(),
+      $0.CreateAttachmentTypeResponse.fromBuffer);
+  static final _$get = $grpc.ClientMethod<$0.GetAttachmentTypeRequest, $0.GetAttachmentTypeResponse>(
+      '/api.AttachmentTypeService/Get',
+      ($0.GetAttachmentTypeRequest value) => value.writeToBuffer(),
+      $0.GetAttachmentTypeResponse.fromBuffer);
+  static final _$list = $grpc.ClientMethod<$0.ListAttachmentTypeRequest, $0.ListAttachmentTypeResponse>(
+      '/api.AttachmentTypeService/List',
+      ($0.ListAttachmentTypeRequest value) => value.writeToBuffer(),
+      $0.ListAttachmentTypeResponse.fromBuffer);
+  static final _$update = $grpc.ClientMethod<$0.UpdateAttachmentTypeRequest, $0.UpdateAttachmentTypeResponse>(
+      '/api.AttachmentTypeService/Update',
+      ($0.UpdateAttachmentTypeRequest value) => value.writeToBuffer(),
+      $0.UpdateAttachmentTypeResponse.fromBuffer);
+  static final _$delete = $grpc.ClientMethod<$0.DeleteAttachmentTypeRequest, $0.DeleteAttachmentTypeResponse>(
+      '/api.AttachmentTypeService/Delete',
+      ($0.DeleteAttachmentTypeRequest value) => value.writeToBuffer(),
+      $0.DeleteAttachmentTypeResponse.fromBuffer);
+  static final _$deleteAll = $grpc.ClientMethod<$0.DeleteAllAttachmentsTypeRequest, $0.DeleteAllAttachmentsTypeResponse>(
+      '/api.AttachmentTypeService/DeleteAll',
+      ($0.DeleteAllAttachmentsTypeRequest value) => value.writeToBuffer(),
+      $0.DeleteAllAttachmentsTypeResponse.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.AttachmentTypeService')
@@ -87,78 +89,84 @@ abstract class AttachmentTypeServiceBase extends $grpc.Service {
   $core.String get $name => 'api.AttachmentTypeService';
 
   AttachmentTypeServiceBase() {
-    $addMethod($grpc.ServiceMethod<$10.CreateAttachmentTypeRequest, $10.CreateAttachmentTypeResponse>(
+    $addMethod($grpc.ServiceMethod<$0.CreateAttachmentTypeRequest, $0.CreateAttachmentTypeResponse>(
         'Create',
         create_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $10.CreateAttachmentTypeRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.CreateAttachmentTypeRequest.fromBuffer(value),
-        ($10.CreateAttachmentTypeResponse value) => value.writeToBuffer()));
+        ($0.CreateAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$10.GetAttachmentTypeRequest, $10.GetAttachmentTypeResponse>(
+    $addMethod($grpc.ServiceMethod<$0.GetAttachmentTypeRequest, $0.GetAttachmentTypeResponse>(
         'Get',
         get_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $10.GetAttachmentTypeRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.GetAttachmentTypeRequest.fromBuffer(value),
-        ($10.GetAttachmentTypeResponse value) => value.writeToBuffer()));
+        ($0.GetAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$10.ListAttachmentTypeRequest, $10.ListAttachmentTypeResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ListAttachmentTypeRequest, $0.ListAttachmentTypeResponse>(
         'List',
         list_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $10.ListAttachmentTypeRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ListAttachmentTypeRequest.fromBuffer(value),
-        ($10.ListAttachmentTypeResponse value) => value.writeToBuffer()));
+        ($0.ListAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$10.UpdateAttachmentTypeRequest, $10.UpdateAttachmentTypeResponse>(
+    $addMethod($grpc.ServiceMethod<$0.UpdateAttachmentTypeRequest, $0.UpdateAttachmentTypeResponse>(
         'Update',
         update_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $10.UpdateAttachmentTypeRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.UpdateAttachmentTypeRequest.fromBuffer(value),
-        ($10.UpdateAttachmentTypeResponse value) => value.writeToBuffer()));
+        ($0.UpdateAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$10.DeleteAttachmentTypeRequest, $10.DeleteAttachmentTypeResponse>(
+    $addMethod($grpc.ServiceMethod<$0.DeleteAttachmentTypeRequest, $0.DeleteAttachmentTypeResponse>(
         'Delete',
         delete_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $10.DeleteAttachmentTypeRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.DeleteAttachmentTypeRequest.fromBuffer(value),
-        ($10.DeleteAttachmentTypeResponse value) => value.writeToBuffer()));
+        ($0.DeleteAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$10.DeleteAllAttachmentsTypeRequest, $10.DeleteAllAttachmentsTypeResponse>(
+    $addMethod($grpc.ServiceMethod<$0.DeleteAllAttachmentsTypeRequest, $0.DeleteAllAttachmentsTypeResponse>(
         'DeleteAll',
         deleteAll_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $10.DeleteAllAttachmentsTypeRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.DeleteAllAttachmentsTypeRequest.fromBuffer(value),
-        ($10.DeleteAllAttachmentsTypeResponse value) => value.writeToBuffer()));
+        ($0.DeleteAllAttachmentsTypeResponse value) => value.writeToBuffer()));
   }
 
-  $async.Future<$10.CreateAttachmentTypeResponse> create_Pre($grpc.ServiceCall $call, $async.Future<$10.CreateAttachmentTypeRequest> $request) async {
+  $async.Future<$0.CreateAttachmentTypeResponse> create_Pre($grpc.ServiceCall $call, $async.Future<$0.CreateAttachmentTypeRequest> $request) async {
     return create($call, await $request);
   }
 
-  $async.Future<$10.GetAttachmentTypeResponse> get_Pre($grpc.ServiceCall $call, $async.Future<$10.GetAttachmentTypeRequest> $request) async {
+  $async.Future<$0.CreateAttachmentTypeResponse> create($grpc.ServiceCall call, $0.CreateAttachmentTypeRequest request);
+
+  $async.Future<$0.GetAttachmentTypeResponse> get_Pre($grpc.ServiceCall $call, $async.Future<$0.GetAttachmentTypeRequest> $request) async {
     return get($call, await $request);
   }
 
-  $async.Future<$10.ListAttachmentTypeResponse> list_Pre($grpc.ServiceCall $call, $async.Future<$10.ListAttachmentTypeRequest> $request) async {
+  $async.Future<$0.GetAttachmentTypeResponse> get($grpc.ServiceCall call, $0.GetAttachmentTypeRequest request);
+
+  $async.Future<$0.ListAttachmentTypeResponse> list_Pre($grpc.ServiceCall $call, $async.Future<$0.ListAttachmentTypeRequest> $request) async {
     return list($call, await $request);
   }
 
-  $async.Future<$10.UpdateAttachmentTypeResponse> update_Pre($grpc.ServiceCall $call, $async.Future<$10.UpdateAttachmentTypeRequest> $request) async {
+  $async.Future<$0.ListAttachmentTypeResponse> list($grpc.ServiceCall call, $0.ListAttachmentTypeRequest request);
+
+  $async.Future<$0.UpdateAttachmentTypeResponse> update_Pre($grpc.ServiceCall $call, $async.Future<$0.UpdateAttachmentTypeRequest> $request) async {
     return update($call, await $request);
   }
 
-  $async.Future<$10.DeleteAttachmentTypeResponse> delete_Pre($grpc.ServiceCall $call, $async.Future<$10.DeleteAttachmentTypeRequest> $request) async {
+  $async.Future<$0.UpdateAttachmentTypeResponse> update($grpc.ServiceCall call, $0.UpdateAttachmentTypeRequest request);
+
+  $async.Future<$0.DeleteAttachmentTypeResponse> delete_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAttachmentTypeRequest> $request) async {
     return delete($call, await $request);
   }
 
-  $async.Future<$10.DeleteAllAttachmentsTypeResponse> deleteAll_Pre($grpc.ServiceCall $call, $async.Future<$10.DeleteAllAttachmentsTypeRequest> $request) async {
+  $async.Future<$0.DeleteAttachmentTypeResponse> delete($grpc.ServiceCall call, $0.DeleteAttachmentTypeRequest request);
+
+  $async.Future<$0.DeleteAllAttachmentsTypeResponse> deleteAll_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAllAttachmentsTypeRequest> $request) async {
     return deleteAll($call, await $request);
   }
 
-  $async.Future<$10.CreateAttachmentTypeResponse> create($grpc.ServiceCall call, $10.CreateAttachmentTypeRequest request);
+  $async.Future<$0.DeleteAllAttachmentsTypeResponse> deleteAll($grpc.ServiceCall call, $0.DeleteAllAttachmentsTypeRequest request);
-  $async.Future<$10.GetAttachmentTypeResponse> get($grpc.ServiceCall call, $10.GetAttachmentTypeRequest request);
+
-  $async.Future<$10.ListAttachmentTypeResponse> list($grpc.ServiceCall call, $10.ListAttachmentTypeRequest request);
-  $async.Future<$10.UpdateAttachmentTypeResponse> update($grpc.ServiceCall call, $10.UpdateAttachmentTypeRequest request);
-  $async.Future<$10.DeleteAttachmentTypeResponse> delete($grpc.ServiceCall call, $10.DeleteAttachmentTypeRequest request);
-  $async.Future<$10.DeleteAllAttachmentsTypeResponse> deleteAll($grpc.ServiceCall call, $10.DeleteAllAttachmentsTypeRequest request);
 }

lib/attachmentType.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from attachmentType.proto.
-//  source: attachmentType.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/attachmentV2.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from attachmentV2.proto.
-//  source: attachmentV2.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -15,7 +15,7 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'attachmentV2.pbenum.dart';
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
@@ -26,7 +26,7 @@ class Attachment extends $pb.GeneratedMessage {
     $core.String? projectID,
     $core.String? name,
     $core.String? entityRefID,
-    $3.AttachmentType? attachmentType,
+    $1.AttachmentType? attachmentType,
     $core.String? uRI,
     $core.String? mIMEType,
     $core.String? uploadedAt,
@@ -55,7 +55,7 @@ class Attachment extends $pb.GeneratedMessage {
     ..aOS(1, _omitFieldNames ? '' : 'ProjectID', protoName: 'ProjectID')
     ..aOS(2, _omitFieldNames ? '' : 'Name', protoName: 'Name')
     ..aOS(3, _omitFieldNames ? '' : 'EntityRefID', protoName: 'EntityRefID')
-    ..aOM<$3.AttachmentType>(4, _omitFieldNames ? '' : 'AttachmentType', protoName: 'AttachmentType', subBuilder: $3.AttachmentType.create)
+    ..aOM<$1.AttachmentType>(4, _omitFieldNames ? '' : 'AttachmentType', protoName: 'AttachmentType', subBuilder: $1.AttachmentType.create)
     ..aOS(5, _omitFieldNames ? '' : 'URI', protoName: 'URI')
     ..aOS(6, _omitFieldNames ? '' : 'MIMEType', protoName: 'MIMEType')
     ..aOS(11, _omitFieldNames ? '' : 'UploadedAt', protoName: 'UploadedAt')
@@ -109,15 +109,15 @@ class Attachment extends $pb.GeneratedMessage {
   void clearEntityRefID() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $3.AttachmentType get attachmentType => $_getN(3);
+  $1.AttachmentType get attachmentType => $_getN(3);
   @$pb.TagNumber(4)
-  set attachmentType($3.AttachmentType value) => $_setField(4, value);
+  set attachmentType($1.AttachmentType value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasAttachmentType() => $_has(3);
   @$pb.TagNumber(4)
   void clearAttachmentType() => $_clearField(4);
   @$pb.TagNumber(4)
-  $3.AttachmentType ensureAttachmentType() => $_ensure(3);
+  $1.AttachmentType ensureAttachmentType() => $_ensure(3);
 
   @$pb.TagNumber(5)
   $core.String get uRI => $_getSZ(4);
@@ -168,7 +168,7 @@ class Attachment extends $pb.GeneratedMessage {
 /// Download
 class DownloadAttachmentV2Request extends $pb.GeneratedMessage {
   factory DownloadAttachmentV2Request({
-    $3.RequestAttachmentTypeHeader? header,
+    $1.RequestAttachmentTypeHeader? header,
     $core.String? name,
     $core.String? entityRefID,
   }) {
@@ -185,7 +185,7 @@ class DownloadAttachmentV2Request extends $pb.GeneratedMessage {
   factory DownloadAttachmentV2Request.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DownloadAttachmentV2Request', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestAttachmentTypeHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestAttachmentTypeHeader.create)
+    ..aOM<$1.RequestAttachmentTypeHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestAttachmentTypeHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'Name', protoName: 'Name')
     ..aOS(3, _omitFieldNames ? '' : 'EntityRefID', protoName: 'EntityRefID')
     ..hasRequiredFields = false
@@ -209,15 +209,15 @@ class DownloadAttachmentV2Request extends $pb.GeneratedMessage {
   static DownloadAttachmentV2Request? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestAttachmentTypeHeader get header => $_getN(0);
+  $1.RequestAttachmentTypeHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestAttachmentTypeHeader value) => $_setField(1, value);
+  set header($1.RequestAttachmentTypeHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestAttachmentTypeHeader ensureHeader() => $_ensure(0);
+  $1.RequestAttachmentTypeHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   $core.String get name => $_getSZ(1);
@@ -240,8 +240,8 @@ class DownloadAttachmentV2Request extends $pb.GeneratedMessage {
 
 class DownloadAttachmentV2Response extends $pb.GeneratedMessage {
   factory DownloadAttachmentV2Response({
-    $3.FileDataResponse? file,
+    $1.FileDataResponse? file,
-    $3.AttachmentTypeResponseHeader? header,
+    $1.AttachmentTypeResponseHeader? header,
   }) {
     final result = create();
     if (file != null) result.file = file;
@@ -255,8 +255,8 @@ class DownloadAttachmentV2Response extends $pb.GeneratedMessage {
   factory DownloadAttachmentV2Response.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DownloadAttachmentV2Response', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.FileDataResponse>(1, _omitFieldNames ? '' : 'File', protoName: 'File', subBuilder: $3.FileDataResponse.create)
+    ..aOM<$1.FileDataResponse>(1, _omitFieldNames ? '' : 'File', protoName: 'File', subBuilder: $1.FileDataResponse.create)
-    ..aOM<$3.AttachmentTypeResponseHeader>(2, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.AttachmentTypeResponseHeader.create)
+    ..aOM<$1.AttachmentTypeResponseHeader>(2, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.AttachmentTypeResponseHeader.create)
     ..hasRequiredFields = false
   ;
 
@@ -278,35 +278,35 @@ class DownloadAttachmentV2Response extends $pb.GeneratedMessage {
   static DownloadAttachmentV2Response? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.FileDataResponse get file => $_getN(0);
+  $1.FileDataResponse get file => $_getN(0);
   @$pb.TagNumber(1)
-  set file($3.FileDataResponse value) => $_setField(1, value);
+  set file($1.FileDataResponse value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasFile() => $_has(0);
   @$pb.TagNumber(1)
   void clearFile() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.FileDataResponse ensureFile() => $_ensure(0);
+  $1.FileDataResponse ensureFile() => $_ensure(0);
 
   /// Header of the response
   @$pb.TagNumber(2)
-  $3.AttachmentTypeResponseHeader get header => $_getN(1);
+  $1.AttachmentTypeResponseHeader get header => $_getN(1);
   @$pb.TagNumber(2)
-  set header($3.AttachmentTypeResponseHeader value) => $_setField(2, value);
+  set header($1.AttachmentTypeResponseHeader value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasHeader() => $_has(1);
   @$pb.TagNumber(2)
   void clearHeader() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.AttachmentTypeResponseHeader ensureHeader() => $_ensure(1);
+  $1.AttachmentTypeResponseHeader ensureHeader() => $_ensure(1);
 }
 
 /// Upload
 class UploadAttachmentV2Request extends $pb.GeneratedMessage {
   factory UploadAttachmentV2Request({
-    $3.RequestAttachmentTypeHeader? header,
+    $1.RequestAttachmentTypeHeader? header,
     $core.String? entityRefID,
-    $3.FileDataRequest? attachment,
+    $1.FileDataRequest? attachment,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -321,9 +321,9 @@ class UploadAttachmentV2Request extends $pb.GeneratedMessage {
   factory UploadAttachmentV2Request.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UploadAttachmentV2Request', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestAttachmentTypeHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestAttachmentTypeHeader.create)
+    ..aOM<$1.RequestAttachmentTypeHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestAttachmentTypeHeader.create)
     ..aOS(3, _omitFieldNames ? '' : 'EntityRefID', protoName: 'EntityRefID')
-    ..aOM<$3.FileDataRequest>(4, _omitFieldNames ? '' : 'Attachment', protoName: 'Attachment', subBuilder: $3.FileDataRequest.create)
+    ..aOM<$1.FileDataRequest>(4, _omitFieldNames ? '' : 'Attachment', protoName: 'Attachment', subBuilder: $1.FileDataRequest.create)
     ..hasRequiredFields = false
   ;
 
@@ -345,15 +345,15 @@ class UploadAttachmentV2Request extends $pb.GeneratedMessage {
   static UploadAttachmentV2Request? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestAttachmentTypeHeader get header => $_getN(0);
+  $1.RequestAttachmentTypeHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestAttachmentTypeHeader value) => $_setField(1, value);
+  set header($1.RequestAttachmentTypeHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestAttachmentTypeHeader ensureHeader() => $_ensure(0);
+  $1.RequestAttachmentTypeHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(3)
   $core.String get entityRefID => $_getSZ(1);
@@ -365,21 +365,21 @@ class UploadAttachmentV2Request extends $pb.GeneratedMessage {
   void clearEntityRefID() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $3.FileDataRequest get attachment => $_getN(2);
+  $1.FileDataRequest get attachment => $_getN(2);
   @$pb.TagNumber(4)
-  set attachment($3.FileDataRequest value) => $_setField(4, value);
+  set attachment($1.FileDataRequest value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasAttachment() => $_has(2);
   @$pb.TagNumber(4)
   void clearAttachment() => $_clearField(4);
   @$pb.TagNumber(4)
-  $3.FileDataRequest ensureAttachment() => $_ensure(2);
+  $1.FileDataRequest ensureAttachment() => $_ensure(2);
 }
 
 class UploadAttachmentV2Response extends $pb.GeneratedMessage {
   factory UploadAttachmentV2Response({
     Attachment? attachment,
-    $3.AttachmentTypeResponseHeader? header,
+    $1.AttachmentTypeResponseHeader? header,
   }) {
     final result = create();
     if (attachment != null) result.attachment = attachment;
@@ -394,7 +394,7 @@ class UploadAttachmentV2Response extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UploadAttachmentV2Response', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<Attachment>(1, _omitFieldNames ? '' : 'Attachment', protoName: 'Attachment', subBuilder: Attachment.create)
-    ..aOM<$3.AttachmentTypeResponseHeader>(2, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.AttachmentTypeResponseHeader.create)
+    ..aOM<$1.AttachmentTypeResponseHeader>(2, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.AttachmentTypeResponseHeader.create)
     ..hasRequiredFields = false
   ;
 
@@ -428,21 +428,21 @@ class UploadAttachmentV2Response extends $pb.GeneratedMessage {
 
   /// Header of the response
   @$pb.TagNumber(2)
-  $3.AttachmentTypeResponseHeader get header => $_getN(1);
+  $1.AttachmentTypeResponseHeader get header => $_getN(1);
   @$pb.TagNumber(2)
-  set header($3.AttachmentTypeResponseHeader value) => $_setField(2, value);
+  set header($1.AttachmentTypeResponseHeader value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasHeader() => $_has(1);
   @$pb.TagNumber(2)
   void clearHeader() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.AttachmentTypeResponseHeader ensureHeader() => $_ensure(1);
+  $1.AttachmentTypeResponseHeader ensureHeader() => $_ensure(1);
 }
 
 /// AddLink
 class AddLinkV2Request extends $pb.GeneratedMessage {
   factory AddLinkV2Request({
-    $3.RequestAttachmentTypeHeader? header,
+    $1.RequestAttachmentTypeHeader? header,
     $core.String? entityRefID,
     $core.String? name,
     $core.String? uRI,
@@ -461,7 +461,7 @@ class AddLinkV2Request extends $pb.GeneratedMessage {
   factory AddLinkV2Request.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AddLinkV2Request', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestAttachmentTypeHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestAttachmentTypeHeader.create)
+    ..aOM<$1.RequestAttachmentTypeHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestAttachmentTypeHeader.create)
     ..aOS(3, _omitFieldNames ? '' : 'EntityRefID', protoName: 'EntityRefID')
     ..aOS(4, _omitFieldNames ? '' : 'Name', protoName: 'Name')
     ..aOS(5, _omitFieldNames ? '' : 'URI', protoName: 'URI')
@@ -486,15 +486,15 @@ class AddLinkV2Request extends $pb.GeneratedMessage {
   static AddLinkV2Request? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestAttachmentTypeHeader get header => $_getN(0);
+  $1.RequestAttachmentTypeHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestAttachmentTypeHeader value) => $_setField(1, value);
+  set header($1.RequestAttachmentTypeHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestAttachmentTypeHeader ensureHeader() => $_ensure(0);
+  $1.RequestAttachmentTypeHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(3)
   $core.String get entityRefID => $_getSZ(1);
@@ -527,7 +527,7 @@ class AddLinkV2Request extends $pb.GeneratedMessage {
 class AddLinkV2Response extends $pb.GeneratedMessage {
   factory AddLinkV2Response({
     Attachment? attachment,
-    $3.AttachmentTypeResponseHeader? header,
+    $1.AttachmentTypeResponseHeader? header,
   }) {
     final result = create();
     if (attachment != null) result.attachment = attachment;
@@ -542,7 +542,7 @@ class AddLinkV2Response extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AddLinkV2Response', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<Attachment>(1, _omitFieldNames ? '' : 'Attachment', protoName: 'Attachment', subBuilder: Attachment.create)
-    ..aOM<$3.AttachmentTypeResponseHeader>(2, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.AttachmentTypeResponseHeader.create)
+    ..aOM<$1.AttachmentTypeResponseHeader>(2, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.AttachmentTypeResponseHeader.create)
     ..hasRequiredFields = false
   ;
 
@@ -576,21 +576,21 @@ class AddLinkV2Response extends $pb.GeneratedMessage {
 
   /// Header of the response
   @$pb.TagNumber(2)
-  $3.AttachmentTypeResponseHeader get header => $_getN(1);
+  $1.AttachmentTypeResponseHeader get header => $_getN(1);
   @$pb.TagNumber(2)
-  set header($3.AttachmentTypeResponseHeader value) => $_setField(2, value);
+  set header($1.AttachmentTypeResponseHeader value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasHeader() => $_has(1);
   @$pb.TagNumber(2)
   void clearHeader() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.AttachmentTypeResponseHeader ensureHeader() => $_ensure(1);
+  $1.AttachmentTypeResponseHeader ensureHeader() => $_ensure(1);
 }
 
 /// Delete
 class DeleteAttachmentV2Request extends $pb.GeneratedMessage {
   factory DeleteAttachmentV2Request({
-    $3.RequestAttachmentTypeHeader? header,
+    $1.RequestAttachmentTypeHeader? header,
     $core.String? name,
     $core.String? entityRefID,
   }) {
@@ -607,7 +607,7 @@ class DeleteAttachmentV2Request extends $pb.GeneratedMessage {
   factory DeleteAttachmentV2Request.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteAttachmentV2Request', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestAttachmentTypeHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestAttachmentTypeHeader.create)
+    ..aOM<$1.RequestAttachmentTypeHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestAttachmentTypeHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'Name', protoName: 'Name')
     ..aOS(3, _omitFieldNames ? '' : 'EntityRefID', protoName: 'EntityRefID')
     ..hasRequiredFields = false
@@ -631,15 +631,15 @@ class DeleteAttachmentV2Request extends $pb.GeneratedMessage {
   static DeleteAttachmentV2Request? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestAttachmentTypeHeader get header => $_getN(0);
+  $1.RequestAttachmentTypeHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestAttachmentTypeHeader value) => $_setField(1, value);
+  set header($1.RequestAttachmentTypeHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestAttachmentTypeHeader ensureHeader() => $_ensure(0);
+  $1.RequestAttachmentTypeHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   $core.String get name => $_getSZ(1);
@@ -662,7 +662,7 @@ class DeleteAttachmentV2Request extends $pb.GeneratedMessage {
 
 class DeleteAttachmentV2Response extends $pb.GeneratedMessage {
   factory DeleteAttachmentV2Response({
-    $3.AttachmentTypeResponseHeader? header,
+    $1.AttachmentTypeResponseHeader? header,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -675,7 +675,7 @@ class DeleteAttachmentV2Response extends $pb.GeneratedMessage {
   factory DeleteAttachmentV2Response.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteAttachmentV2Response', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.AttachmentTypeResponseHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.AttachmentTypeResponseHeader.create)
+    ..aOM<$1.AttachmentTypeResponseHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.AttachmentTypeResponseHeader.create)
     ..hasRequiredFields = false
   ;
 
@@ -698,23 +698,23 @@ class DeleteAttachmentV2Response extends $pb.GeneratedMessage {
 
   /// Header of the response
   @$pb.TagNumber(1)
-  $3.AttachmentTypeResponseHeader get header => $_getN(0);
+  $1.AttachmentTypeResponseHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.AttachmentTypeResponseHeader value) => $_setField(1, value);
+  set header($1.AttachmentTypeResponseHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.AttachmentTypeResponseHeader ensureHeader() => $_ensure(0);
+  $1.AttachmentTypeResponseHeader ensureHeader() => $_ensure(0);
 }
 
 /// List
 class ListAttachmentsV2Request extends $pb.GeneratedMessage {
   factory ListAttachmentsV2Request({
-    $3.RequestProjectHeader? header,
+    $1.RequestProjectHeader? header,
     $core.String? entityRefID,
-    $3.EntityType? entityType,
+    $1.EntityType? entityType,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -729,9 +729,9 @@ class ListAttachmentsV2Request extends $pb.GeneratedMessage {
   factory ListAttachmentsV2Request.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListAttachmentsV2Request', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
     ..aOS(3, _omitFieldNames ? '' : 'EntityRefID', protoName: 'EntityRefID')
-    ..e<$3.EntityType>(4, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $3.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $3.EntityType.valueOf, enumValues: $3.EntityType.values)
+    ..e<$1.EntityType>(4, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..hasRequiredFields = false
   ;
 
@@ -753,15 +753,15 @@ class ListAttachmentsV2Request extends $pb.GeneratedMessage {
   static ListAttachmentsV2Request? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader get header => $_getN(0);
+  $1.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestProjectHeader value) => $_setField(1, value);
+  set header($1.RequestProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(3)
   $core.String get entityRefID => $_getSZ(1);
@@ -773,9 +773,9 @@ class ListAttachmentsV2Request extends $pb.GeneratedMessage {
   void clearEntityRefID() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $3.EntityType get entityType => $_getN(2);
+  $1.EntityType get entityType => $_getN(2);
   @$pb.TagNumber(4)
-  set entityType($3.EntityType value) => $_setField(4, value);
+  set entityType($1.EntityType value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasEntityType() => $_has(2);
   @$pb.TagNumber(4)
@@ -785,7 +785,7 @@ class ListAttachmentsV2Request extends $pb.GeneratedMessage {
 class ListAttachmentsV2Response extends $pb.GeneratedMessage {
   factory ListAttachmentsV2Response({
     $core.Iterable<Attachment>? attachments,
-    $3.ResponseHeader? header,
+    $1.ResponseHeader? header,
   }) {
     final result = create();
     if (attachments != null) result.attachments.addAll(attachments);
@@ -800,7 +800,7 @@ class ListAttachmentsV2Response extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListAttachmentsV2Response', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..pc<Attachment>(1, _omitFieldNames ? '' : 'Attachments', $pb.PbFieldType.PM, protoName: 'Attachments', subBuilder: Attachment.create)
-    ..aOM<$3.ResponseHeader>(2, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.ResponseHeader.create)
+    ..aOM<$1.ResponseHeader>(2, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResponseHeader.create)
     ..hasRequiredFields = false
   ;
 
@@ -826,21 +826,21 @@ class ListAttachmentsV2Response extends $pb.GeneratedMessage {
 
   /// Header of the response
   @$pb.TagNumber(2)
-  $3.ResponseHeader get header => $_getN(1);
+  $1.ResponseHeader get header => $_getN(1);
   @$pb.TagNumber(2)
-  set header($3.ResponseHeader value) => $_setField(2, value);
+  set header($1.ResponseHeader value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasHeader() => $_has(1);
   @$pb.TagNumber(2)
   void clearHeader() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.ResponseHeader ensureHeader() => $_ensure(1);
+  $1.ResponseHeader ensureHeader() => $_ensure(1);
 }
 
 /// Share
 class ShareAttachmentV2Request extends $pb.GeneratedMessage {
   factory ShareAttachmentV2Request({
-    $3.RequestAttachmentTypeHeader? header,
+    $1.RequestAttachmentTypeHeader? header,
     $core.String? name,
     $core.String? entityRefID,
   }) {
@@ -857,7 +857,7 @@ class ShareAttachmentV2Request extends $pb.GeneratedMessage {
   factory ShareAttachmentV2Request.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ShareAttachmentV2Request', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestAttachmentTypeHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestAttachmentTypeHeader.create)
+    ..aOM<$1.RequestAttachmentTypeHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestAttachmentTypeHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'Name', protoName: 'Name')
     ..aOS(3, _omitFieldNames ? '' : 'EntityRefID', protoName: 'EntityRefID')
     ..hasRequiredFields = false
@@ -881,15 +881,15 @@ class ShareAttachmentV2Request extends $pb.GeneratedMessage {
   static ShareAttachmentV2Request? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestAttachmentTypeHeader get header => $_getN(0);
+  $1.RequestAttachmentTypeHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestAttachmentTypeHeader value) => $_setField(1, value);
+  set header($1.RequestAttachmentTypeHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestAttachmentTypeHeader ensureHeader() => $_ensure(0);
+  $1.RequestAttachmentTypeHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   $core.String get name => $_getSZ(1);
@@ -913,7 +913,7 @@ class ShareAttachmentV2Request extends $pb.GeneratedMessage {
 class ShareAttachmentV2Response extends $pb.GeneratedMessage {
   factory ShareAttachmentV2Response({
     $core.String? shareLink,
-    $3.AttachmentTypeResponseHeader? header,
+    $1.AttachmentTypeResponseHeader? header,
   }) {
     final result = create();
     if (shareLink != null) result.shareLink = shareLink;
@@ -928,7 +928,7 @@ class ShareAttachmentV2Response extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ShareAttachmentV2Response', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'ShareLink', protoName: 'ShareLink')
-    ..aOM<$3.AttachmentTypeResponseHeader>(2, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.AttachmentTypeResponseHeader.create)
+    ..aOM<$1.AttachmentTypeResponseHeader>(2, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.AttachmentTypeResponseHeader.create)
     ..hasRequiredFields = false
   ;
 
@@ -960,20 +960,20 @@ class ShareAttachmentV2Response extends $pb.GeneratedMessage {
 
   /// Header of the response
   @$pb.TagNumber(2)
-  $3.AttachmentTypeResponseHeader get header => $_getN(1);
+  $1.AttachmentTypeResponseHeader get header => $_getN(1);
   @$pb.TagNumber(2)
-  set header($3.AttachmentTypeResponseHeader value) => $_setField(2, value);
+  set header($1.AttachmentTypeResponseHeader value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasHeader() => $_has(1);
   @$pb.TagNumber(2)
   void clearHeader() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.AttachmentTypeResponseHeader ensureHeader() => $_ensure(1);
+  $1.AttachmentTypeResponseHeader ensureHeader() => $_ensure(1);
 }
 
 class DeleteAllAttachmentsV2Request extends $pb.GeneratedMessage {
   factory DeleteAllAttachmentsV2Request({
-    $3.RequestProjectHeader? header,
+    $1.RequestProjectHeader? header,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -986,7 +986,7 @@ class DeleteAllAttachmentsV2Request extends $pb.GeneratedMessage {
   factory DeleteAllAttachmentsV2Request.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteAllAttachmentsV2Request', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
     ..hasRequiredFields = false
   ;
 
@@ -1008,15 +1008,15 @@ class DeleteAllAttachmentsV2Request extends $pb.GeneratedMessage {
   static DeleteAllAttachmentsV2Request? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader get header => $_getN(0);
+  $1.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestProjectHeader value) => $_setField(1, value);
+  set header($1.RequestProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
 }
 
 class DeleteAllAttachmentsV2Response extends $pb.GeneratedMessage {

lib/attachmentV2.pbenum.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from attachmentV2.proto.
-//  source: attachmentV2.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references

lib/attachmentV2.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from attachmentV2.proto.
-//  source: attachmentV2.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,7 +16,7 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'attachmentV2.pb.dart' as $11;
+import 'attachmentV2.pb.dart' as $0;
 
 export 'attachmentV2.pb.dart';
 
@@ -30,64 +30,66 @@ class AttachmentServiceV2Client extends $grpc.Client {
     '',
   ];
 
-  static final _$upload = $grpc.ClientMethod<$11.UploadAttachmentV2Request, $11.UploadAttachmentV2Response>(
-      '/api.AttachmentServiceV2/Upload',
-      ($11.UploadAttachmentV2Request value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $11.UploadAttachmentV2Response.fromBuffer(value));
-  static final _$addLink = $grpc.ClientMethod<$11.AddLinkV2Request, $11.AddLinkV2Response>(
-      '/api.AttachmentServiceV2/AddLink',
-      ($11.AddLinkV2Request value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $11.AddLinkV2Response.fromBuffer(value));
-  static final _$download = $grpc.ClientMethod<$11.DownloadAttachmentV2Request, $11.DownloadAttachmentV2Response>(
-      '/api.AttachmentServiceV2/Download',
-      ($11.DownloadAttachmentV2Request value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $11.DownloadAttachmentV2Response.fromBuffer(value));
-  static final _$delete = $grpc.ClientMethod<$11.DeleteAttachmentV2Request, $11.DeleteAttachmentV2Response>(
-      '/api.AttachmentServiceV2/Delete',
-      ($11.DeleteAttachmentV2Request value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $11.DeleteAttachmentV2Response.fromBuffer(value));
-  static final _$list = $grpc.ClientMethod<$11.ListAttachmentsV2Request, $11.ListAttachmentsV2Response>(
-      '/api.AttachmentServiceV2/List',
-      ($11.ListAttachmentsV2Request value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $11.ListAttachmentsV2Response.fromBuffer(value));
-  static final _$share = $grpc.ClientMethod<$11.ShareAttachmentV2Request, $11.ShareAttachmentV2Response>(
-      '/api.AttachmentServiceV2/Share',
-      ($11.ShareAttachmentV2Request value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $11.ShareAttachmentV2Response.fromBuffer(value));
-  static final _$deleteAll = $grpc.ClientMethod<$11.DeleteAllAttachmentsV2Request, $11.DeleteAllAttachmentsV2Response>(
-      '/api.AttachmentServiceV2/DeleteAll',
-      ($11.DeleteAllAttachmentsV2Request value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $11.DeleteAllAttachmentsV2Response.fromBuffer(value));
-
   AttachmentServiceV2Client(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$11.UploadAttachmentV2Response> upload($11.UploadAttachmentV2Request request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.UploadAttachmentV2Response> upload($0.UploadAttachmentV2Request request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$upload, request, options: options);
   }
 
-  $grpc.ResponseFuture<$11.AddLinkV2Response> addLink($11.AddLinkV2Request request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.AddLinkV2Response> addLink($0.AddLinkV2Request request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$addLink, request, options: options);
   }
 
-  $grpc.ResponseFuture<$11.DownloadAttachmentV2Response> download($11.DownloadAttachmentV2Request request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.DownloadAttachmentV2Response> download($0.DownloadAttachmentV2Request request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$download, request, options: options);
   }
 
-  $grpc.ResponseFuture<$11.DeleteAttachmentV2Response> delete($11.DeleteAttachmentV2Request request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.DeleteAttachmentV2Response> delete($0.DeleteAttachmentV2Request request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$delete, request, options: options);
   }
 
-  $grpc.ResponseFuture<$11.ListAttachmentsV2Response> list($11.ListAttachmentsV2Request request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ListAttachmentsV2Response> list($0.ListAttachmentsV2Request request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$list, request, options: options);
   }
 
-  $grpc.ResponseFuture<$11.ShareAttachmentV2Response> share($11.ShareAttachmentV2Request request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ShareAttachmentV2Response> share($0.ShareAttachmentV2Request request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$share, request, options: options);
   }
 
-  $grpc.ResponseFuture<$11.DeleteAllAttachmentsV2Response> deleteAll($11.DeleteAllAttachmentsV2Request request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.DeleteAllAttachmentsV2Response> deleteAll($0.DeleteAllAttachmentsV2Request request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$deleteAll, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$upload = $grpc.ClientMethod<$0.UploadAttachmentV2Request, $0.UploadAttachmentV2Response>(
+      '/api.AttachmentServiceV2/Upload',
+      ($0.UploadAttachmentV2Request value) => value.writeToBuffer(),
+      $0.UploadAttachmentV2Response.fromBuffer);
+  static final _$addLink = $grpc.ClientMethod<$0.AddLinkV2Request, $0.AddLinkV2Response>(
+      '/api.AttachmentServiceV2/AddLink',
+      ($0.AddLinkV2Request value) => value.writeToBuffer(),
+      $0.AddLinkV2Response.fromBuffer);
+  static final _$download = $grpc.ClientMethod<$0.DownloadAttachmentV2Request, $0.DownloadAttachmentV2Response>(
+      '/api.AttachmentServiceV2/Download',
+      ($0.DownloadAttachmentV2Request value) => value.writeToBuffer(),
+      $0.DownloadAttachmentV2Response.fromBuffer);
+  static final _$delete = $grpc.ClientMethod<$0.DeleteAttachmentV2Request, $0.DeleteAttachmentV2Response>(
+      '/api.AttachmentServiceV2/Delete',
+      ($0.DeleteAttachmentV2Request value) => value.writeToBuffer(),
+      $0.DeleteAttachmentV2Response.fromBuffer);
+  static final _$list = $grpc.ClientMethod<$0.ListAttachmentsV2Request, $0.ListAttachmentsV2Response>(
+      '/api.AttachmentServiceV2/List',
+      ($0.ListAttachmentsV2Request value) => value.writeToBuffer(),
+      $0.ListAttachmentsV2Response.fromBuffer);
+  static final _$share = $grpc.ClientMethod<$0.ShareAttachmentV2Request, $0.ShareAttachmentV2Response>(
+      '/api.AttachmentServiceV2/Share',
+      ($0.ShareAttachmentV2Request value) => value.writeToBuffer(),
+      $0.ShareAttachmentV2Response.fromBuffer);
+  static final _$deleteAll = $grpc.ClientMethod<$0.DeleteAllAttachmentsV2Request, $0.DeleteAllAttachmentsV2Response>(
+      '/api.AttachmentServiceV2/DeleteAll',
+      ($0.DeleteAllAttachmentsV2Request value) => value.writeToBuffer(),
+      $0.DeleteAllAttachmentsV2Response.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.AttachmentServiceV2')
@@ -95,90 +97,97 @@ abstract class AttachmentServiceV2ServiceBase extends $grpc.Service {
   $core.String get $name => 'api.AttachmentServiceV2';
 
   AttachmentServiceV2ServiceBase() {
-    $addMethod($grpc.ServiceMethod<$11.UploadAttachmentV2Request, $11.UploadAttachmentV2Response>(
+    $addMethod($grpc.ServiceMethod<$0.UploadAttachmentV2Request, $0.UploadAttachmentV2Response>(
         'Upload',
         upload_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $11.UploadAttachmentV2Request.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.UploadAttachmentV2Request.fromBuffer(value),
-        ($11.UploadAttachmentV2Response value) => value.writeToBuffer()));
+        ($0.UploadAttachmentV2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$11.AddLinkV2Request, $11.AddLinkV2Response>(
+    $addMethod($grpc.ServiceMethod<$0.AddLinkV2Request, $0.AddLinkV2Response>(
         'AddLink',
         addLink_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $11.AddLinkV2Request.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.AddLinkV2Request.fromBuffer(value),
-        ($11.AddLinkV2Response value) => value.writeToBuffer()));
+        ($0.AddLinkV2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$11.DownloadAttachmentV2Request, $11.DownloadAttachmentV2Response>(
+    $addMethod($grpc.ServiceMethod<$0.DownloadAttachmentV2Request, $0.DownloadAttachmentV2Response>(
         'Download',
         download_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $11.DownloadAttachmentV2Request.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.DownloadAttachmentV2Request.fromBuffer(value),
-        ($11.DownloadAttachmentV2Response value) => value.writeToBuffer()));
+        ($0.DownloadAttachmentV2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$11.DeleteAttachmentV2Request, $11.DeleteAttachmentV2Response>(
+    $addMethod($grpc.ServiceMethod<$0.DeleteAttachmentV2Request, $0.DeleteAttachmentV2Response>(
         'Delete',
         delete_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $11.DeleteAttachmentV2Request.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.DeleteAttachmentV2Request.fromBuffer(value),
-        ($11.DeleteAttachmentV2Response value) => value.writeToBuffer()));
+        ($0.DeleteAttachmentV2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$11.ListAttachmentsV2Request, $11.ListAttachmentsV2Response>(
+    $addMethod($grpc.ServiceMethod<$0.ListAttachmentsV2Request, $0.ListAttachmentsV2Response>(
         'List',
         list_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $11.ListAttachmentsV2Request.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ListAttachmentsV2Request.fromBuffer(value),
-        ($11.ListAttachmentsV2Response value) => value.writeToBuffer()));
+        ($0.ListAttachmentsV2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$11.ShareAttachmentV2Request, $11.ShareAttachmentV2Response>(
+    $addMethod($grpc.ServiceMethod<$0.ShareAttachmentV2Request, $0.ShareAttachmentV2Response>(
         'Share',
         share_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $11.ShareAttachmentV2Request.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ShareAttachmentV2Request.fromBuffer(value),
-        ($11.ShareAttachmentV2Response value) => value.writeToBuffer()));
+        ($0.ShareAttachmentV2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$11.DeleteAllAttachmentsV2Request, $11.DeleteAllAttachmentsV2Response>(
+    $addMethod($grpc.ServiceMethod<$0.DeleteAllAttachmentsV2Request, $0.DeleteAllAttachmentsV2Response>(
         'DeleteAll',
         deleteAll_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $11.DeleteAllAttachmentsV2Request.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.DeleteAllAttachmentsV2Request.fromBuffer(value),
-        ($11.DeleteAllAttachmentsV2Response value) => value.writeToBuffer()));
+        ($0.DeleteAllAttachmentsV2Response value) => value.writeToBuffer()));
   }
 
-  $async.Future<$11.UploadAttachmentV2Response> upload_Pre($grpc.ServiceCall $call, $async.Future<$11.UploadAttachmentV2Request> $request) async {
+  $async.Future<$0.UploadAttachmentV2Response> upload_Pre($grpc.ServiceCall $call, $async.Future<$0.UploadAttachmentV2Request> $request) async {
     return upload($call, await $request);
   }
 
-  $async.Future<$11.AddLinkV2Response> addLink_Pre($grpc.ServiceCall $call, $async.Future<$11.AddLinkV2Request> $request) async {
+  $async.Future<$0.UploadAttachmentV2Response> upload($grpc.ServiceCall call, $0.UploadAttachmentV2Request request);
+
+  $async.Future<$0.AddLinkV2Response> addLink_Pre($grpc.ServiceCall $call, $async.Future<$0.AddLinkV2Request> $request) async {
     return addLink($call, await $request);
   }
 
-  $async.Future<$11.DownloadAttachmentV2Response> download_Pre($grpc.ServiceCall $call, $async.Future<$11.DownloadAttachmentV2Request> $request) async {
+  $async.Future<$0.AddLinkV2Response> addLink($grpc.ServiceCall call, $0.AddLinkV2Request request);
+
+  $async.Future<$0.DownloadAttachmentV2Response> download_Pre($grpc.ServiceCall $call, $async.Future<$0.DownloadAttachmentV2Request> $request) async {
     return download($call, await $request);
   }
 
-  $async.Future<$11.DeleteAttachmentV2Response> delete_Pre($grpc.ServiceCall $call, $async.Future<$11.DeleteAttachmentV2Request> $request) async {
+  $async.Future<$0.DownloadAttachmentV2Response> download($grpc.ServiceCall call, $0.DownloadAttachmentV2Request request);
+
+  $async.Future<$0.DeleteAttachmentV2Response> delete_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAttachmentV2Request> $request) async {
     return delete($call, await $request);
   }
 
-  $async.Future<$11.ListAttachmentsV2Response> list_Pre($grpc.ServiceCall $call, $async.Future<$11.ListAttachmentsV2Request> $request) async {
+  $async.Future<$0.DeleteAttachmentV2Response> delete($grpc.ServiceCall call, $0.DeleteAttachmentV2Request request);
+
+  $async.Future<$0.ListAttachmentsV2Response> list_Pre($grpc.ServiceCall $call, $async.Future<$0.ListAttachmentsV2Request> $request) async {
     return list($call, await $request);
   }
 
-  $async.Future<$11.ShareAttachmentV2Response> share_Pre($grpc.ServiceCall $call, $async.Future<$11.ShareAttachmentV2Request> $request) async {
+  $async.Future<$0.ListAttachmentsV2Response> list($grpc.ServiceCall call, $0.ListAttachmentsV2Request request);
+
+  $async.Future<$0.ShareAttachmentV2Response> share_Pre($grpc.ServiceCall $call, $async.Future<$0.ShareAttachmentV2Request> $request) async {
     return share($call, await $request);
   }
 
-  $async.Future<$11.DeleteAllAttachmentsV2Response> deleteAll_Pre($grpc.ServiceCall $call, $async.Future<$11.DeleteAllAttachmentsV2Request> $request) async {
+  $async.Future<$0.ShareAttachmentV2Response> share($grpc.ServiceCall call, $0.ShareAttachmentV2Request request);
+
+  $async.Future<$0.DeleteAllAttachmentsV2Response> deleteAll_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAllAttachmentsV2Request> $request) async {
     return deleteAll($call, await $request);
   }
 
-  $async.Future<$11.UploadAttachmentV2Response> upload($grpc.ServiceCall call, $11.UploadAttachmentV2Request request);
+  $async.Future<$0.DeleteAllAttachmentsV2Response> deleteAll($grpc.ServiceCall call, $0.DeleteAllAttachmentsV2Request request);
-  $async.Future<$11.AddLinkV2Response> addLink($grpc.ServiceCall call, $11.AddLinkV2Request request);
+
-  $async.Future<$11.DownloadAttachmentV2Response> download($grpc.ServiceCall call, $11.DownloadAttachmentV2Request request);
-  $async.Future<$11.DeleteAttachmentV2Response> delete($grpc.ServiceCall call, $11.DeleteAttachmentV2Request request);
-  $async.Future<$11.ListAttachmentsV2Response> list($grpc.ServiceCall call, $11.ListAttachmentsV2Request request);
-  $async.Future<$11.ShareAttachmentV2Response> share($grpc.ServiceCall call, $11.ShareAttachmentV2Request request);
-  $async.Future<$11.DeleteAllAttachmentsV2Response> deleteAll($grpc.ServiceCall call, $11.DeleteAllAttachmentsV2Request request);
 }

lib/attachmentV2.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from attachmentV2.proto.
-//  source: attachmentV2.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/base.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from base.proto.
-//  source: base.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references

lib/base.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from base.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/base.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from base.proto.
-//  source: base.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/billing.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from billing.proto.
-//  source: billing.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references

lib/billing.pbenum.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from billing.proto.
-//  source: billing.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references

lib/billing.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from billing.proto.
-//  source: billing.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,7 +16,7 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'billing.pb.dart' as $12;
+import 'billing.pb.dart' as $0;
 
 export 'billing.pb.dart';
 
@@ -30,16 +30,18 @@ class BillingServiceClient extends $grpc.Client {
     '',
   ];
 
-  static final _$generate = $grpc.ClientMethod<$12.GenerateRequest, $12.GenerateResult>(
-      '/api.BillingService/Generate',
-      ($12.GenerateRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $12.GenerateResult.fromBuffer(value));
-
   BillingServiceClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$12.GenerateResult> generate($12.GenerateRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.GenerateResult> generate($0.GenerateRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$generate, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$generate = $grpc.ClientMethod<$0.GenerateRequest, $0.GenerateResult>(
+      '/api.BillingService/Generate',
+      ($0.GenerateRequest value) => value.writeToBuffer(),
+      $0.GenerateResult.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.BillingService')
@@ -47,18 +49,19 @@ abstract class BillingServiceBase extends $grpc.Service {
   $core.String get $name => 'api.BillingService';
 
   BillingServiceBase() {
-    $addMethod($grpc.ServiceMethod<$12.GenerateRequest, $12.GenerateResult>(
+    $addMethod($grpc.ServiceMethod<$0.GenerateRequest, $0.GenerateResult>(
         'Generate',
         generate_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $12.GenerateRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.GenerateRequest.fromBuffer(value),
-        ($12.GenerateResult value) => value.writeToBuffer()));
+        ($0.GenerateResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$12.GenerateResult> generate_Pre($grpc.ServiceCall $call, $async.Future<$12.GenerateRequest> $request) async {
+  $async.Future<$0.GenerateResult> generate_Pre($grpc.ServiceCall $call, $async.Future<$0.GenerateRequest> $request) async {
     return generate($call, await $request);
   }
 
-  $async.Future<$12.GenerateResult> generate($grpc.ServiceCall call, $12.GenerateRequest request);
+  $async.Future<$0.GenerateResult> generate($grpc.ServiceCall call, $0.GenerateRequest request);
+
 }

lib/billing.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from billing.proto.
-//  source: billing.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/calendar.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from calendar.proto.
-//  source: calendar.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,15 +14,15 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
 class WorkTimeDay extends $pb.GeneratedMessage {
   factory WorkTimeDay({
-    $3.WeekDay? weekDay,
+    $1.WeekDay? weekDay,
     $core.bool? isWorkingDay,
-    $core.Iterable<$3.TimeRange>? timeRanges,
+    $core.Iterable<$1.TimeRange>? timeRanges,
   }) {
     final result = create();
     if (weekDay != null) result.weekDay = weekDay;
@@ -37,9 +37,9 @@ class WorkTimeDay extends $pb.GeneratedMessage {
   factory WorkTimeDay.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'WorkTimeDay', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..e<$3.WeekDay>(1, _omitFieldNames ? '' : 'WeekDay', $pb.PbFieldType.OE, protoName: 'WeekDay', defaultOrMaker: $3.WeekDay.WEEKDAY_UNDEFINED, valueOf: $3.WeekDay.valueOf, enumValues: $3.WeekDay.values)
+    ..e<$1.WeekDay>(1, _omitFieldNames ? '' : 'WeekDay', $pb.PbFieldType.OE, protoName: 'WeekDay', defaultOrMaker: $1.WeekDay.WEEKDAY_UNDEFINED, valueOf: $1.WeekDay.valueOf, enumValues: $1.WeekDay.values)
     ..aOB(2, _omitFieldNames ? '' : 'IsWorkingDay', protoName: 'IsWorkingDay')
-    ..pc<$3.TimeRange>(3, _omitFieldNames ? '' : 'TimeRanges', $pb.PbFieldType.PM, protoName: 'TimeRanges', subBuilder: $3.TimeRange.create)
+    ..pc<$1.TimeRange>(3, _omitFieldNames ? '' : 'TimeRanges', $pb.PbFieldType.PM, protoName: 'TimeRanges', subBuilder: $1.TimeRange.create)
     ..hasRequiredFields = false
   ;
 
@@ -62,9 +62,9 @@ class WorkTimeDay extends $pb.GeneratedMessage {
 
   /// Day of the week
   @$pb.TagNumber(1)
-  $3.WeekDay get weekDay => $_getN(0);
+  $1.WeekDay get weekDay => $_getN(0);
   @$pb.TagNumber(1)
-  set weekDay($3.WeekDay value) => $_setField(1, value);
+  set weekDay($1.WeekDay value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasWeekDay() => $_has(0);
   @$pb.TagNumber(1)
@@ -82,12 +82,12 @@ class WorkTimeDay extends $pb.GeneratedMessage {
 
   /// Opening hours definition according to filters
   @$pb.TagNumber(3)
-  $pb.PbList<$3.TimeRange> get timeRanges => $_getList(2);
+  $pb.PbList<$1.TimeRange> get timeRanges => $_getList(2);
 }
 
 class ExceptionalClosure extends $pb.GeneratedMessage {
   factory ExceptionalClosure({
-    $core.Iterable<$3.LabelByLanguage>? labels,
+    $core.Iterable<$1.LabelByLanguage>? labels,
     $core.String? startDate,
     $core.String? endDate,
     $core.bool? fullDay,
@@ -110,7 +110,7 @@ class ExceptionalClosure extends $pb.GeneratedMessage {
   factory ExceptionalClosure.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ExceptionalClosure', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$3.LabelByLanguage>(1, _omitFieldNames ? '' : 'Labels', $pb.PbFieldType.PM, protoName: 'Labels', subBuilder: $3.LabelByLanguage.create)
+    ..pc<$1.LabelByLanguage>(1, _omitFieldNames ? '' : 'Labels', $pb.PbFieldType.PM, protoName: 'Labels', subBuilder: $1.LabelByLanguage.create)
     ..aOS(2, _omitFieldNames ? '' : 'StartDate', protoName: 'StartDate')
     ..aOS(3, _omitFieldNames ? '' : 'EndDate', protoName: 'EndDate')
     ..aOB(4, _omitFieldNames ? '' : 'FullDay', protoName: 'FullDay')
@@ -138,7 +138,7 @@ class ExceptionalClosure extends $pb.GeneratedMessage {
 
   /// Name of the holiday
   @$pb.TagNumber(1)
-  $pb.PbList<$3.LabelByLanguage> get labels => $_getList(0);
+  $pb.PbList<$1.LabelByLanguage> get labels => $_getList(0);
 
   /// Start of the ExceptionalClosure, format yyyy-mm-dd //TODO are we sure about the format
   @$pb.TagNumber(2)
@@ -194,7 +194,7 @@ class ExceptionalClosure extends $pb.GeneratedMessage {
 class Calendar extends $pb.GeneratedMessage {
   factory Calendar({
     $core.String? iD,
-    $3.ResourceType? rscType,
+    $1.ResourceType? rscType,
     $core.String? resourceID,
     $core.String? name,
     $core.String? description,
@@ -219,7 +219,7 @@ class Calendar extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Calendar', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'ID', protoName: 'ID')
-    ..e<$3.ResourceType>(2, _omitFieldNames ? '' : 'RscType', $pb.PbFieldType.OE, protoName: 'RscType', defaultOrMaker: $3.ResourceType.RESOURCE_TYPE_UNKNOWN, valueOf: $3.ResourceType.valueOf, enumValues: $3.ResourceType.values)
+    ..e<$1.ResourceType>(2, _omitFieldNames ? '' : 'RscType', $pb.PbFieldType.OE, protoName: 'RscType', defaultOrMaker: $1.ResourceType.RESOURCE_TYPE_UNKNOWN, valueOf: $1.ResourceType.valueOf, enumValues: $1.ResourceType.values)
     ..aOS(3, _omitFieldNames ? '' : 'ResourceID', protoName: 'ResourceID')
     ..aOS(4, _omitFieldNames ? '' : 'Name', protoName: 'Name')
     ..aOS(5, _omitFieldNames ? '' : 'Description', protoName: 'Description')
@@ -257,9 +257,9 @@ class Calendar extends $pb.GeneratedMessage {
 
   /// Resource type on which the calendar is referenced
   @$pb.TagNumber(2)
-  $3.ResourceType get rscType => $_getN(1);
+  $1.ResourceType get rscType => $_getN(1);
   @$pb.TagNumber(2)
-  set rscType($3.ResourceType value) => $_setField(2, value);
+  set rscType($1.ResourceType value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasRscType() => $_has(1);
   @$pb.TagNumber(2)
@@ -306,7 +306,7 @@ class Calendar extends $pb.GeneratedMessage {
 /// Create a calendar at organisation level
 class CreateOnOrganisationRequest extends $pb.GeneratedMessage {
   factory CreateOnOrganisationRequest({
-    $3.RequestOrganisationHeader? header,
+    $1.RequestOrganisationHeader? header,
     $core.String? name,
     $core.String? description,
     $core.Iterable<ExceptionalClosure>? exceptionalClosures,
@@ -327,7 +327,7 @@ class CreateOnOrganisationRequest extends $pb.GeneratedMessage {
   factory CreateOnOrganisationRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateOnOrganisationRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestOrganisationHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestOrganisationHeader.create)
+    ..aOM<$1.RequestOrganisationHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestOrganisationHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'Name', protoName: 'Name')
     ..aOS(3, _omitFieldNames ? '' : 'Description', protoName: 'Description')
     ..pc<ExceptionalClosure>(4, _omitFieldNames ? '' : 'ExceptionalClosures', $pb.PbFieldType.PM, protoName: 'ExceptionalClosures', subBuilder: ExceptionalClosure.create)
@@ -353,15 +353,15 @@ class CreateOnOrganisationRequest extends $pb.GeneratedMessage {
   static CreateOnOrganisationRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestOrganisationHeader get header => $_getN(0);
+  $1.RequestOrganisationHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestOrganisationHeader value) => $_setField(1, value);
+  set header($1.RequestOrganisationHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestOrganisationHeader ensureHeader() => $_ensure(0);
+  $1.RequestOrganisationHeader ensureHeader() => $_ensure(0);
 
   /// Name of the calendar
   @$pb.TagNumber(2)
@@ -443,7 +443,7 @@ class CreateOnOrganisationResponse extends $pb.GeneratedMessage {
 /// Get a calendar at organisation level
 class GetOnOrganisationRequest extends $pb.GeneratedMessage {
   factory GetOnOrganisationRequest({
-    $3.RequestOrganisationHeader? header,
+    $1.RequestOrganisationHeader? header,
     $core.String? iD,
   }) {
     final result = create();
@@ -458,7 +458,7 @@ class GetOnOrganisationRequest extends $pb.GeneratedMessage {
   factory GetOnOrganisationRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetOnOrganisationRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestOrganisationHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestOrganisationHeader.create)
+    ..aOM<$1.RequestOrganisationHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestOrganisationHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'ID', protoName: 'ID')
     ..hasRequiredFields = false
   ;
@@ -481,15 +481,15 @@ class GetOnOrganisationRequest extends $pb.GeneratedMessage {
   static GetOnOrganisationRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestOrganisationHeader get header => $_getN(0);
+  $1.RequestOrganisationHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestOrganisationHeader value) => $_setField(1, value);
+  set header($1.RequestOrganisationHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestOrganisationHeader ensureHeader() => $_ensure(0);
+  $1.RequestOrganisationHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   $core.String get iD => $_getSZ(1);
@@ -552,7 +552,7 @@ class GetOnOrganisationResponse extends $pb.GeneratedMessage {
 /// List  a calendar at organisation level
 class ListOnOrganisationRequest extends $pb.GeneratedMessage {
   factory ListOnOrganisationRequest({
-    $3.RequestOrganisationHeader? header,
+    $1.RequestOrganisationHeader? header,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -565,7 +565,7 @@ class ListOnOrganisationRequest extends $pb.GeneratedMessage {
   factory ListOnOrganisationRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListOnOrganisationRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestOrganisationHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestOrganisationHeader.create)
+    ..aOM<$1.RequestOrganisationHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestOrganisationHeader.create)
     ..hasRequiredFields = false
   ;
 
@@ -587,15 +587,15 @@ class ListOnOrganisationRequest extends $pb.GeneratedMessage {
   static ListOnOrganisationRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestOrganisationHeader get header => $_getN(0);
+  $1.RequestOrganisationHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestOrganisationHeader value) => $_setField(1, value);
+  set header($1.RequestOrganisationHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestOrganisationHeader ensureHeader() => $_ensure(0);
+  $1.RequestOrganisationHeader ensureHeader() => $_ensure(0);
 }
 
 class ListOnOrganisationResponse extends $pb.GeneratedMessage {
@@ -641,7 +641,7 @@ class ListOnOrganisationResponse extends $pb.GeneratedMessage {
 /// Update a calendar at organisation level
 class UpdateOnOrganisationRequest extends $pb.GeneratedMessage {
   factory UpdateOnOrganisationRequest({
-    $3.RequestOrganisationHeader? header,
+    $1.RequestOrganisationHeader? header,
     $core.String? iD,
     $core.String? name,
     $core.String? description,
@@ -664,7 +664,7 @@ class UpdateOnOrganisationRequest extends $pb.GeneratedMessage {
   factory UpdateOnOrganisationRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateOnOrganisationRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestOrganisationHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestOrganisationHeader.create)
+    ..aOM<$1.RequestOrganisationHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestOrganisationHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'ID', protoName: 'ID')
     ..aOS(3, _omitFieldNames ? '' : 'Name', protoName: 'Name')
     ..aOS(4, _omitFieldNames ? '' : 'Description', protoName: 'Description')
@@ -691,15 +691,15 @@ class UpdateOnOrganisationRequest extends $pb.GeneratedMessage {
   static UpdateOnOrganisationRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestOrganisationHeader get header => $_getN(0);
+  $1.RequestOrganisationHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestOrganisationHeader value) => $_setField(1, value);
+  set header($1.RequestOrganisationHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestOrganisationHeader ensureHeader() => $_ensure(0);
+  $1.RequestOrganisationHeader ensureHeader() => $_ensure(0);
 
   /// Identifier of the calendar
   @$pb.TagNumber(2)
@@ -791,7 +791,7 @@ class UpdateOnOrganisationResponse extends $pb.GeneratedMessage {
 /// Delete a calendar at organisation level
 class DeleteOnOrganisationRequest extends $pb.GeneratedMessage {
   factory DeleteOnOrganisationRequest({
-    $3.RequestOrganisationHeader? header,
+    $1.RequestOrganisationHeader? header,
     $core.String? iD,
   }) {
     final result = create();
@@ -806,7 +806,7 @@ class DeleteOnOrganisationRequest extends $pb.GeneratedMessage {
   factory DeleteOnOrganisationRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteOnOrganisationRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestOrganisationHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestOrganisationHeader.create)
+    ..aOM<$1.RequestOrganisationHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestOrganisationHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'ID', protoName: 'ID')
     ..hasRequiredFields = false
   ;
@@ -829,15 +829,15 @@ class DeleteOnOrganisationRequest extends $pb.GeneratedMessage {
   static DeleteOnOrganisationRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestOrganisationHeader get header => $_getN(0);
+  $1.RequestOrganisationHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestOrganisationHeader value) => $_setField(1, value);
+  set header($1.RequestOrganisationHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestOrganisationHeader ensureHeader() => $_ensure(0);
+  $1.RequestOrganisationHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   $core.String get iD => $_getSZ(1);
@@ -982,132 +982,10 @@ class GetPublicHolidaysResponse extends $pb.GeneratedMessage {
   $pb.PbList<ExceptionalClosure> get holidays => $_getList(0);
 }
 
-/// Clone a calendar at organisation level
-class CloneOnOrganisationRequest extends $pb.GeneratedMessage {
-  factory CloneOnOrganisationRequest({
-    $core.String? calendarID,
-    $core.String? name,
-    $core.String? description,
-  }) {
-    final result = create();
-    if (calendarID != null) result.calendarID = calendarID;
-    if (name != null) result.name = name;
-    if (description != null) result.description = description;
-    return result;
-  }
-
-  CloneOnOrganisationRequest._();
-
-  factory CloneOnOrganisationRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory CloneOnOrganisationRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CloneOnOrganisationRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'CalendarID', protoName: 'CalendarID')
-    ..aOS(2, _omitFieldNames ? '' : 'Name', protoName: 'Name')
-    ..aOS(3, _omitFieldNames ? '' : 'Description', protoName: 'Description')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  CloneOnOrganisationRequest clone() => CloneOnOrganisationRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  CloneOnOrganisationRequest copyWith(void Function(CloneOnOrganisationRequest) updates) => super.copyWith((message) => updates(message as CloneOnOrganisationRequest)) as CloneOnOrganisationRequest;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static CloneOnOrganisationRequest create() => CloneOnOrganisationRequest._();
-  @$core.override
-  CloneOnOrganisationRequest createEmptyInstance() => create();
-  static $pb.PbList<CloneOnOrganisationRequest> createRepeated() => $pb.PbList<CloneOnOrganisationRequest>();
-  @$core.pragma('dart2js:noInline')
-  static CloneOnOrganisationRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CloneOnOrganisationRequest>(create);
-  static CloneOnOrganisationRequest? _defaultInstance;
-
-  /// Identifier of the calendar to copy
-  @$pb.TagNumber(1)
-  $core.String get calendarID => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set calendarID($core.String value) => $_setString(0, value);
-  @$pb.TagNumber(1)
-  $core.bool hasCalendarID() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearCalendarID() => $_clearField(1);
-
-  /// Name of the calendar
-  @$pb.TagNumber(2)
-  $core.String get name => $_getSZ(1);
-  @$pb.TagNumber(2)
-  set name($core.String value) => $_setString(1, value);
-  @$pb.TagNumber(2)
-  $core.bool hasName() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearName() => $_clearField(2);
-
-  /// Description of the calendar
-  @$pb.TagNumber(3)
-  $core.String get description => $_getSZ(2);
-  @$pb.TagNumber(3)
-  set description($core.String value) => $_setString(2, value);
-  @$pb.TagNumber(3)
-  $core.bool hasDescription() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearDescription() => $_clearField(3);
-}
-
-class CloneOnOrganisationResponse extends $pb.GeneratedMessage {
-  factory CloneOnOrganisationResponse({
-    Calendar? calendar,
-  }) {
-    final result = create();
-    if (calendar != null) result.calendar = calendar;
-    return result;
-  }
-
-  CloneOnOrganisationResponse._();
-
-  factory CloneOnOrganisationResponse.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory CloneOnOrganisationResponse.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CloneOnOrganisationResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<Calendar>(1, _omitFieldNames ? '' : 'Calendar', protoName: 'Calendar', subBuilder: Calendar.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  CloneOnOrganisationResponse clone() => CloneOnOrganisationResponse()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  CloneOnOrganisationResponse copyWith(void Function(CloneOnOrganisationResponse) updates) => super.copyWith((message) => updates(message as CloneOnOrganisationResponse)) as CloneOnOrganisationResponse;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static CloneOnOrganisationResponse create() => CloneOnOrganisationResponse._();
-  @$core.override
-  CloneOnOrganisationResponse createEmptyInstance() => create();
-  static $pb.PbList<CloneOnOrganisationResponse> createRepeated() => $pb.PbList<CloneOnOrganisationResponse>();
-  @$core.pragma('dart2js:noInline')
-  static CloneOnOrganisationResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CloneOnOrganisationResponse>(create);
-  static CloneOnOrganisationResponse? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  Calendar get calendar => $_getN(0);
-  @$pb.TagNumber(1)
-  set calendar(Calendar value) => $_setField(1, value);
-  @$pb.TagNumber(1)
-  $core.bool hasCalendar() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearCalendar() => $_clearField(1);
-  @$pb.TagNumber(1)
-  Calendar ensureCalendar() => $_ensure(0);
-}
-
 /// Create a calendar at site level
 class CreateOnSiteRequest extends $pb.GeneratedMessage {
   factory CreateOnSiteRequest({
-    $3.RequestSiteHeader? header,
+    $1.RequestSiteHeader? header,
     $core.String? name,
     $core.String? description,
     $core.Iterable<ExceptionalClosure>? exceptionalClosures,
@@ -1128,7 +1006,7 @@ class CreateOnSiteRequest extends $pb.GeneratedMessage {
   factory CreateOnSiteRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateOnSiteRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestSiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestSiteHeader.create)
+    ..aOM<$1.RequestSiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestSiteHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'Name', protoName: 'Name')
     ..aOS(3, _omitFieldNames ? '' : 'Description', protoName: 'Description')
     ..pc<ExceptionalClosure>(4, _omitFieldNames ? '' : 'ExceptionalClosures', $pb.PbFieldType.PM, protoName: 'ExceptionalClosures', subBuilder: ExceptionalClosure.create)
@@ -1154,15 +1032,15 @@ class CreateOnSiteRequest extends $pb.GeneratedMessage {
   static CreateOnSiteRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestSiteHeader get header => $_getN(0);
+  $1.RequestSiteHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestSiteHeader value) => $_setField(1, value);
+  set header($1.RequestSiteHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestSiteHeader ensureHeader() => $_ensure(0);
+  $1.RequestSiteHeader ensureHeader() => $_ensure(0);
 
   /// Name of the calendar
   @$pb.TagNumber(2)
@@ -1244,7 +1122,7 @@ class CreateOnSiteResponse extends $pb.GeneratedMessage {
 /// Get a calendar at site level
 class GetOnSiteRequest extends $pb.GeneratedMessage {
   factory GetOnSiteRequest({
-    $3.RequestSiteHeader? header,
+    $1.RequestSiteHeader? header,
     $core.String? iD,
   }) {
     final result = create();
@@ -1259,7 +1137,7 @@ class GetOnSiteRequest extends $pb.GeneratedMessage {
   factory GetOnSiteRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetOnSiteRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestSiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestSiteHeader.create)
+    ..aOM<$1.RequestSiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestSiteHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'ID', protoName: 'ID')
     ..hasRequiredFields = false
   ;
@@ -1282,15 +1160,15 @@ class GetOnSiteRequest extends $pb.GeneratedMessage {
   static GetOnSiteRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestSiteHeader get header => $_getN(0);
+  $1.RequestSiteHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestSiteHeader value) => $_setField(1, value);
+  set header($1.RequestSiteHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestSiteHeader ensureHeader() => $_ensure(0);
+  $1.RequestSiteHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   $core.String get iD => $_getSZ(1);
@@ -1353,7 +1231,7 @@ class GetOnSiteResponse extends $pb.GeneratedMessage {
 /// List  a calendar at site level
 class ListOnSiteRequest extends $pb.GeneratedMessage {
   factory ListOnSiteRequest({
-    $3.RequestSiteHeader? header,
+    $1.RequestSiteHeader? header,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -1366,7 +1244,7 @@ class ListOnSiteRequest extends $pb.GeneratedMessage {
   factory ListOnSiteRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListOnSiteRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestSiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestSiteHeader.create)
+    ..aOM<$1.RequestSiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestSiteHeader.create)
     ..hasRequiredFields = false
   ;
 
@@ -1388,15 +1266,15 @@ class ListOnSiteRequest extends $pb.GeneratedMessage {
   static ListOnSiteRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestSiteHeader get header => $_getN(0);
+  $1.RequestSiteHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestSiteHeader value) => $_setField(1, value);
+  set header($1.RequestSiteHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestSiteHeader ensureHeader() => $_ensure(0);
+  $1.RequestSiteHeader ensureHeader() => $_ensure(0);
 }
 
 class ListOnSiteResponse extends $pb.GeneratedMessage {
@@ -1442,7 +1320,7 @@ class ListOnSiteResponse extends $pb.GeneratedMessage {
 /// Update a calendar at site level
 class UpdateOnSiteRequest extends $pb.GeneratedMessage {
   factory UpdateOnSiteRequest({
-    $3.RequestSiteHeader? header,
+    $1.RequestSiteHeader? header,
     $core.String? iD,
     $core.String? name,
     $core.String? description,
@@ -1465,7 +1343,7 @@ class UpdateOnSiteRequest extends $pb.GeneratedMessage {
   factory UpdateOnSiteRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateOnSiteRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestSiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestSiteHeader.create)
+    ..aOM<$1.RequestSiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestSiteHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'ID', protoName: 'ID')
     ..aOS(3, _omitFieldNames ? '' : 'Name', protoName: 'Name')
     ..aOS(4, _omitFieldNames ? '' : 'Description', protoName: 'Description')
@@ -1492,15 +1370,15 @@ class UpdateOnSiteRequest extends $pb.GeneratedMessage {
   static UpdateOnSiteRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestSiteHeader get header => $_getN(0);
+  $1.RequestSiteHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestSiteHeader value) => $_setField(1, value);
+  set header($1.RequestSiteHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestSiteHeader ensureHeader() => $_ensure(0);
+  $1.RequestSiteHeader ensureHeader() => $_ensure(0);
 
   /// Identifier of the calendar
   @$pb.TagNumber(2)
@@ -1592,7 +1470,7 @@ class UpdateOnSiteResponse extends $pb.GeneratedMessage {
 /// Delete a calendar at site level
 class DeleteOnSiteRequest extends $pb.GeneratedMessage {
   factory DeleteOnSiteRequest({
-    $3.RequestSiteHeader? header,
+    $1.RequestSiteHeader? header,
     $core.String? iD,
   }) {
     final result = create();
@@ -1607,7 +1485,7 @@ class DeleteOnSiteRequest extends $pb.GeneratedMessage {
   factory DeleteOnSiteRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteOnSiteRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestSiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestSiteHeader.create)
+    ..aOM<$1.RequestSiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestSiteHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'ID', protoName: 'ID')
     ..hasRequiredFields = false
   ;
@@ -1630,15 +1508,15 @@ class DeleteOnSiteRequest extends $pb.GeneratedMessage {
   static DeleteOnSiteRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestSiteHeader get header => $_getN(0);
+  $1.RequestSiteHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestSiteHeader value) => $_setField(1, value);
+  set header($1.RequestSiteHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestSiteHeader ensureHeader() => $_ensure(0);
+  $1.RequestSiteHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   $core.String get iD => $_getSZ(1);
@@ -1680,128 +1558,6 @@ class DeleteOnSiteResponse extends $pb.GeneratedMessage {
   static DeleteOnSiteResponse? _defaultInstance;
 }
 
-/// Clone a calendar at site level
-class CloneOnSiteRequest extends $pb.GeneratedMessage {
-  factory CloneOnSiteRequest({
-    $core.String? calendarID,
-    $core.String? name,
-    $core.String? description,
-  }) {
-    final result = create();
-    if (calendarID != null) result.calendarID = calendarID;
-    if (name != null) result.name = name;
-    if (description != null) result.description = description;
-    return result;
-  }
-
-  CloneOnSiteRequest._();
-
-  factory CloneOnSiteRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory CloneOnSiteRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CloneOnSiteRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'CalendarID', protoName: 'CalendarID')
-    ..aOS(2, _omitFieldNames ? '' : 'Name', protoName: 'Name')
-    ..aOS(3, _omitFieldNames ? '' : 'Description', protoName: 'Description')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  CloneOnSiteRequest clone() => CloneOnSiteRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  CloneOnSiteRequest copyWith(void Function(CloneOnSiteRequest) updates) => super.copyWith((message) => updates(message as CloneOnSiteRequest)) as CloneOnSiteRequest;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static CloneOnSiteRequest create() => CloneOnSiteRequest._();
-  @$core.override
-  CloneOnSiteRequest createEmptyInstance() => create();
-  static $pb.PbList<CloneOnSiteRequest> createRepeated() => $pb.PbList<CloneOnSiteRequest>();
-  @$core.pragma('dart2js:noInline')
-  static CloneOnSiteRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CloneOnSiteRequest>(create);
-  static CloneOnSiteRequest? _defaultInstance;
-
-  /// Identifier of the calendar to copy
-  @$pb.TagNumber(1)
-  $core.String get calendarID => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set calendarID($core.String value) => $_setString(0, value);
-  @$pb.TagNumber(1)
-  $core.bool hasCalendarID() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearCalendarID() => $_clearField(1);
-
-  /// Name of the calendar
-  @$pb.TagNumber(2)
-  $core.String get name => $_getSZ(1);
-  @$pb.TagNumber(2)
-  set name($core.String value) => $_setString(1, value);
-  @$pb.TagNumber(2)
-  $core.bool hasName() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearName() => $_clearField(2);
-
-  /// Description of the calendar
-  @$pb.TagNumber(3)
-  $core.String get description => $_getSZ(2);
-  @$pb.TagNumber(3)
-  set description($core.String value) => $_setString(2, value);
-  @$pb.TagNumber(3)
-  $core.bool hasDescription() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearDescription() => $_clearField(3);
-}
-
-class CloneOnSiteResponse extends $pb.GeneratedMessage {
-  factory CloneOnSiteResponse({
-    Calendar? calendar,
-  }) {
-    final result = create();
-    if (calendar != null) result.calendar = calendar;
-    return result;
-  }
-
-  CloneOnSiteResponse._();
-
-  factory CloneOnSiteResponse.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory CloneOnSiteResponse.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CloneOnSiteResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<Calendar>(1, _omitFieldNames ? '' : 'Calendar', protoName: 'Calendar', subBuilder: Calendar.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  CloneOnSiteResponse clone() => CloneOnSiteResponse()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  CloneOnSiteResponse copyWith(void Function(CloneOnSiteResponse) updates) => super.copyWith((message) => updates(message as CloneOnSiteResponse)) as CloneOnSiteResponse;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static CloneOnSiteResponse create() => CloneOnSiteResponse._();
-  @$core.override
-  CloneOnSiteResponse createEmptyInstance() => create();
-  static $pb.PbList<CloneOnSiteResponse> createRepeated() => $pb.PbList<CloneOnSiteResponse>();
-  @$core.pragma('dart2js:noInline')
-  static CloneOnSiteResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CloneOnSiteResponse>(create);
-  static CloneOnSiteResponse? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  Calendar get calendar => $_getN(0);
-  @$pb.TagNumber(1)
-  set calendar(Calendar value) => $_setField(1, value);
-  @$pb.TagNumber(1)
-  $core.bool hasCalendar() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearCalendar() => $_clearField(1);
-  @$pb.TagNumber(1)
-  Calendar ensureCalendar() => $_ensure(0);
-}
-
 
 const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
 const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');

lib/calendar.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from calendar.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/calendar.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from calendar.proto.
-//  source: calendar.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,7 +16,7 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'calendar.pb.dart' as $13;
+import 'calendar.pb.dart' as $0;
 
 export 'calendar.pb.dart';
 
@@ -30,96 +30,98 @@ class CalendarServiceClient extends $grpc.Client {
     '',
   ];
 
-  static final _$createOnOrganisation = $grpc.ClientMethod<$13.CreateOnOrganisationRequest, $13.CreateOnOrganisationResponse>(
-      '/api.CalendarService/CreateOnOrganisation',
-      ($13.CreateOnOrganisationRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $13.CreateOnOrganisationResponse.fromBuffer(value));
-  static final _$getOnOrganisation = $grpc.ClientMethod<$13.GetOnOrganisationRequest, $13.GetOnOrganisationResponse>(
-      '/api.CalendarService/GetOnOrganisation',
-      ($13.GetOnOrganisationRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $13.GetOnOrganisationResponse.fromBuffer(value));
-  static final _$listOnOrganisation = $grpc.ClientMethod<$13.ListOnOrganisationRequest, $13.ListOnOrganisationResponse>(
-      '/api.CalendarService/ListOnOrganisation',
-      ($13.ListOnOrganisationRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $13.ListOnOrganisationResponse.fromBuffer(value));
-  static final _$updateOnOrganisation = $grpc.ClientMethod<$13.UpdateOnOrganisationRequest, $13.UpdateOnOrganisationResponse>(
-      '/api.CalendarService/UpdateOnOrganisation',
-      ($13.UpdateOnOrganisationRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $13.UpdateOnOrganisationResponse.fromBuffer(value));
-  static final _$deleteOnOrganisation = $grpc.ClientMethod<$13.DeleteOnOrganisationRequest, $13.DeleteOnOrganisationResponse>(
-      '/api.CalendarService/DeleteOnOrganisation',
-      ($13.DeleteOnOrganisationRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $13.DeleteOnOrganisationResponse.fromBuffer(value));
-  static final _$createOnSite = $grpc.ClientMethod<$13.CreateOnSiteRequest, $13.CreateOnSiteResponse>(
-      '/api.CalendarService/CreateOnSite',
-      ($13.CreateOnSiteRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $13.CreateOnSiteResponse.fromBuffer(value));
-  static final _$getOnSite = $grpc.ClientMethod<$13.GetOnSiteRequest, $13.GetOnSiteResponse>(
-      '/api.CalendarService/GetOnSite',
-      ($13.GetOnSiteRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $13.GetOnSiteResponse.fromBuffer(value));
-  static final _$listOnSite = $grpc.ClientMethod<$13.ListOnSiteRequest, $13.ListOnSiteResponse>(
-      '/api.CalendarService/ListOnSite',
-      ($13.ListOnSiteRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $13.ListOnSiteResponse.fromBuffer(value));
-  static final _$updateOnSite = $grpc.ClientMethod<$13.UpdateOnSiteRequest, $13.UpdateOnSiteResponse>(
-      '/api.CalendarService/UpdateOnSite',
-      ($13.UpdateOnSiteRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $13.UpdateOnSiteResponse.fromBuffer(value));
-  static final _$deleteOnSite = $grpc.ClientMethod<$13.DeleteOnSiteRequest, $13.DeleteOnSiteResponse>(
-      '/api.CalendarService/DeleteOnSite',
-      ($13.DeleteOnSiteRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $13.DeleteOnSiteResponse.fromBuffer(value));
-  static final _$getPublicHolidays = $grpc.ClientMethod<$13.GetPublicHolidaysRequest, $13.GetPublicHolidaysResponse>(
-      '/api.CalendarService/GetPublicHolidays',
-      ($13.GetPublicHolidaysRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $13.GetPublicHolidaysResponse.fromBuffer(value));
-
   CalendarServiceClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$13.CreateOnOrganisationResponse> createOnOrganisation($13.CreateOnOrganisationRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.CreateOnOrganisationResponse> createOnOrganisation($0.CreateOnOrganisationRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$createOnOrganisation, request, options: options);
   }
 
-  $grpc.ResponseFuture<$13.GetOnOrganisationResponse> getOnOrganisation($13.GetOnOrganisationRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.GetOnOrganisationResponse> getOnOrganisation($0.GetOnOrganisationRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$getOnOrganisation, request, options: options);
   }
 
-  $grpc.ResponseFuture<$13.ListOnOrganisationResponse> listOnOrganisation($13.ListOnOrganisationRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ListOnOrganisationResponse> listOnOrganisation($0.ListOnOrganisationRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$listOnOrganisation, request, options: options);
   }
 
-  $grpc.ResponseFuture<$13.UpdateOnOrganisationResponse> updateOnOrganisation($13.UpdateOnOrganisationRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.UpdateOnOrganisationResponse> updateOnOrganisation($0.UpdateOnOrganisationRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$updateOnOrganisation, request, options: options);
   }
 
-  $grpc.ResponseFuture<$13.DeleteOnOrganisationResponse> deleteOnOrganisation($13.DeleteOnOrganisationRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.DeleteOnOrganisationResponse> deleteOnOrganisation($0.DeleteOnOrganisationRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$deleteOnOrganisation, request, options: options);
   }
 
-  $grpc.ResponseFuture<$13.CreateOnSiteResponse> createOnSite($13.CreateOnSiteRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.CreateOnSiteResponse> createOnSite($0.CreateOnSiteRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$createOnSite, request, options: options);
   }
 
-  $grpc.ResponseFuture<$13.GetOnSiteResponse> getOnSite($13.GetOnSiteRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.GetOnSiteResponse> getOnSite($0.GetOnSiteRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$getOnSite, request, options: options);
   }
 
-  $grpc.ResponseFuture<$13.ListOnSiteResponse> listOnSite($13.ListOnSiteRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ListOnSiteResponse> listOnSite($0.ListOnSiteRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$listOnSite, request, options: options);
   }
 
-  $grpc.ResponseFuture<$13.UpdateOnSiteResponse> updateOnSite($13.UpdateOnSiteRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.UpdateOnSiteResponse> updateOnSite($0.UpdateOnSiteRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$updateOnSite, request, options: options);
   }
 
-  $grpc.ResponseFuture<$13.DeleteOnSiteResponse> deleteOnSite($13.DeleteOnSiteRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.DeleteOnSiteResponse> deleteOnSite($0.DeleteOnSiteRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$deleteOnSite, request, options: options);
   }
 
-  $grpc.ResponseFuture<$13.GetPublicHolidaysResponse> getPublicHolidays($13.GetPublicHolidaysRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.GetPublicHolidaysResponse> getPublicHolidays($0.GetPublicHolidaysRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$getPublicHolidays, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$createOnOrganisation = $grpc.ClientMethod<$0.CreateOnOrganisationRequest, $0.CreateOnOrganisationResponse>(
+      '/api.CalendarService/CreateOnOrganisation',
+      ($0.CreateOnOrganisationRequest value) => value.writeToBuffer(),
+      $0.CreateOnOrganisationResponse.fromBuffer);
+  static final _$getOnOrganisation = $grpc.ClientMethod<$0.GetOnOrganisationRequest, $0.GetOnOrganisationResponse>(
+      '/api.CalendarService/GetOnOrganisation',
+      ($0.GetOnOrganisationRequest value) => value.writeToBuffer(),
+      $0.GetOnOrganisationResponse.fromBuffer);
+  static final _$listOnOrganisation = $grpc.ClientMethod<$0.ListOnOrganisationRequest, $0.ListOnOrganisationResponse>(
+      '/api.CalendarService/ListOnOrganisation',
+      ($0.ListOnOrganisationRequest value) => value.writeToBuffer(),
+      $0.ListOnOrganisationResponse.fromBuffer);
+  static final _$updateOnOrganisation = $grpc.ClientMethod<$0.UpdateOnOrganisationRequest, $0.UpdateOnOrganisationResponse>(
+      '/api.CalendarService/UpdateOnOrganisation',
+      ($0.UpdateOnOrganisationRequest value) => value.writeToBuffer(),
+      $0.UpdateOnOrganisationResponse.fromBuffer);
+  static final _$deleteOnOrganisation = $grpc.ClientMethod<$0.DeleteOnOrganisationRequest, $0.DeleteOnOrganisationResponse>(
+      '/api.CalendarService/DeleteOnOrganisation',
+      ($0.DeleteOnOrganisationRequest value) => value.writeToBuffer(),
+      $0.DeleteOnOrganisationResponse.fromBuffer);
+  static final _$createOnSite = $grpc.ClientMethod<$0.CreateOnSiteRequest, $0.CreateOnSiteResponse>(
+      '/api.CalendarService/CreateOnSite',
+      ($0.CreateOnSiteRequest value) => value.writeToBuffer(),
+      $0.CreateOnSiteResponse.fromBuffer);
+  static final _$getOnSite = $grpc.ClientMethod<$0.GetOnSiteRequest, $0.GetOnSiteResponse>(
+      '/api.CalendarService/GetOnSite',
+      ($0.GetOnSiteRequest value) => value.writeToBuffer(),
+      $0.GetOnSiteResponse.fromBuffer);
+  static final _$listOnSite = $grpc.ClientMethod<$0.ListOnSiteRequest, $0.ListOnSiteResponse>(
+      '/api.CalendarService/ListOnSite',
+      ($0.ListOnSiteRequest value) => value.writeToBuffer(),
+      $0.ListOnSiteResponse.fromBuffer);
+  static final _$updateOnSite = $grpc.ClientMethod<$0.UpdateOnSiteRequest, $0.UpdateOnSiteResponse>(
+      '/api.CalendarService/UpdateOnSite',
+      ($0.UpdateOnSiteRequest value) => value.writeToBuffer(),
+      $0.UpdateOnSiteResponse.fromBuffer);
+  static final _$deleteOnSite = $grpc.ClientMethod<$0.DeleteOnSiteRequest, $0.DeleteOnSiteResponse>(
+      '/api.CalendarService/DeleteOnSite',
+      ($0.DeleteOnSiteRequest value) => value.writeToBuffer(),
+      $0.DeleteOnSiteResponse.fromBuffer);
+  static final _$getPublicHolidays = $grpc.ClientMethod<$0.GetPublicHolidaysRequest, $0.GetPublicHolidaysResponse>(
+      '/api.CalendarService/GetPublicHolidays',
+      ($0.GetPublicHolidaysRequest value) => value.writeToBuffer(),
+      $0.GetPublicHolidaysResponse.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.CalendarService')
@@ -127,138 +129,149 @@ abstract class CalendarServiceBase extends $grpc.Service {
   $core.String get $name => 'api.CalendarService';
 
   CalendarServiceBase() {
-    $addMethod($grpc.ServiceMethod<$13.CreateOnOrganisationRequest, $13.CreateOnOrganisationResponse>(
+    $addMethod($grpc.ServiceMethod<$0.CreateOnOrganisationRequest, $0.CreateOnOrganisationResponse>(
         'CreateOnOrganisation',
         createOnOrganisation_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $13.CreateOnOrganisationRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.CreateOnOrganisationRequest.fromBuffer(value),
-        ($13.CreateOnOrganisationResponse value) => value.writeToBuffer()));
+        ($0.CreateOnOrganisationResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$13.GetOnOrganisationRequest, $13.GetOnOrganisationResponse>(
+    $addMethod($grpc.ServiceMethod<$0.GetOnOrganisationRequest, $0.GetOnOrganisationResponse>(
         'GetOnOrganisation',
         getOnOrganisation_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $13.GetOnOrganisationRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.GetOnOrganisationRequest.fromBuffer(value),
-        ($13.GetOnOrganisationResponse value) => value.writeToBuffer()));
+        ($0.GetOnOrganisationResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$13.ListOnOrganisationRequest, $13.ListOnOrganisationResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ListOnOrganisationRequest, $0.ListOnOrganisationResponse>(
         'ListOnOrganisation',
         listOnOrganisation_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $13.ListOnOrganisationRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ListOnOrganisationRequest.fromBuffer(value),
-        ($13.ListOnOrganisationResponse value) => value.writeToBuffer()));
+        ($0.ListOnOrganisationResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$13.UpdateOnOrganisationRequest, $13.UpdateOnOrganisationResponse>(
+    $addMethod($grpc.ServiceMethod<$0.UpdateOnOrganisationRequest, $0.UpdateOnOrganisationResponse>(
         'UpdateOnOrganisation',
         updateOnOrganisation_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $13.UpdateOnOrganisationRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.UpdateOnOrganisationRequest.fromBuffer(value),
-        ($13.UpdateOnOrganisationResponse value) => value.writeToBuffer()));
+        ($0.UpdateOnOrganisationResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$13.DeleteOnOrganisationRequest, $13.DeleteOnOrganisationResponse>(
+    $addMethod($grpc.ServiceMethod<$0.DeleteOnOrganisationRequest, $0.DeleteOnOrganisationResponse>(
         'DeleteOnOrganisation',
         deleteOnOrganisation_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $13.DeleteOnOrganisationRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.DeleteOnOrganisationRequest.fromBuffer(value),
-        ($13.DeleteOnOrganisationResponse value) => value.writeToBuffer()));
+        ($0.DeleteOnOrganisationResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$13.CreateOnSiteRequest, $13.CreateOnSiteResponse>(
+    $addMethod($grpc.ServiceMethod<$0.CreateOnSiteRequest, $0.CreateOnSiteResponse>(
         'CreateOnSite',
         createOnSite_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $13.CreateOnSiteRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.CreateOnSiteRequest.fromBuffer(value),
-        ($13.CreateOnSiteResponse value) => value.writeToBuffer()));
+        ($0.CreateOnSiteResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$13.GetOnSiteRequest, $13.GetOnSiteResponse>(
+    $addMethod($grpc.ServiceMethod<$0.GetOnSiteRequest, $0.GetOnSiteResponse>(
         'GetOnSite',
         getOnSite_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $13.GetOnSiteRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.GetOnSiteRequest.fromBuffer(value),
-        ($13.GetOnSiteResponse value) => value.writeToBuffer()));
+        ($0.GetOnSiteResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$13.ListOnSiteRequest, $13.ListOnSiteResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ListOnSiteRequest, $0.ListOnSiteResponse>(
         'ListOnSite',
         listOnSite_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $13.ListOnSiteRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ListOnSiteRequest.fromBuffer(value),
-        ($13.ListOnSiteResponse value) => value.writeToBuffer()));
+        ($0.ListOnSiteResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$13.UpdateOnSiteRequest, $13.UpdateOnSiteResponse>(
+    $addMethod($grpc.ServiceMethod<$0.UpdateOnSiteRequest, $0.UpdateOnSiteResponse>(
         'UpdateOnSite',
         updateOnSite_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $13.UpdateOnSiteRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.UpdateOnSiteRequest.fromBuffer(value),
-        ($13.UpdateOnSiteResponse value) => value.writeToBuffer()));
+        ($0.UpdateOnSiteResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$13.DeleteOnSiteRequest, $13.DeleteOnSiteResponse>(
+    $addMethod($grpc.ServiceMethod<$0.DeleteOnSiteRequest, $0.DeleteOnSiteResponse>(
         'DeleteOnSite',
         deleteOnSite_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $13.DeleteOnSiteRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.DeleteOnSiteRequest.fromBuffer(value),
-        ($13.DeleteOnSiteResponse value) => value.writeToBuffer()));
+        ($0.DeleteOnSiteResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$13.GetPublicHolidaysRequest, $13.GetPublicHolidaysResponse>(
+    $addMethod($grpc.ServiceMethod<$0.GetPublicHolidaysRequest, $0.GetPublicHolidaysResponse>(
         'GetPublicHolidays',
         getPublicHolidays_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $13.GetPublicHolidaysRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.GetPublicHolidaysRequest.fromBuffer(value),
-        ($13.GetPublicHolidaysResponse value) => value.writeToBuffer()));
+        ($0.GetPublicHolidaysResponse value) => value.writeToBuffer()));
   }
 
-  $async.Future<$13.CreateOnOrganisationResponse> createOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$13.CreateOnOrganisationRequest> $request) async {
+  $async.Future<$0.CreateOnOrganisationResponse> createOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$0.CreateOnOrganisationRequest> $request) async {
     return createOnOrganisation($call, await $request);
   }
 
-  $async.Future<$13.GetOnOrganisationResponse> getOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$13.GetOnOrganisationRequest> $request) async {
+  $async.Future<$0.CreateOnOrganisationResponse> createOnOrganisation($grpc.ServiceCall call, $0.CreateOnOrganisationRequest request);
+
+  $async.Future<$0.GetOnOrganisationResponse> getOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$0.GetOnOrganisationRequest> $request) async {
     return getOnOrganisation($call, await $request);
   }
 
-  $async.Future<$13.ListOnOrganisationResponse> listOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$13.ListOnOrganisationRequest> $request) async {
+  $async.Future<$0.GetOnOrganisationResponse> getOnOrganisation($grpc.ServiceCall call, $0.GetOnOrganisationRequest request);
+
+  $async.Future<$0.ListOnOrganisationResponse> listOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$0.ListOnOrganisationRequest> $request) async {
     return listOnOrganisation($call, await $request);
   }
 
-  $async.Future<$13.UpdateOnOrganisationResponse> updateOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$13.UpdateOnOrganisationRequest> $request) async {
+  $async.Future<$0.ListOnOrganisationResponse> listOnOrganisation($grpc.ServiceCall call, $0.ListOnOrganisationRequest request);
+
+  $async.Future<$0.UpdateOnOrganisationResponse> updateOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$0.UpdateOnOrganisationRequest> $request) async {
     return updateOnOrganisation($call, await $request);
   }
 
-  $async.Future<$13.DeleteOnOrganisationResponse> deleteOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$13.DeleteOnOrganisationRequest> $request) async {
+  $async.Future<$0.UpdateOnOrganisationResponse> updateOnOrganisation($grpc.ServiceCall call, $0.UpdateOnOrganisationRequest request);
+
+  $async.Future<$0.DeleteOnOrganisationResponse> deleteOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteOnOrganisationRequest> $request) async {
     return deleteOnOrganisation($call, await $request);
   }
 
-  $async.Future<$13.CreateOnSiteResponse> createOnSite_Pre($grpc.ServiceCall $call, $async.Future<$13.CreateOnSiteRequest> $request) async {
+  $async.Future<$0.DeleteOnOrganisationResponse> deleteOnOrganisation($grpc.ServiceCall call, $0.DeleteOnOrganisationRequest request);
+
+  $async.Future<$0.CreateOnSiteResponse> createOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.CreateOnSiteRequest> $request) async {
     return createOnSite($call, await $request);
   }
 
-  $async.Future<$13.GetOnSiteResponse> getOnSite_Pre($grpc.ServiceCall $call, $async.Future<$13.GetOnSiteRequest> $request) async {
+  $async.Future<$0.CreateOnSiteResponse> createOnSite($grpc.ServiceCall call, $0.CreateOnSiteRequest request);
+
+  $async.Future<$0.GetOnSiteResponse> getOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.GetOnSiteRequest> $request) async {
     return getOnSite($call, await $request);
   }
 
-  $async.Future<$13.ListOnSiteResponse> listOnSite_Pre($grpc.ServiceCall $call, $async.Future<$13.ListOnSiteRequest> $request) async {
+  $async.Future<$0.GetOnSiteResponse> getOnSite($grpc.ServiceCall call, $0.GetOnSiteRequest request);
+
+  $async.Future<$0.ListOnSiteResponse> listOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.ListOnSiteRequest> $request) async {
     return listOnSite($call, await $request);
   }
 
-  $async.Future<$13.UpdateOnSiteResponse> updateOnSite_Pre($grpc.ServiceCall $call, $async.Future<$13.UpdateOnSiteRequest> $request) async {
+  $async.Future<$0.ListOnSiteResponse> listOnSite($grpc.ServiceCall call, $0.ListOnSiteRequest request);
+
+  $async.Future<$0.UpdateOnSiteResponse> updateOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.UpdateOnSiteRequest> $request) async {
     return updateOnSite($call, await $request);
   }
 
-  $async.Future<$13.DeleteOnSiteResponse> deleteOnSite_Pre($grpc.ServiceCall $call, $async.Future<$13.DeleteOnSiteRequest> $request) async {
+  $async.Future<$0.UpdateOnSiteResponse> updateOnSite($grpc.ServiceCall call, $0.UpdateOnSiteRequest request);
+
+  $async.Future<$0.DeleteOnSiteResponse> deleteOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteOnSiteRequest> $request) async {
     return deleteOnSite($call, await $request);
   }
 
-  $async.Future<$13.GetPublicHolidaysResponse> getPublicHolidays_Pre($grpc.ServiceCall $call, $async.Future<$13.GetPublicHolidaysRequest> $request) async {
+  $async.Future<$0.DeleteOnSiteResponse> deleteOnSite($grpc.ServiceCall call, $0.DeleteOnSiteRequest request);
+
+  $async.Future<$0.GetPublicHolidaysResponse> getPublicHolidays_Pre($grpc.ServiceCall $call, $async.Future<$0.GetPublicHolidaysRequest> $request) async {
     return getPublicHolidays($call, await $request);
   }
 
-  $async.Future<$13.CreateOnOrganisationResponse> createOnOrganisation($grpc.ServiceCall call, $13.CreateOnOrganisationRequest request);
+  $async.Future<$0.GetPublicHolidaysResponse> getPublicHolidays($grpc.ServiceCall call, $0.GetPublicHolidaysRequest request);
-  $async.Future<$13.GetOnOrganisationResponse> getOnOrganisation($grpc.ServiceCall call, $13.GetOnOrganisationRequest request);
+
-  $async.Future<$13.ListOnOrganisationResponse> listOnOrganisation($grpc.ServiceCall call, $13.ListOnOrganisationRequest request);
-  $async.Future<$13.UpdateOnOrganisationResponse> updateOnOrganisation($grpc.ServiceCall call, $13.UpdateOnOrganisationRequest request);
-  $async.Future<$13.DeleteOnOrganisationResponse> deleteOnOrganisation($grpc.ServiceCall call, $13.DeleteOnOrganisationRequest request);
-  $async.Future<$13.CreateOnSiteResponse> createOnSite($grpc.ServiceCall call, $13.CreateOnSiteRequest request);
-  $async.Future<$13.GetOnSiteResponse> getOnSite($grpc.ServiceCall call, $13.GetOnSiteRequest request);
-  $async.Future<$13.ListOnSiteResponse> listOnSite($grpc.ServiceCall call, $13.ListOnSiteRequest request);
-  $async.Future<$13.UpdateOnSiteResponse> updateOnSite($grpc.ServiceCall call, $13.UpdateOnSiteRequest request);
-  $async.Future<$13.DeleteOnSiteResponse> deleteOnSite($grpc.ServiceCall call, $13.DeleteOnSiteRequest request);
-  $async.Future<$13.GetPublicHolidaysResponse> getPublicHolidays($grpc.ServiceCall call, $13.GetPublicHolidaysRequest request);
 }

lib/calendar.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from calendar.proto.
-//  source: calendar.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -61,8 +61,8 @@ const Calendar$json = {
     {'1': 'ID', '3': 1, '4': 1, '5': 9, '8': {}, '10': 'ID'},
     {'1': 'RscType', '3': 2, '4': 1, '5': 14, '6': '.api.ResourceType', '10': 'RscType'},
     {'1': 'ResourceID', '3': 3, '4': 1, '5': 9, '10': 'ResourceID'},
-    {'1': 'Name', '3': 4, '4': 1, '5': 9, '10': 'Name'},
+    {'1': 'Name', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'Name'},
-    {'1': 'Description', '3': 5, '4': 1, '5': 9, '8': {}, '10': 'Description'},
+    {'1': 'Description', '3': 5, '4': 1, '5': 9, '10': 'Description'},
     {'1': 'ExceptionalClosures', '3': 6, '4': 3, '5': 11, '6': '.api.ExceptionalClosure', '10': 'ExceptionalClosures'},
     {'1': 'WorkTimeDays', '3': 7, '4': 3, '5': 11, '6': '.api.WorkTimeDay', '8': {}, '10': 'WorkTimeDays'},
   ],
@@ -72,7 +72,7 @@ const Calendar$json = {
 final $typed_data.Uint8List calendarDescriptor = $convert.base64Decode(
     'CghDYWxlbmRhchIXCgJJRBgBIAEoCUIH+kIEcgIQAVICSUQSKwoHUnNjVHlwZRgCIAEoDjIRLm'
     'FwaS5SZXNvdXJjZVR5cGVSB1JzY1R5cGUSHgoKUmVzb3VyY2VJRBgDIAEoCVIKUmVzb3VyY2VJ'
-    'RBISCgROYW1lGAQgASgJUgROYW1lEikKC0Rlc2NyaXB0aW9uGAUgASgJQgf6QgRyAhABUgtEZX'
+    'RBIbCgROYW1lGAQgASgJQgf6QgRyAhABUgROYW1lEiAKC0Rlc2NyaXB0aW9uGAUgASgJUgtEZX'
     'NjcmlwdGlvbhJJChNFeGNlcHRpb25hbENsb3N1cmVzGAYgAygLMhcuYXBpLkV4Y2VwdGlvbmFs'
     'Q2xvc3VyZVITRXhjZXB0aW9uYWxDbG9zdXJlcxJBCgxXb3JrVGltZURheXMYByADKAsyEC5hcG'
     'kuV29ya1RpbWVEYXlCC+rBGAdXZWVrRGF5UgxXb3JrVGltZURheXM=');
@@ -82,8 +82,8 @@ const CreateOnOrganisationRequest$json = {
   '1': 'CreateOnOrganisationRequest',
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestOrganisationHeader', '8': {}, '10': 'Header'},
-    {'1': 'Name', '3': 2, '4': 1, '5': 9, '10': 'Name'},
+    {'1': 'Name', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'Name'},
-    {'1': 'Description', '3': 3, '4': 1, '5': 9, '8': {}, '10': 'Description'},
+    {'1': 'Description', '3': 3, '4': 1, '5': 9, '10': 'Description'},
     {'1': 'ExceptionalClosures', '3': 4, '4': 3, '5': 11, '6': '.api.ExceptionalClosure', '10': 'ExceptionalClosures'},
     {'1': 'WorkTimeDays', '3': 7, '4': 3, '5': 11, '6': '.api.WorkTimeDay', '8': {}, '10': 'WorkTimeDays'},
   ],
@@ -93,11 +93,11 @@ const CreateOnOrganisationRequest$json = {
 /// Descriptor for `CreateOnOrganisationRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List createOnOrganisationRequestDescriptor = $convert.base64Decode(
     'ChtDcmVhdGVPbk9yZ2FuaXNhdGlvblJlcXVlc3QSQAoGSGVhZGVyGAEgASgLMh4uYXBpLlJlcX'
-    'Vlc3RPcmdhbmlzYXRpb25IZWFkZXJCCPpCBYoBAhABUgZIZWFkZXISEgoETmFtZRgCIAEoCVIE'
+    'Vlc3RPcmdhbmlzYXRpb25IZWFkZXJCCPpCBYoBAhABUgZIZWFkZXISGwoETmFtZRgCIAEoCUIH'
-    'TmFtZRIpCgtEZXNjcmlwdGlvbhgDIAEoCUIH+kIEcgIQAVILRGVzY3JpcHRpb24SSQoTRXhjZX'
+    '+kIEcgIQAVIETmFtZRIgCgtEZXNjcmlwdGlvbhgDIAEoCVILRGVzY3JpcHRpb24SSQoTRXhjZX'
     'B0aW9uYWxDbG9zdXJlcxgEIAMoCzIXLmFwaS5FeGNlcHRpb25hbENsb3N1cmVSE0V4Y2VwdGlv'
     'bmFsQ2xvc3VyZXMSQQoMV29ya1RpbWVEYXlzGAcgAygLMhAuYXBpLldvcmtUaW1lRGF5QgvqwR'
-    'gHV2Vla0RheVIMV29ya1RpbWVEYXlzOg6SQQsKCdIBBkhlYWRlcg==');
+    'gHV2Vla0RheVIMV29ya1RpbWVEYXlzOhWSQRIKENIBBkhlYWRlctIBBE5hbWU=');
 
 @$core.Deprecated('Use createOnOrganisationResponseDescriptor instead')
 const CreateOnOrganisationResponse$json = {
@@ -257,42 +257,13 @@ final $typed_data.Uint8List getPublicHolidaysResponseDescriptor = $convert.base6
     'ChlHZXRQdWJsaWNIb2xpZGF5c1Jlc3BvbnNlEjMKCEhvbGlkYXlzGAEgAygLMhcuYXBpLkV4Y2'
     'VwdGlvbmFsQ2xvc3VyZVIISG9saWRheXM=');
 
-@$core.Deprecated('Use cloneOnOrganisationRequestDescriptor instead')
-const CloneOnOrganisationRequest$json = {
-  '1': 'CloneOnOrganisationRequest',
-  '2': [
-    {'1': 'CalendarID', '3': 1, '4': 1, '5': 9, '10': 'CalendarID'},
-    {'1': 'Name', '3': 2, '4': 1, '5': 9, '10': 'Name'},
-    {'1': 'Description', '3': 3, '4': 1, '5': 9, '8': {}, '10': 'Description'},
-  ],
-};
-
-/// Descriptor for `CloneOnOrganisationRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List cloneOnOrganisationRequestDescriptor = $convert.base64Decode(
-    'ChpDbG9uZU9uT3JnYW5pc2F0aW9uUmVxdWVzdBIeCgpDYWxlbmRhcklEGAEgASgJUgpDYWxlbm'
-    'RhcklEEhIKBE5hbWUYAiABKAlSBE5hbWUSKQoLRGVzY3JpcHRpb24YAyABKAlCB/pCBHICEAFS'
-    'C0Rlc2NyaXB0aW9u');
-
-@$core.Deprecated('Use cloneOnOrganisationResponseDescriptor instead')
-const CloneOnOrganisationResponse$json = {
-  '1': 'CloneOnOrganisationResponse',
-  '2': [
-    {'1': 'Calendar', '3': 1, '4': 1, '5': 11, '6': '.api.Calendar', '8': {}, '10': 'Calendar'},
-  ],
-};
-
-/// Descriptor for `CloneOnOrganisationResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List cloneOnOrganisationResponseDescriptor = $convert.base64Decode(
-    'ChtDbG9uZU9uT3JnYW5pc2F0aW9uUmVzcG9uc2USMwoIQ2FsZW5kYXIYASABKAsyDS5hcGkuQ2'
-    'FsZW5kYXJCCPpCBYoBAhABUghDYWxlbmRhcg==');
-
 @$core.Deprecated('Use createOnSiteRequestDescriptor instead')
 const CreateOnSiteRequest$json = {
   '1': 'CreateOnSiteRequest',
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-    {'1': 'Name', '3': 2, '4': 1, '5': 9, '10': 'Name'},
+    {'1': 'Name', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'Name'},
-    {'1': 'Description', '3': 3, '4': 1, '5': 9, '8': {}, '10': 'Description'},
+    {'1': 'Description', '3': 3, '4': 1, '5': 9, '10': 'Description'},
     {'1': 'ExceptionalClosures', '3': 4, '4': 3, '5': 11, '6': '.api.ExceptionalClosure', '10': 'ExceptionalClosures'},
     {'1': 'WorkTimeDays', '3': 7, '4': 3, '5': 11, '6': '.api.WorkTimeDay', '8': {}, '10': 'WorkTimeDays'},
   ],
@@ -302,11 +273,11 @@ const CreateOnSiteRequest$json = {
 /// Descriptor for `CreateOnSiteRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List createOnSiteRequestDescriptor = $convert.base64Decode(
     'ChNDcmVhdGVPblNpdGVSZXF1ZXN0EjgKBkhlYWRlchgBIAEoCzIWLmFwaS5SZXF1ZXN0U2l0ZU'
-    'hlYWRlckII+kIFigECEAFSBkhlYWRlchISCgROYW1lGAIgASgJUgROYW1lEikKC0Rlc2NyaXB0'
+    'hlYWRlckII+kIFigECEAFSBkhlYWRlchIbCgROYW1lGAIgASgJQgf6QgRyAhABUgROYW1lEiAK'
-    'aW9uGAMgASgJQgf6QgRyAhABUgtEZXNjcmlwdGlvbhJJChNFeGNlcHRpb25hbENsb3N1cmVzGA'
+    'C0Rlc2NyaXB0aW9uGAMgASgJUgtEZXNjcmlwdGlvbhJJChNFeGNlcHRpb25hbENsb3N1cmVzGA'
     'QgAygLMhcuYXBpLkV4Y2VwdGlvbmFsQ2xvc3VyZVITRXhjZXB0aW9uYWxDbG9zdXJlcxJBCgxX'
     'b3JrVGltZURheXMYByADKAsyEC5hcGkuV29ya1RpbWVEYXlCC+rBGAdXZWVrRGF5UgxXb3JrVG'
-    'ltZURheXM6DpJBCwoJ0gEGSGVhZGVy');
+    'ltZURheXM6FZJBEgoQ0gEGSGVhZGVy0gEETmFtZQ==');
 
 @$core.Deprecated('Use createOnSiteResponseDescriptor instead')
 const CreateOnSiteResponse$json = {
@@ -438,32 +409,3 @@ const DeleteOnSiteResponse$json = {
 final $typed_data.Uint8List deleteOnSiteResponseDescriptor = $convert.base64Decode(
     'ChREZWxldGVPblNpdGVSZXNwb25zZQ==');
 
-@$core.Deprecated('Use cloneOnSiteRequestDescriptor instead')
-const CloneOnSiteRequest$json = {
-  '1': 'CloneOnSiteRequest',
-  '2': [
-    {'1': 'CalendarID', '3': 1, '4': 1, '5': 9, '10': 'CalendarID'},
-    {'1': 'Name', '3': 2, '4': 1, '5': 9, '10': 'Name'},
-    {'1': 'Description', '3': 3, '4': 1, '5': 9, '8': {}, '10': 'Description'},
-  ],
-};
-
-/// Descriptor for `CloneOnSiteRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List cloneOnSiteRequestDescriptor = $convert.base64Decode(
-    'ChJDbG9uZU9uU2l0ZVJlcXVlc3QSHgoKQ2FsZW5kYXJJRBgBIAEoCVIKQ2FsZW5kYXJJRBISCg'
-    'ROYW1lGAIgASgJUgROYW1lEikKC0Rlc2NyaXB0aW9uGAMgASgJQgf6QgRyAhABUgtEZXNjcmlw'
-    'dGlvbg==');
-
-@$core.Deprecated('Use cloneOnSiteResponseDescriptor instead')
-const CloneOnSiteResponse$json = {
-  '1': 'CloneOnSiteResponse',
-  '2': [
-    {'1': 'Calendar', '3': 1, '4': 1, '5': 11, '6': '.api.Calendar', '8': {}, '10': 'Calendar'},
-  ],
-};
-
-/// Descriptor for `CloneOnSiteResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List cloneOnSiteResponseDescriptor = $convert.base64Decode(
-    'ChNDbG9uZU9uU2l0ZVJlc3BvbnNlEjMKCENhbGVuZGFyGAEgASgLMg0uYXBpLkNhbGVuZGFyQg'
-    'j6QgWKAQIQAVIIQ2FsZW5kYXI=');
-

lib/claim-type.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from claim-type.proto.
-//  source: claim-type.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,27 +14,27 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
 /// Create
 class CreateClaimTypeRequest extends $pb.GeneratedMessage {
   factory CreateClaimTypeRequest({
-    $3.RequestProjectHeader? header,
+    $1.RequestProjectHeader? header,
     $core.String? reason,
     $core.String? reasonCode,
-    $3.ClaimEntityType? entityType,
+    $1.ClaimEntityType? entityType,
-    $3.ClaimCriticality? defaultCriticality,
+    $1.ClaimCriticality? defaultCriticality,
-    $core.Iterable<$3.ClaimTransition>? transitions,
+    $core.Iterable<$1.ClaimTransition>? transitions,
-    $core.Iterable<$3.ClaimTypeClosure>? possibleClosures,
+    $core.Iterable<$1.ClaimTypeClosure>? possibleClosures,
     $core.Iterable<$core.String>? criticalityAllowedRoles,
     $core.Iterable<$core.String>? readAllowedRoles,
     $core.Iterable<$core.String>? writeAllowedRoles,
     $core.Iterable<$core.String>? assignAllowedRoles,
-    $core.Iterable<$3.ClaimStatus>? allowedStatuses,
+    $core.Iterable<$1.ClaimStatus>? allowedStatuses,
-    $3.ClaimStatus? defaultStatus,
+    $1.ClaimStatus? defaultStatus,
-    $3.ClaimSector? sector,
+    $1.ClaimSector? sector,
     $core.Iterable<$core.String>? defaultAssignees,
   }) {
     final result = create();
@@ -62,20 +62,20 @@ class CreateClaimTypeRequest extends $pb.GeneratedMessage {
   factory CreateClaimTypeRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateClaimTypeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'Reason', protoName: 'Reason')
     ..aOS(3, _omitFieldNames ? '' : 'ReasonCode', protoName: 'ReasonCode')
-    ..e<$3.ClaimEntityType>(4, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $3.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $3.ClaimEntityType.valueOf, enumValues: $3.ClaimEntityType.values)
+    ..e<$1.ClaimEntityType>(4, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $1.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $1.ClaimEntityType.valueOf, enumValues: $1.ClaimEntityType.values)
-    ..e<$3.ClaimCriticality>(5, _omitFieldNames ? '' : 'DefaultCriticality', $pb.PbFieldType.OE, protoName: 'DefaultCriticality', defaultOrMaker: $3.ClaimCriticality.CLAIM_CRITICALITY_UNKNOWN, valueOf: $3.ClaimCriticality.valueOf, enumValues: $3.ClaimCriticality.values)
+    ..e<$1.ClaimCriticality>(5, _omitFieldNames ? '' : 'DefaultCriticality', $pb.PbFieldType.OE, protoName: 'DefaultCriticality', defaultOrMaker: $1.ClaimCriticality.CLAIM_CRITICALITY_UNKNOWN, valueOf: $1.ClaimCriticality.valueOf, enumValues: $1.ClaimCriticality.values)
-    ..pc<$3.ClaimTransition>(6, _omitFieldNames ? '' : 'Transitions', $pb.PbFieldType.PM, protoName: 'Transitions', subBuilder: $3.ClaimTransition.create)
+    ..pc<$1.ClaimTransition>(6, _omitFieldNames ? '' : 'Transitions', $pb.PbFieldType.PM, protoName: 'Transitions', subBuilder: $1.ClaimTransition.create)
-    ..pc<$3.ClaimTypeClosure>(7, _omitFieldNames ? '' : 'PossibleClosures', $pb.PbFieldType.PM, protoName: 'PossibleClosures', subBuilder: $3.ClaimTypeClosure.create)
+    ..pc<$1.ClaimTypeClosure>(7, _omitFieldNames ? '' : 'PossibleClosures', $pb.PbFieldType.PM, protoName: 'PossibleClosures', subBuilder: $1.ClaimTypeClosure.create)
     ..pPS(8, _omitFieldNames ? '' : 'CriticalityAllowedRoles', protoName: 'CriticalityAllowedRoles')
     ..pPS(9, _omitFieldNames ? '' : 'ReadAllowedRoles', protoName: 'ReadAllowedRoles')
     ..pPS(10, _omitFieldNames ? '' : 'WriteAllowedRoles', protoName: 'WriteAllowedRoles')
     ..pPS(11, _omitFieldNames ? '' : 'AssignAllowedRoles', protoName: 'AssignAllowedRoles')
-    ..pc<$3.ClaimStatus>(12, _omitFieldNames ? '' : 'AllowedStatuses', $pb.PbFieldType.KE, protoName: 'AllowedStatuses', valueOf: $3.ClaimStatus.valueOf, enumValues: $3.ClaimStatus.values, defaultEnumValue: $3.ClaimStatus.CLAIM_STATUS_UNKNOWN)
+    ..pc<$1.ClaimStatus>(12, _omitFieldNames ? '' : 'AllowedStatuses', $pb.PbFieldType.KE, protoName: 'AllowedStatuses', valueOf: $1.ClaimStatus.valueOf, enumValues: $1.ClaimStatus.values, defaultEnumValue: $1.ClaimStatus.CLAIM_STATUS_UNKNOWN)
-    ..e<$3.ClaimStatus>(13, _omitFieldNames ? '' : 'DefaultStatus', $pb.PbFieldType.OE, protoName: 'DefaultStatus', defaultOrMaker: $3.ClaimStatus.CLAIM_STATUS_UNKNOWN, valueOf: $3.ClaimStatus.valueOf, enumValues: $3.ClaimStatus.values)
+    ..e<$1.ClaimStatus>(13, _omitFieldNames ? '' : 'DefaultStatus', $pb.PbFieldType.OE, protoName: 'DefaultStatus', defaultOrMaker: $1.ClaimStatus.CLAIM_STATUS_UNKNOWN, valueOf: $1.ClaimStatus.valueOf, enumValues: $1.ClaimStatus.values)
-    ..e<$3.ClaimSector>(14, _omitFieldNames ? '' : 'Sector', $pb.PbFieldType.OE, protoName: 'Sector', defaultOrMaker: $3.ClaimSector.CLAIM_SECTOR_UNKNOWN, valueOf: $3.ClaimSector.valueOf, enumValues: $3.ClaimSector.values)
+    ..e<$1.ClaimSector>(14, _omitFieldNames ? '' : 'Sector', $pb.PbFieldType.OE, protoName: 'Sector', defaultOrMaker: $1.ClaimSector.CLAIM_SECTOR_UNKNOWN, valueOf: $1.ClaimSector.valueOf, enumValues: $1.ClaimSector.values)
     ..pPS(15, _omitFieldNames ? '' : 'DefaultAssignees', protoName: 'DefaultAssignees')
     ..hasRequiredFields = false
   ;
@@ -98,15 +98,15 @@ class CreateClaimTypeRequest extends $pb.GeneratedMessage {
   static CreateClaimTypeRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader get header => $_getN(0);
+  $1.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestProjectHeader value) => $_setField(1, value);
+  set header($1.RequestProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   $core.String get reason => $_getSZ(1);
@@ -127,28 +127,28 @@ class CreateClaimTypeRequest extends $pb.GeneratedMessage {
   void clearReasonCode() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $3.ClaimEntityType get entityType => $_getN(3);
+  $1.ClaimEntityType get entityType => $_getN(3);
   @$pb.TagNumber(4)
-  set entityType($3.ClaimEntityType value) => $_setField(4, value);
+  set entityType($1.ClaimEntityType value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasEntityType() => $_has(3);
   @$pb.TagNumber(4)
   void clearEntityType() => $_clearField(4);
 
   @$pb.TagNumber(5)
-  $3.ClaimCriticality get defaultCriticality => $_getN(4);
+  $1.ClaimCriticality get defaultCriticality => $_getN(4);
   @$pb.TagNumber(5)
-  set defaultCriticality($3.ClaimCriticality value) => $_setField(5, value);
+  set defaultCriticality($1.ClaimCriticality value) => $_setField(5, value);
   @$pb.TagNumber(5)
   $core.bool hasDefaultCriticality() => $_has(4);
   @$pb.TagNumber(5)
   void clearDefaultCriticality() => $_clearField(5);
 
   @$pb.TagNumber(6)
-  $pb.PbList<$3.ClaimTransition> get transitions => $_getList(5);
+  $pb.PbList<$1.ClaimTransition> get transitions => $_getList(5);
 
   @$pb.TagNumber(7)
-  $pb.PbList<$3.ClaimTypeClosure> get possibleClosures => $_getList(6);
+  $pb.PbList<$1.ClaimTypeClosure> get possibleClosures => $_getList(6);
 
   @$pb.TagNumber(8)
   $pb.PbList<$core.String> get criticalityAllowedRoles => $_getList(7);
@@ -163,21 +163,21 @@ class CreateClaimTypeRequest extends $pb.GeneratedMessage {
   $pb.PbList<$core.String> get assignAllowedRoles => $_getList(10);
 
   @$pb.TagNumber(12)
-  $pb.PbList<$3.ClaimStatus> get allowedStatuses => $_getList(11);
+  $pb.PbList<$1.ClaimStatus> get allowedStatuses => $_getList(11);
 
   @$pb.TagNumber(13)
-  $3.ClaimStatus get defaultStatus => $_getN(12);
+  $1.ClaimStatus get defaultStatus => $_getN(12);
   @$pb.TagNumber(13)
-  set defaultStatus($3.ClaimStatus value) => $_setField(13, value);
+  set defaultStatus($1.ClaimStatus value) => $_setField(13, value);
   @$pb.TagNumber(13)
   $core.bool hasDefaultStatus() => $_has(12);
   @$pb.TagNumber(13)
   void clearDefaultStatus() => $_clearField(13);
 
   @$pb.TagNumber(14)
-  $3.ClaimSector get sector => $_getN(13);
+  $1.ClaimSector get sector => $_getN(13);
   @$pb.TagNumber(14)
-  set sector($3.ClaimSector value) => $_setField(14, value);
+  set sector($1.ClaimSector value) => $_setField(14, value);
   @$pb.TagNumber(14)
   $core.bool hasSector() => $_has(13);
   @$pb.TagNumber(14)
@@ -189,7 +189,7 @@ class CreateClaimTypeRequest extends $pb.GeneratedMessage {
 
 class CreateClaimTypeResponse extends $pb.GeneratedMessage {
   factory CreateClaimTypeResponse({
-    $3.ClaimType? claimType,
+    $1.ClaimType? claimType,
   }) {
     final result = create();
     if (claimType != null) result.claimType = claimType;
@@ -202,7 +202,7 @@ class CreateClaimTypeResponse extends $pb.GeneratedMessage {
   factory CreateClaimTypeResponse.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateClaimTypeResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.ClaimType>(1, _omitFieldNames ? '' : 'ClaimType', protoName: 'ClaimType', subBuilder: $3.ClaimType.create)
+    ..aOM<$1.ClaimType>(1, _omitFieldNames ? '' : 'ClaimType', protoName: 'ClaimType', subBuilder: $1.ClaimType.create)
     ..hasRequiredFields = false
   ;
 
@@ -224,21 +224,21 @@ class CreateClaimTypeResponse extends $pb.GeneratedMessage {
   static CreateClaimTypeResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.ClaimType get claimType => $_getN(0);
+  $1.ClaimType get claimType => $_getN(0);
   @$pb.TagNumber(1)
-  set claimType($3.ClaimType value) => $_setField(1, value);
+  set claimType($1.ClaimType value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasClaimType() => $_has(0);
   @$pb.TagNumber(1)
   void clearClaimType() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.ClaimType ensureClaimType() => $_ensure(0);
+  $1.ClaimType ensureClaimType() => $_ensure(0);
 }
 
 /// Get
 class GetClaimTypeRequest extends $pb.GeneratedMessage {
   factory GetClaimTypeRequest({
-    $3.RequestProjectHeader? header,
+    $1.RequestProjectHeader? header,
     $core.String? iD,
   }) {
     final result = create();
@@ -253,7 +253,7 @@ class GetClaimTypeRequest extends $pb.GeneratedMessage {
   factory GetClaimTypeRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetClaimTypeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'ID', protoName: 'ID')
     ..hasRequiredFields = false
   ;
@@ -276,15 +276,15 @@ class GetClaimTypeRequest extends $pb.GeneratedMessage {
   static GetClaimTypeRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader get header => $_getN(0);
+  $1.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestProjectHeader value) => $_setField(1, value);
+  set header($1.RequestProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   $core.String get iD => $_getSZ(1);
@@ -298,7 +298,7 @@ class GetClaimTypeRequest extends $pb.GeneratedMessage {
 
 class GetClaimTypeResponse extends $pb.GeneratedMessage {
   factory GetClaimTypeResponse({
-    $3.ClaimType? claimType,
+    $1.ClaimType? claimType,
   }) {
     final result = create();
     if (claimType != null) result.claimType = claimType;
@@ -311,7 +311,7 @@ class GetClaimTypeResponse extends $pb.GeneratedMessage {
   factory GetClaimTypeResponse.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetClaimTypeResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.ClaimType>(1, _omitFieldNames ? '' : 'ClaimType', protoName: 'ClaimType', subBuilder: $3.ClaimType.create)
+    ..aOM<$1.ClaimType>(1, _omitFieldNames ? '' : 'ClaimType', protoName: 'ClaimType', subBuilder: $1.ClaimType.create)
     ..hasRequiredFields = false
   ;
 
@@ -333,21 +333,21 @@ class GetClaimTypeResponse extends $pb.GeneratedMessage {
   static GetClaimTypeResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.ClaimType get claimType => $_getN(0);
+  $1.ClaimType get claimType => $_getN(0);
   @$pb.TagNumber(1)
-  set claimType($3.ClaimType value) => $_setField(1, value);
+  set claimType($1.ClaimType value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasClaimType() => $_has(0);
   @$pb.TagNumber(1)
   void clearClaimType() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.ClaimType ensureClaimType() => $_ensure(0);
+  $1.ClaimType ensureClaimType() => $_ensure(0);
 }
 
 /// List
 class ListClaimTypeRequest extends $pb.GeneratedMessage {
   factory ListClaimTypeRequest({
-    $3.RequestProjectHeader? header,
+    $1.RequestProjectHeader? header,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -360,7 +360,7 @@ class ListClaimTypeRequest extends $pb.GeneratedMessage {
   factory ListClaimTypeRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListClaimTypeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
     ..hasRequiredFields = false
   ;
 
@@ -382,20 +382,20 @@ class ListClaimTypeRequest extends $pb.GeneratedMessage {
   static ListClaimTypeRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader get header => $_getN(0);
+  $1.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestProjectHeader value) => $_setField(1, value);
+  set header($1.RequestProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
 }
 
 class ListClaimTypeResponse extends $pb.GeneratedMessage {
   factory ListClaimTypeResponse({
-    $core.Iterable<$3.ClaimType>? claimTypes,
+    $core.Iterable<$1.ClaimType>? claimTypes,
   }) {
     final result = create();
     if (claimTypes != null) result.claimTypes.addAll(claimTypes);
@@ -408,7 +408,7 @@ class ListClaimTypeResponse extends $pb.GeneratedMessage {
   factory ListClaimTypeResponse.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListClaimTypeResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$3.ClaimType>(1, _omitFieldNames ? '' : 'ClaimTypes', $pb.PbFieldType.PM, protoName: 'ClaimTypes', subBuilder: $3.ClaimType.create)
+    ..pc<$1.ClaimType>(1, _omitFieldNames ? '' : 'ClaimTypes', $pb.PbFieldType.PM, protoName: 'ClaimTypes', subBuilder: $1.ClaimType.create)
     ..hasRequiredFields = false
   ;
 
@@ -430,24 +430,24 @@ class ListClaimTypeResponse extends $pb.GeneratedMessage {
   static ListClaimTypeResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $pb.PbList<$3.ClaimType> get claimTypes => $_getList(0);
+  $pb.PbList<$1.ClaimType> get claimTypes => $_getList(0);
 }
 
 /// Update
 class UpdateClaimTypeRequest extends $pb.GeneratedMessage {
   factory UpdateClaimTypeRequest({
-    $3.RequestProjectHeader? header,
+    $1.RequestProjectHeader? header,
     $core.String? iD,
-    $3.ClaimCriticality? defaultCriticality,
+    $1.ClaimCriticality? defaultCriticality,
-    $core.Iterable<$3.ClaimTransition>? transitions,
+    $core.Iterable<$1.ClaimTransition>? transitions,
-    $core.Iterable<$3.ClaimTypeClosure>? possibleClosures,
+    $core.Iterable<$1.ClaimTypeClosure>? possibleClosures,
     $core.Iterable<$core.String>? criticalityAllowedRoles,
     $core.Iterable<$core.String>? readAllowedRoles,
     $core.Iterable<$core.String>? writeAllowedRoles,
     $core.Iterable<$core.String>? assignAllowedRoles,
-    $core.Iterable<$3.ClaimStatus>? allowedStatuses,
+    $core.Iterable<$1.ClaimStatus>? allowedStatuses,
-    $3.ClaimStatus? defaultStatus,
+    $1.ClaimStatus? defaultStatus,
-    $3.ClaimSector? sector,
+    $1.ClaimSector? sector,
     $core.Iterable<$core.String>? defaultAssignees,
   }) {
     final result = create();
@@ -473,18 +473,18 @@ class UpdateClaimTypeRequest extends $pb.GeneratedMessage {
   factory UpdateClaimTypeRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateClaimTypeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'ID', protoName: 'ID')
-    ..e<$3.ClaimCriticality>(3, _omitFieldNames ? '' : 'DefaultCriticality', $pb.PbFieldType.OE, protoName: 'DefaultCriticality', defaultOrMaker: $3.ClaimCriticality.CLAIM_CRITICALITY_UNKNOWN, valueOf: $3.ClaimCriticality.valueOf, enumValues: $3.ClaimCriticality.values)
+    ..e<$1.ClaimCriticality>(3, _omitFieldNames ? '' : 'DefaultCriticality', $pb.PbFieldType.OE, protoName: 'DefaultCriticality', defaultOrMaker: $1.ClaimCriticality.CLAIM_CRITICALITY_UNKNOWN, valueOf: $1.ClaimCriticality.valueOf, enumValues: $1.ClaimCriticality.values)
-    ..pc<$3.ClaimTransition>(4, _omitFieldNames ? '' : 'Transitions', $pb.PbFieldType.PM, protoName: 'Transitions', subBuilder: $3.ClaimTransition.create)
+    ..pc<$1.ClaimTransition>(4, _omitFieldNames ? '' : 'Transitions', $pb.PbFieldType.PM, protoName: 'Transitions', subBuilder: $1.ClaimTransition.create)
-    ..pc<$3.ClaimTypeClosure>(5, _omitFieldNames ? '' : 'PossibleClosures', $pb.PbFieldType.PM, protoName: 'PossibleClosures', subBuilder: $3.ClaimTypeClosure.create)
+    ..pc<$1.ClaimTypeClosure>(5, _omitFieldNames ? '' : 'PossibleClosures', $pb.PbFieldType.PM, protoName: 'PossibleClosures', subBuilder: $1.ClaimTypeClosure.create)
     ..pPS(6, _omitFieldNames ? '' : 'CriticalityAllowedRoles', protoName: 'CriticalityAllowedRoles')
     ..pPS(7, _omitFieldNames ? '' : 'ReadAllowedRoles', protoName: 'ReadAllowedRoles')
     ..pPS(8, _omitFieldNames ? '' : 'WriteAllowedRoles', protoName: 'WriteAllowedRoles')
     ..pPS(9, _omitFieldNames ? '' : 'AssignAllowedRoles', protoName: 'AssignAllowedRoles')
-    ..pc<$3.ClaimStatus>(10, _omitFieldNames ? '' : 'AllowedStatuses', $pb.PbFieldType.KE, protoName: 'AllowedStatuses', valueOf: $3.ClaimStatus.valueOf, enumValues: $3.ClaimStatus.values, defaultEnumValue: $3.ClaimStatus.CLAIM_STATUS_UNKNOWN)
+    ..pc<$1.ClaimStatus>(10, _omitFieldNames ? '' : 'AllowedStatuses', $pb.PbFieldType.KE, protoName: 'AllowedStatuses', valueOf: $1.ClaimStatus.valueOf, enumValues: $1.ClaimStatus.values, defaultEnumValue: $1.ClaimStatus.CLAIM_STATUS_UNKNOWN)
-    ..e<$3.ClaimStatus>(11, _omitFieldNames ? '' : 'DefaultStatus', $pb.PbFieldType.OE, protoName: 'DefaultStatus', defaultOrMaker: $3.ClaimStatus.CLAIM_STATUS_UNKNOWN, valueOf: $3.ClaimStatus.valueOf, enumValues: $3.ClaimStatus.values)
+    ..e<$1.ClaimStatus>(11, _omitFieldNames ? '' : 'DefaultStatus', $pb.PbFieldType.OE, protoName: 'DefaultStatus', defaultOrMaker: $1.ClaimStatus.CLAIM_STATUS_UNKNOWN, valueOf: $1.ClaimStatus.valueOf, enumValues: $1.ClaimStatus.values)
-    ..e<$3.ClaimSector>(12, _omitFieldNames ? '' : 'Sector', $pb.PbFieldType.OE, protoName: 'Sector', defaultOrMaker: $3.ClaimSector.CLAIM_SECTOR_UNKNOWN, valueOf: $3.ClaimSector.valueOf, enumValues: $3.ClaimSector.values)
+    ..e<$1.ClaimSector>(12, _omitFieldNames ? '' : 'Sector', $pb.PbFieldType.OE, protoName: 'Sector', defaultOrMaker: $1.ClaimSector.CLAIM_SECTOR_UNKNOWN, valueOf: $1.ClaimSector.valueOf, enumValues: $1.ClaimSector.values)
     ..pPS(13, _omitFieldNames ? '' : 'DefaultAssignees', protoName: 'DefaultAssignees')
     ..hasRequiredFields = false
   ;
@@ -507,15 +507,15 @@ class UpdateClaimTypeRequest extends $pb.GeneratedMessage {
   static UpdateClaimTypeRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader get header => $_getN(0);
+  $1.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestProjectHeader value) => $_setField(1, value);
+  set header($1.RequestProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   $core.String get iD => $_getSZ(1);
@@ -527,19 +527,19 @@ class UpdateClaimTypeRequest extends $pb.GeneratedMessage {
   void clearID() => $_clearField(2);
 
   @$pb.TagNumber(3)
-  $3.ClaimCriticality get defaultCriticality => $_getN(2);
+  $1.ClaimCriticality get defaultCriticality => $_getN(2);
   @$pb.TagNumber(3)
-  set defaultCriticality($3.ClaimCriticality value) => $_setField(3, value);
+  set defaultCriticality($1.ClaimCriticality value) => $_setField(3, value);
   @$pb.TagNumber(3)
   $core.bool hasDefaultCriticality() => $_has(2);
   @$pb.TagNumber(3)
   void clearDefaultCriticality() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $pb.PbList<$3.ClaimTransition> get transitions => $_getList(3);
+  $pb.PbList<$1.ClaimTransition> get transitions => $_getList(3);
 
   @$pb.TagNumber(5)
-  $pb.PbList<$3.ClaimTypeClosure> get possibleClosures => $_getList(4);
+  $pb.PbList<$1.ClaimTypeClosure> get possibleClosures => $_getList(4);
 
   @$pb.TagNumber(6)
   $pb.PbList<$core.String> get criticalityAllowedRoles => $_getList(5);
@@ -554,21 +554,21 @@ class UpdateClaimTypeRequest extends $pb.GeneratedMessage {
   $pb.PbList<$core.String> get assignAllowedRoles => $_getList(8);
 
   @$pb.TagNumber(10)
-  $pb.PbList<$3.ClaimStatus> get allowedStatuses => $_getList(9);
+  $pb.PbList<$1.ClaimStatus> get allowedStatuses => $_getList(9);
 
   @$pb.TagNumber(11)
-  $3.ClaimStatus get defaultStatus => $_getN(10);
+  $1.ClaimStatus get defaultStatus => $_getN(10);
   @$pb.TagNumber(11)
-  set defaultStatus($3.ClaimStatus value) => $_setField(11, value);
+  set defaultStatus($1.ClaimStatus value) => $_setField(11, value);
   @$pb.TagNumber(11)
   $core.bool hasDefaultStatus() => $_has(10);
   @$pb.TagNumber(11)
   void clearDefaultStatus() => $_clearField(11);
 
   @$pb.TagNumber(12)
-  $3.ClaimSector get sector => $_getN(11);
+  $1.ClaimSector get sector => $_getN(11);
   @$pb.TagNumber(12)
-  set sector($3.ClaimSector value) => $_setField(12, value);
+  set sector($1.ClaimSector value) => $_setField(12, value);
   @$pb.TagNumber(12)
   $core.bool hasSector() => $_has(11);
   @$pb.TagNumber(12)
@@ -580,7 +580,7 @@ class UpdateClaimTypeRequest extends $pb.GeneratedMessage {
 
 class UpdateClaimTypeResponse extends $pb.GeneratedMessage {
   factory UpdateClaimTypeResponse({
-    $3.ClaimType? claimType,
+    $1.ClaimType? claimType,
   }) {
     final result = create();
     if (claimType != null) result.claimType = claimType;
@@ -593,7 +593,7 @@ class UpdateClaimTypeResponse extends $pb.GeneratedMessage {
   factory UpdateClaimTypeResponse.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateClaimTypeResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.ClaimType>(1, _omitFieldNames ? '' : 'ClaimType', protoName: 'ClaimType', subBuilder: $3.ClaimType.create)
+    ..aOM<$1.ClaimType>(1, _omitFieldNames ? '' : 'ClaimType', protoName: 'ClaimType', subBuilder: $1.ClaimType.create)
     ..hasRequiredFields = false
   ;
 
@@ -615,21 +615,21 @@ class UpdateClaimTypeResponse extends $pb.GeneratedMessage {
   static UpdateClaimTypeResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.ClaimType get claimType => $_getN(0);
+  $1.ClaimType get claimType => $_getN(0);
   @$pb.TagNumber(1)
-  set claimType($3.ClaimType value) => $_setField(1, value);
+  set claimType($1.ClaimType value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasClaimType() => $_has(0);
   @$pb.TagNumber(1)
   void clearClaimType() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.ClaimType ensureClaimType() => $_ensure(0);
+  $1.ClaimType ensureClaimType() => $_ensure(0);
 }
 
 /// Delete
 class DeleteClaimTypeRequest extends $pb.GeneratedMessage {
   factory DeleteClaimTypeRequest({
-    $3.RequestProjectHeader? header,
+    $1.RequestProjectHeader? header,
     $core.String? iD,
   }) {
     final result = create();
@@ -644,7 +644,7 @@ class DeleteClaimTypeRequest extends $pb.GeneratedMessage {
   factory DeleteClaimTypeRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteClaimTypeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'ID', protoName: 'ID')
     ..hasRequiredFields = false
   ;
@@ -667,15 +667,15 @@ class DeleteClaimTypeRequest extends $pb.GeneratedMessage {
   static DeleteClaimTypeRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader get header => $_getN(0);
+  $1.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestProjectHeader value) => $_setField(1, value);
+  set header($1.RequestProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   $core.String get iD => $_getSZ(1);

lib/claim-type.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from claim-type.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/claim-type.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from claim-type.proto.
-//  source: claim-type.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,7 +16,7 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'claim-type.pb.dart' as $14;
+import 'claim-type.pb.dart' as $0;
 
 export 'claim-type.pb.dart';
 
@@ -30,56 +30,58 @@ class ClaimTypeServiceClient extends $grpc.Client {
     '',
   ];
 
-  static final _$create = $grpc.ClientMethod<$14.CreateClaimTypeRequest, $14.CreateClaimTypeResponse>(
-      '/api.ClaimTypeService/Create',
-      ($14.CreateClaimTypeRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $14.CreateClaimTypeResponse.fromBuffer(value));
-  static final _$get = $grpc.ClientMethod<$14.GetClaimTypeRequest, $14.GetClaimTypeResponse>(
-      '/api.ClaimTypeService/Get',
-      ($14.GetClaimTypeRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $14.GetClaimTypeResponse.fromBuffer(value));
-  static final _$list = $grpc.ClientMethod<$14.ListClaimTypeRequest, $14.ListClaimTypeResponse>(
-      '/api.ClaimTypeService/List',
-      ($14.ListClaimTypeRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $14.ListClaimTypeResponse.fromBuffer(value));
-  static final _$update = $grpc.ClientMethod<$14.UpdateClaimTypeRequest, $14.UpdateClaimTypeResponse>(
-      '/api.ClaimTypeService/Update',
-      ($14.UpdateClaimTypeRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $14.UpdateClaimTypeResponse.fromBuffer(value));
-  static final _$delete = $grpc.ClientMethod<$14.DeleteClaimTypeRequest, $14.DeleteClaimTypeResponse>(
-      '/api.ClaimTypeService/Delete',
-      ($14.DeleteClaimTypeRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $14.DeleteClaimTypeResponse.fromBuffer(value));
-  static final _$deleteClaimTypesForProject = $grpc.ClientMethod<$14.DeleteClaimTypesForProjectRequest, $14.DeleteClaimTypesForProjectResponse>(
-      '/api.ClaimTypeService/DeleteClaimTypesForProject',
-      ($14.DeleteClaimTypesForProjectRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $14.DeleteClaimTypesForProjectResponse.fromBuffer(value));
-
   ClaimTypeServiceClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$14.CreateClaimTypeResponse> create($14.CreateClaimTypeRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.CreateClaimTypeResponse> create($0.CreateClaimTypeRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$create, request, options: options);
   }
 
-  $grpc.ResponseFuture<$14.GetClaimTypeResponse> get($14.GetClaimTypeRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.GetClaimTypeResponse> get($0.GetClaimTypeRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$get, request, options: options);
   }
 
-  $grpc.ResponseFuture<$14.ListClaimTypeResponse> list($14.ListClaimTypeRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ListClaimTypeResponse> list($0.ListClaimTypeRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$list, request, options: options);
   }
 
-  $grpc.ResponseFuture<$14.UpdateClaimTypeResponse> update($14.UpdateClaimTypeRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.UpdateClaimTypeResponse> update($0.UpdateClaimTypeRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$update, request, options: options);
   }
 
-  $grpc.ResponseFuture<$14.DeleteClaimTypeResponse> delete($14.DeleteClaimTypeRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.DeleteClaimTypeResponse> delete($0.DeleteClaimTypeRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$delete, request, options: options);
   }
 
-  $grpc.ResponseFuture<$14.DeleteClaimTypesForProjectResponse> deleteClaimTypesForProject($14.DeleteClaimTypesForProjectRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.DeleteClaimTypesForProjectResponse> deleteClaimTypesForProject($0.DeleteClaimTypesForProjectRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$deleteClaimTypesForProject, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$create = $grpc.ClientMethod<$0.CreateClaimTypeRequest, $0.CreateClaimTypeResponse>(
+      '/api.ClaimTypeService/Create',
+      ($0.CreateClaimTypeRequest value) => value.writeToBuffer(),
+      $0.CreateClaimTypeResponse.fromBuffer);
+  static final _$get = $grpc.ClientMethod<$0.GetClaimTypeRequest, $0.GetClaimTypeResponse>(
+      '/api.ClaimTypeService/Get',
+      ($0.GetClaimTypeRequest value) => value.writeToBuffer(),
+      $0.GetClaimTypeResponse.fromBuffer);
+  static final _$list = $grpc.ClientMethod<$0.ListClaimTypeRequest, $0.ListClaimTypeResponse>(
+      '/api.ClaimTypeService/List',
+      ($0.ListClaimTypeRequest value) => value.writeToBuffer(),
+      $0.ListClaimTypeResponse.fromBuffer);
+  static final _$update = $grpc.ClientMethod<$0.UpdateClaimTypeRequest, $0.UpdateClaimTypeResponse>(
+      '/api.ClaimTypeService/Update',
+      ($0.UpdateClaimTypeRequest value) => value.writeToBuffer(),
+      $0.UpdateClaimTypeResponse.fromBuffer);
+  static final _$delete = $grpc.ClientMethod<$0.DeleteClaimTypeRequest, $0.DeleteClaimTypeResponse>(
+      '/api.ClaimTypeService/Delete',
+      ($0.DeleteClaimTypeRequest value) => value.writeToBuffer(),
+      $0.DeleteClaimTypeResponse.fromBuffer);
+  static final _$deleteClaimTypesForProject = $grpc.ClientMethod<$0.DeleteClaimTypesForProjectRequest, $0.DeleteClaimTypesForProjectResponse>(
+      '/api.ClaimTypeService/DeleteClaimTypesForProject',
+      ($0.DeleteClaimTypesForProjectRequest value) => value.writeToBuffer(),
+      $0.DeleteClaimTypesForProjectResponse.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.ClaimTypeService')
@@ -87,78 +89,84 @@ abstract class ClaimTypeServiceBase extends $grpc.Service {
   $core.String get $name => 'api.ClaimTypeService';
 
   ClaimTypeServiceBase() {
-    $addMethod($grpc.ServiceMethod<$14.CreateClaimTypeRequest, $14.CreateClaimTypeResponse>(
+    $addMethod($grpc.ServiceMethod<$0.CreateClaimTypeRequest, $0.CreateClaimTypeResponse>(
         'Create',
         create_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $14.CreateClaimTypeRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.CreateClaimTypeRequest.fromBuffer(value),
-        ($14.CreateClaimTypeResponse value) => value.writeToBuffer()));
+        ($0.CreateClaimTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$14.GetClaimTypeRequest, $14.GetClaimTypeResponse>(
+    $addMethod($grpc.ServiceMethod<$0.GetClaimTypeRequest, $0.GetClaimTypeResponse>(
         'Get',
         get_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $14.GetClaimTypeRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.GetClaimTypeRequest.fromBuffer(value),
-        ($14.GetClaimTypeResponse value) => value.writeToBuffer()));
+        ($0.GetClaimTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$14.ListClaimTypeRequest, $14.ListClaimTypeResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ListClaimTypeRequest, $0.ListClaimTypeResponse>(
         'List',
         list_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $14.ListClaimTypeRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ListClaimTypeRequest.fromBuffer(value),
-        ($14.ListClaimTypeResponse value) => value.writeToBuffer()));
+        ($0.ListClaimTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$14.UpdateClaimTypeRequest, $14.UpdateClaimTypeResponse>(
+    $addMethod($grpc.ServiceMethod<$0.UpdateClaimTypeRequest, $0.UpdateClaimTypeResponse>(
         'Update',
         update_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $14.UpdateClaimTypeRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.UpdateClaimTypeRequest.fromBuffer(value),
-        ($14.UpdateClaimTypeResponse value) => value.writeToBuffer()));
+        ($0.UpdateClaimTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$14.DeleteClaimTypeRequest, $14.DeleteClaimTypeResponse>(
+    $addMethod($grpc.ServiceMethod<$0.DeleteClaimTypeRequest, $0.DeleteClaimTypeResponse>(
         'Delete',
         delete_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $14.DeleteClaimTypeRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.DeleteClaimTypeRequest.fromBuffer(value),
-        ($14.DeleteClaimTypeResponse value) => value.writeToBuffer()));
+        ($0.DeleteClaimTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$14.DeleteClaimTypesForProjectRequest, $14.DeleteClaimTypesForProjectResponse>(
+    $addMethod($grpc.ServiceMethod<$0.DeleteClaimTypesForProjectRequest, $0.DeleteClaimTypesForProjectResponse>(
         'DeleteClaimTypesForProject',
         deleteClaimTypesForProject_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $14.DeleteClaimTypesForProjectRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.DeleteClaimTypesForProjectRequest.fromBuffer(value),
-        ($14.DeleteClaimTypesForProjectResponse value) => value.writeToBuffer()));
+        ($0.DeleteClaimTypesForProjectResponse value) => value.writeToBuffer()));
   }
 
-  $async.Future<$14.CreateClaimTypeResponse> create_Pre($grpc.ServiceCall $call, $async.Future<$14.CreateClaimTypeRequest> $request) async {
+  $async.Future<$0.CreateClaimTypeResponse> create_Pre($grpc.ServiceCall $call, $async.Future<$0.CreateClaimTypeRequest> $request) async {
     return create($call, await $request);
   }
 
-  $async.Future<$14.GetClaimTypeResponse> get_Pre($grpc.ServiceCall $call, $async.Future<$14.GetClaimTypeRequest> $request) async {
+  $async.Future<$0.CreateClaimTypeResponse> create($grpc.ServiceCall call, $0.CreateClaimTypeRequest request);
+
+  $async.Future<$0.GetClaimTypeResponse> get_Pre($grpc.ServiceCall $call, $async.Future<$0.GetClaimTypeRequest> $request) async {
     return get($call, await $request);
   }
 
-  $async.Future<$14.ListClaimTypeResponse> list_Pre($grpc.ServiceCall $call, $async.Future<$14.ListClaimTypeRequest> $request) async {
+  $async.Future<$0.GetClaimTypeResponse> get($grpc.ServiceCall call, $0.GetClaimTypeRequest request);
+
+  $async.Future<$0.ListClaimTypeResponse> list_Pre($grpc.ServiceCall $call, $async.Future<$0.ListClaimTypeRequest> $request) async {
     return list($call, await $request);
   }
 
-  $async.Future<$14.UpdateClaimTypeResponse> update_Pre($grpc.ServiceCall $call, $async.Future<$14.UpdateClaimTypeRequest> $request) async {
+  $async.Future<$0.ListClaimTypeResponse> list($grpc.ServiceCall call, $0.ListClaimTypeRequest request);
+
+  $async.Future<$0.UpdateClaimTypeResponse> update_Pre($grpc.ServiceCall $call, $async.Future<$0.UpdateClaimTypeRequest> $request) async {
     return update($call, await $request);
   }
 
-  $async.Future<$14.DeleteClaimTypeResponse> delete_Pre($grpc.ServiceCall $call, $async.Future<$14.DeleteClaimTypeRequest> $request) async {
+  $async.Future<$0.UpdateClaimTypeResponse> update($grpc.ServiceCall call, $0.UpdateClaimTypeRequest request);
+
+  $async.Future<$0.DeleteClaimTypeResponse> delete_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteClaimTypeRequest> $request) async {
     return delete($call, await $request);
   }
 
-  $async.Future<$14.DeleteClaimTypesForProjectResponse> deleteClaimTypesForProject_Pre($grpc.ServiceCall $call, $async.Future<$14.DeleteClaimTypesForProjectRequest> $request) async {
+  $async.Future<$0.DeleteClaimTypeResponse> delete($grpc.ServiceCall call, $0.DeleteClaimTypeRequest request);
+
+  $async.Future<$0.DeleteClaimTypesForProjectResponse> deleteClaimTypesForProject_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteClaimTypesForProjectRequest> $request) async {
     return deleteClaimTypesForProject($call, await $request);
   }
 
-  $async.Future<$14.CreateClaimTypeResponse> create($grpc.ServiceCall call, $14.CreateClaimTypeRequest request);
+  $async.Future<$0.DeleteClaimTypesForProjectResponse> deleteClaimTypesForProject($grpc.ServiceCall call, $0.DeleteClaimTypesForProjectRequest request);
-  $async.Future<$14.GetClaimTypeResponse> get($grpc.ServiceCall call, $14.GetClaimTypeRequest request);
+
-  $async.Future<$14.ListClaimTypeResponse> list($grpc.ServiceCall call, $14.ListClaimTypeRequest request);
-  $async.Future<$14.UpdateClaimTypeResponse> update($grpc.ServiceCall call, $14.UpdateClaimTypeRequest request);
-  $async.Future<$14.DeleteClaimTypeResponse> delete($grpc.ServiceCall call, $14.DeleteClaimTypeRequest request);
-  $async.Future<$14.DeleteClaimTypesForProjectResponse> deleteClaimTypesForProject($grpc.ServiceCall call, $14.DeleteClaimTypesForProjectRequest request);
 }

lib/claim-type.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from claim-type.proto.
-//  source: claim-type.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/claim.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from claim.proto.
-//  source: claim.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,8 +14,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'collabShared.pb.dart' as $76;
+import 'collabShared.pb.dart' as $1;
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $0;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
@@ -23,8 +23,8 @@ export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 /// Aggregation object message
 class Claim extends $pb.GeneratedMessage {
   factory Claim({
-    $3.EventHeader? lastEventHeader,
+    $0.EventHeader? lastEventHeader,
-    $3.EntityID? iD,
+    $0.EntityID? iD,
     ClaimPayload? payload,
   }) {
     final result = create();
@@ -40,8 +40,8 @@ class Claim extends $pb.GeneratedMessage {
   factory Claim.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Claim', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.EventHeader>(1, _omitFieldNames ? '' : 'LastEventHeader', protoName: 'LastEventHeader', subBuilder: $3.EventHeader.create)
+    ..aOM<$0.EventHeader>(1, _omitFieldNames ? '' : 'LastEventHeader', protoName: 'LastEventHeader', subBuilder: $0.EventHeader.create)
-    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
+    ..aOM<$0.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $0.EntityID.create)
     ..aOM<ClaimPayload>(3, _omitFieldNames ? '' : 'Payload', protoName: 'Payload', subBuilder: ClaimPayload.create)
     ..hasRequiredFields = false
   ;
@@ -64,26 +64,26 @@ class Claim extends $pb.GeneratedMessage {
   static Claim? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.EventHeader get lastEventHeader => $_getN(0);
+  $0.EventHeader get lastEventHeader => $_getN(0);
   @$pb.TagNumber(1)
-  set lastEventHeader($3.EventHeader value) => $_setField(1, value);
+  set lastEventHeader($0.EventHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasLastEventHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearLastEventHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.EventHeader ensureLastEventHeader() => $_ensure(0);
+  $0.EventHeader ensureLastEventHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $3.EntityID get iD => $_getN(1);
+  $0.EntityID get iD => $_getN(1);
   @$pb.TagNumber(2)
-  set iD($3.EntityID value) => $_setField(2, value);
+  set iD($0.EntityID value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasID() => $_has(1);
   @$pb.TagNumber(2)
   void clearID() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.EntityID ensureID() => $_ensure(1);
+  $0.EntityID ensureID() => $_ensure(1);
 
   @$pb.TagNumber(3)
   ClaimPayload get payload => $_getN(2);
@@ -101,22 +101,22 @@ class ClaimPayload extends $pb.GeneratedMessage {
   factory ClaimPayload({
     $core.String? claimTypeID,
     $core.String? entityID,
-    $3.ClaimCriticality? criticality,
+    $0.ClaimCriticality? criticality,
-    $76.ClaimStatusStruct? status,
+    $1.ClaimStatusStruct? status,
     $core.String? creationDate,
     $core.Iterable<$core.String>? assignees,
     $core.String? endComment,
-    $3.ClaimClosure? closure,
+    $0.ClaimClosure? closure,
-    $core.Iterable<$3.AttachmentSummary>? attachments,
+    $core.Iterable<$0.AttachmentSummary>? attachments,
     $core.int? attachmentNumber,
-    $3.Amount? amount,
+    $0.Amount? amount,
     $core.String? reason,
-    $3.ClaimSector? sector,
+    $0.ClaimSector? sector,
-    $3.ClaimEntityType? entityType,
+    $0.ClaimEntityType? entityType,
     $core.Iterable<$core.String>? removedAssignees,
     $core.Iterable<$core.String>? addedAssignees,
     $core.String? reasonCode,
-    $core.Iterable<$3.MetadataElement>? metaData,
+    $core.Iterable<$0.MetadataElement>? metaData,
     $core.String? title,
     $core.String? displayID,
   }) {
@@ -152,22 +152,22 @@ class ClaimPayload extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimPayload', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'ClaimTypeID', protoName: 'ClaimTypeID')
     ..aOS(2, _omitFieldNames ? '' : 'EntityID', protoName: 'EntityID')
-    ..e<$3.ClaimCriticality>(3, _omitFieldNames ? '' : 'Criticality', $pb.PbFieldType.OE, protoName: 'Criticality', defaultOrMaker: $3.ClaimCriticality.CLAIM_CRITICALITY_UNKNOWN, valueOf: $3.ClaimCriticality.valueOf, enumValues: $3.ClaimCriticality.values)
+    ..e<$0.ClaimCriticality>(3, _omitFieldNames ? '' : 'Criticality', $pb.PbFieldType.OE, protoName: 'Criticality', defaultOrMaker: $0.ClaimCriticality.CLAIM_CRITICALITY_UNKNOWN, valueOf: $0.ClaimCriticality.valueOf, enumValues: $0.ClaimCriticality.values)
-    ..aOM<$76.ClaimStatusStruct>(4, _omitFieldNames ? '' : 'Status', protoName: 'Status', subBuilder: $76.ClaimStatusStruct.create)
+    ..aOM<$1.ClaimStatusStruct>(4, _omitFieldNames ? '' : 'Status', protoName: 'Status', subBuilder: $1.ClaimStatusStruct.create)
     ..aOS(6, _omitFieldNames ? '' : 'CreationDate', protoName: 'CreationDate')
     ..pPS(7, _omitFieldNames ? '' : 'Assignees', protoName: 'Assignees')
     ..aOS(8, _omitFieldNames ? '' : 'EndComment', protoName: 'EndComment')
-    ..aOM<$3.ClaimClosure>(9, _omitFieldNames ? '' : 'Closure', protoName: 'Closure', subBuilder: $3.ClaimClosure.create)
+    ..aOM<$0.ClaimClosure>(9, _omitFieldNames ? '' : 'Closure', protoName: 'Closure', subBuilder: $0.ClaimClosure.create)
-    ..pc<$3.AttachmentSummary>(10, _omitFieldNames ? '' : 'Attachments', $pb.PbFieldType.PM, protoName: 'Attachments', subBuilder: $3.AttachmentSummary.create)
+    ..pc<$0.AttachmentSummary>(10, _omitFieldNames ? '' : 'Attachments', $pb.PbFieldType.PM, protoName: 'Attachments', subBuilder: $0.AttachmentSummary.create)
     ..a<$core.int>(11, _omitFieldNames ? '' : 'AttachmentNumber', $pb.PbFieldType.O3, protoName: 'AttachmentNumber')
-    ..aOM<$3.Amount>(12, _omitFieldNames ? '' : 'Amount', protoName: 'Amount', subBuilder: $3.Amount.create)
+    ..aOM<$0.Amount>(12, _omitFieldNames ? '' : 'Amount', protoName: 'Amount', subBuilder: $0.Amount.create)
     ..aOS(13, _omitFieldNames ? '' : 'Reason', protoName: 'Reason')
-    ..e<$3.ClaimSector>(14, _omitFieldNames ? '' : 'Sector', $pb.PbFieldType.OE, protoName: 'Sector', defaultOrMaker: $3.ClaimSector.CLAIM_SECTOR_UNKNOWN, valueOf: $3.ClaimSector.valueOf, enumValues: $3.ClaimSector.values)
+    ..e<$0.ClaimSector>(14, _omitFieldNames ? '' : 'Sector', $pb.PbFieldType.OE, protoName: 'Sector', defaultOrMaker: $0.ClaimSector.CLAIM_SECTOR_UNKNOWN, valueOf: $0.ClaimSector.valueOf, enumValues: $0.ClaimSector.values)
-    ..e<$3.ClaimEntityType>(15, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $3.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $3.ClaimEntityType.valueOf, enumValues: $3.ClaimEntityType.values)
+    ..e<$0.ClaimEntityType>(15, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $0.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $0.ClaimEntityType.valueOf, enumValues: $0.ClaimEntityType.values)
     ..pPS(16, _omitFieldNames ? '' : 'RemovedAssignees', protoName: 'RemovedAssignees')
     ..pPS(17, _omitFieldNames ? '' : 'AddedAssignees', protoName: 'AddedAssignees')
     ..aOS(18, _omitFieldNames ? '' : 'ReasonCode', protoName: 'ReasonCode')
-    ..pc<$3.MetadataElement>(19, _omitFieldNames ? '' : 'MetaData', $pb.PbFieldType.PM, protoName: 'MetaData', subBuilder: $3.MetadataElement.create)
+    ..pc<$0.MetadataElement>(19, _omitFieldNames ? '' : 'MetaData', $pb.PbFieldType.PM, protoName: 'MetaData', subBuilder: $0.MetadataElement.create)
     ..aOS(20, _omitFieldNames ? '' : 'Title', protoName: 'Title')
     ..aOS(21, _omitFieldNames ? '' : 'DisplayID', protoName: 'DisplayID')
     ..hasRequiredFields = false
@@ -212,9 +212,9 @@ class ClaimPayload extends $pb.GeneratedMessage {
 
   /// Criticality of the claim
   @$pb.TagNumber(3)
-  $3.ClaimCriticality get criticality => $_getN(2);
+  $0.ClaimCriticality get criticality => $_getN(2);
   @$pb.TagNumber(3)
-  set criticality($3.ClaimCriticality value) => $_setField(3, value);
+  set criticality($0.ClaimCriticality value) => $_setField(3, value);
   @$pb.TagNumber(3)
   $core.bool hasCriticality() => $_has(2);
   @$pb.TagNumber(3)
@@ -222,15 +222,15 @@ class ClaimPayload extends $pb.GeneratedMessage {
 
   /// Status of the claim
   @$pb.TagNumber(4)
-  $76.ClaimStatusStruct get status => $_getN(3);
+  $1.ClaimStatusStruct get status => $_getN(3);
   @$pb.TagNumber(4)
-  set status($76.ClaimStatusStruct value) => $_setField(4, value);
+  set status($1.ClaimStatusStruct value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasStatus() => $_has(3);
   @$pb.TagNumber(4)
   void clearStatus() => $_clearField(4);
   @$pb.TagNumber(4)
-  $76.ClaimStatusStruct ensureStatus() => $_ensure(3);
+  $1.ClaimStatusStruct ensureStatus() => $_ensure(3);
 
   /// Creation date of the claim
   @$pb.TagNumber(6)
@@ -258,18 +258,18 @@ class ClaimPayload extends $pb.GeneratedMessage {
 
   /// Closure responsible and causes of the claim
   @$pb.TagNumber(9)
-  $3.ClaimClosure get closure => $_getN(7);
+  $0.ClaimClosure get closure => $_getN(7);
   @$pb.TagNumber(9)
-  set closure($3.ClaimClosure value) => $_setField(9, value);
+  set closure($0.ClaimClosure value) => $_setField(9, value);
   @$pb.TagNumber(9)
   $core.bool hasClosure() => $_has(7);
   @$pb.TagNumber(9)
   void clearClosure() => $_clearField(9);
   @$pb.TagNumber(9)
-  $3.ClaimClosure ensureClosure() => $_ensure(7);
+  $0.ClaimClosure ensureClosure() => $_ensure(7);
 
   @$pb.TagNumber(10)
-  $pb.PbList<$3.AttachmentSummary> get attachments => $_getList(8);
+  $pb.PbList<$0.AttachmentSummary> get attachments => $_getList(8);
 
   @$pb.TagNumber(11)
   $core.int get attachmentNumber => $_getIZ(9);
@@ -281,15 +281,15 @@ class ClaimPayload extends $pb.GeneratedMessage {
   void clearAttachmentNumber() => $_clearField(11);
 
   @$pb.TagNumber(12)
-  $3.Amount get amount => $_getN(10);
+  $0.Amount get amount => $_getN(10);
   @$pb.TagNumber(12)
-  set amount($3.Amount value) => $_setField(12, value);
+  set amount($0.Amount value) => $_setField(12, value);
   @$pb.TagNumber(12)
   $core.bool hasAmount() => $_has(10);
   @$pb.TagNumber(12)
   void clearAmount() => $_clearField(12);
   @$pb.TagNumber(12)
-  $3.Amount ensureAmount() => $_ensure(10);
+  $0.Amount ensureAmount() => $_ensure(10);
 
   @$pb.TagNumber(13)
   $core.String get reason => $_getSZ(11);
@@ -301,18 +301,18 @@ class ClaimPayload extends $pb.GeneratedMessage {
   void clearReason() => $_clearField(13);
 
   @$pb.TagNumber(14)
-  $3.ClaimSector get sector => $_getN(12);
+  $0.ClaimSector get sector => $_getN(12);
   @$pb.TagNumber(14)
-  set sector($3.ClaimSector value) => $_setField(14, value);
+  set sector($0.ClaimSector value) => $_setField(14, value);
   @$pb.TagNumber(14)
   $core.bool hasSector() => $_has(12);
   @$pb.TagNumber(14)
   void clearSector() => $_clearField(14);
 
   @$pb.TagNumber(15)
-  $3.ClaimEntityType get entityType => $_getN(13);
+  $0.ClaimEntityType get entityType => $_getN(13);
   @$pb.TagNumber(15)
-  set entityType($3.ClaimEntityType value) => $_setField(15, value);
+  set entityType($0.ClaimEntityType value) => $_setField(15, value);
   @$pb.TagNumber(15)
   $core.bool hasEntityType() => $_has(13);
   @$pb.TagNumber(15)
@@ -337,7 +337,7 @@ class ClaimPayload extends $pb.GeneratedMessage {
 
   /// Metadata are characteristics specific to the project. They can be of several data form (string, integer, float, boolean or timestamp)
   @$pb.TagNumber(19)
-  $pb.PbList<$3.MetadataElement> get metaData => $_getList(17);
+  $pb.PbList<$0.MetadataElement> get metaData => $_getList(17);
 
   /// Title of the claim
   @$pb.TagNumber(20)

lib/claim.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from claim.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/claim.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from claim.proto.
-//  source: claim.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/claimAction.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from claimAction.proto.
-//  source: claimAction.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,8 +14,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'collabShared.pb.dart' as $76;
+import 'collabShared.pb.dart' as $0;
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
@@ -24,18 +24,18 @@ export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 class ClaimNotifyPayload extends $pb.GeneratedMessage {
   factory ClaimNotifyPayload({
     $core.Iterable<$core.String>? assignees,
-    $76.ClaimStatusStruct? status,
+    $0.ClaimStatusStruct? status,
     $core.Iterable<$core.String>? removedAssignees,
-    $3.Amount? amount,
+    $1.Amount? amount,
-    $3.ClaimCriticality? criticality,
+    $1.ClaimCriticality? criticality,
     $core.String? endComment,
-    $3.ClaimClosure? closure,
+    $1.ClaimClosure? closure,
     $core.Iterable<$core.String>? addedAssignees,
     $core.String? reason,
-    $3.ClaimEntityType? entityType,
+    $1.ClaimEntityType? entityType,
     $core.String? entityID,
     $core.String? title,
-    $core.Iterable<$3.MetadataElement>? metaData,
+    $core.Iterable<$1.MetadataElement>? metaData,
     $core.String? displayID,
   }) {
     final result = create();
@@ -63,18 +63,18 @@ class ClaimNotifyPayload extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimNotifyPayload', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..pPS(1, _omitFieldNames ? '' : 'Assignees', protoName: 'Assignees')
-    ..aOM<$76.ClaimStatusStruct>(2, _omitFieldNames ? '' : 'Status', protoName: 'Status', subBuilder: $76.ClaimStatusStruct.create)
+    ..aOM<$0.ClaimStatusStruct>(2, _omitFieldNames ? '' : 'Status', protoName: 'Status', subBuilder: $0.ClaimStatusStruct.create)
     ..pPS(3, _omitFieldNames ? '' : 'RemovedAssignees', protoName: 'RemovedAssignees')
-    ..aOM<$3.Amount>(4, _omitFieldNames ? '' : 'Amount', protoName: 'Amount', subBuilder: $3.Amount.create)
+    ..aOM<$1.Amount>(4, _omitFieldNames ? '' : 'Amount', protoName: 'Amount', subBuilder: $1.Amount.create)
-    ..e<$3.ClaimCriticality>(5, _omitFieldNames ? '' : 'Criticality', $pb.PbFieldType.OE, protoName: 'Criticality', defaultOrMaker: $3.ClaimCriticality.CLAIM_CRITICALITY_UNKNOWN, valueOf: $3.ClaimCriticality.valueOf, enumValues: $3.ClaimCriticality.values)
+    ..e<$1.ClaimCriticality>(5, _omitFieldNames ? '' : 'Criticality', $pb.PbFieldType.OE, protoName: 'Criticality', defaultOrMaker: $1.ClaimCriticality.CLAIM_CRITICALITY_UNKNOWN, valueOf: $1.ClaimCriticality.valueOf, enumValues: $1.ClaimCriticality.values)
     ..aOS(6, _omitFieldNames ? '' : 'EndComment', protoName: 'EndComment')
-    ..aOM<$3.ClaimClosure>(7, _omitFieldNames ? '' : 'Closure', protoName: 'Closure', subBuilder: $3.ClaimClosure.create)
+    ..aOM<$1.ClaimClosure>(7, _omitFieldNames ? '' : 'Closure', protoName: 'Closure', subBuilder: $1.ClaimClosure.create)
     ..pPS(8, _omitFieldNames ? '' : 'AddedAssignees', protoName: 'AddedAssignees')
     ..aOS(9, _omitFieldNames ? '' : 'Reason', protoName: 'Reason')
-    ..e<$3.ClaimEntityType>(10, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $3.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $3.ClaimEntityType.valueOf, enumValues: $3.ClaimEntityType.values)
+    ..e<$1.ClaimEntityType>(10, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $1.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $1.ClaimEntityType.valueOf, enumValues: $1.ClaimEntityType.values)
     ..aOS(11, _omitFieldNames ? '' : 'EntityID', protoName: 'EntityID')
     ..aOS(12, _omitFieldNames ? '' : 'Title', protoName: 'Title')
-    ..pc<$3.MetadataElement>(13, _omitFieldNames ? '' : 'MetaData', $pb.PbFieldType.PM, protoName: 'MetaData', subBuilder: $3.MetadataElement.create)
+    ..pc<$1.MetadataElement>(13, _omitFieldNames ? '' : 'MetaData', $pb.PbFieldType.PM, protoName: 'MetaData', subBuilder: $1.MetadataElement.create)
     ..aOS(14, _omitFieldNames ? '' : 'DisplayID', protoName: 'DisplayID')
     ..hasRequiredFields = false
   ;
@@ -100,34 +100,34 @@ class ClaimNotifyPayload extends $pb.GeneratedMessage {
   $pb.PbList<$core.String> get assignees => $_getList(0);
 
   @$pb.TagNumber(2)
-  $76.ClaimStatusStruct get status => $_getN(1);
+  $0.ClaimStatusStruct get status => $_getN(1);
   @$pb.TagNumber(2)
-  set status($76.ClaimStatusStruct value) => $_setField(2, value);
+  set status($0.ClaimStatusStruct value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasStatus() => $_has(1);
   @$pb.TagNumber(2)
   void clearStatus() => $_clearField(2);
   @$pb.TagNumber(2)
-  $76.ClaimStatusStruct ensureStatus() => $_ensure(1);
+  $0.ClaimStatusStruct ensureStatus() => $_ensure(1);
 
   @$pb.TagNumber(3)
   $pb.PbList<$core.String> get removedAssignees => $_getList(2);
 
   @$pb.TagNumber(4)
-  $3.Amount get amount => $_getN(3);
+  $1.Amount get amount => $_getN(3);
   @$pb.TagNumber(4)
-  set amount($3.Amount value) => $_setField(4, value);
+  set amount($1.Amount value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasAmount() => $_has(3);
   @$pb.TagNumber(4)
   void clearAmount() => $_clearField(4);
   @$pb.TagNumber(4)
-  $3.Amount ensureAmount() => $_ensure(3);
+  $1.Amount ensureAmount() => $_ensure(3);
 
   @$pb.TagNumber(5)
-  $3.ClaimCriticality get criticality => $_getN(4);
+  $1.ClaimCriticality get criticality => $_getN(4);
   @$pb.TagNumber(5)
-  set criticality($3.ClaimCriticality value) => $_setField(5, value);
+  set criticality($1.ClaimCriticality value) => $_setField(5, value);
   @$pb.TagNumber(5)
   $core.bool hasCriticality() => $_has(4);
   @$pb.TagNumber(5)
@@ -143,15 +143,15 @@ class ClaimNotifyPayload extends $pb.GeneratedMessage {
   void clearEndComment() => $_clearField(6);
 
   @$pb.TagNumber(7)
-  $3.ClaimClosure get closure => $_getN(6);
+  $1.ClaimClosure get closure => $_getN(6);
   @$pb.TagNumber(7)
-  set closure($3.ClaimClosure value) => $_setField(7, value);
+  set closure($1.ClaimClosure value) => $_setField(7, value);
   @$pb.TagNumber(7)
   $core.bool hasClosure() => $_has(6);
   @$pb.TagNumber(7)
   void clearClosure() => $_clearField(7);
   @$pb.TagNumber(7)
-  $3.ClaimClosure ensureClosure() => $_ensure(6);
+  $1.ClaimClosure ensureClosure() => $_ensure(6);
 
   @$pb.TagNumber(8)
   $pb.PbList<$core.String> get addedAssignees => $_getList(7);
@@ -166,9 +166,9 @@ class ClaimNotifyPayload extends $pb.GeneratedMessage {
   void clearReason() => $_clearField(9);
 
   @$pb.TagNumber(10)
-  $3.ClaimEntityType get entityType => $_getN(9);
+  $1.ClaimEntityType get entityType => $_getN(9);
   @$pb.TagNumber(10)
-  set entityType($3.ClaimEntityType value) => $_setField(10, value);
+  set entityType($1.ClaimEntityType value) => $_setField(10, value);
   @$pb.TagNumber(10)
   $core.bool hasEntityType() => $_has(9);
   @$pb.TagNumber(10)
@@ -193,7 +193,7 @@ class ClaimNotifyPayload extends $pb.GeneratedMessage {
   void clearTitle() => $_clearField(12);
 
   @$pb.TagNumber(13)
-  $pb.PbList<$3.MetadataElement> get metaData => $_getList(12);
+  $pb.PbList<$1.MetadataElement> get metaData => $_getList(12);
 
   @$pb.TagNumber(14)
   $core.String get displayID => $_getSZ(13);
@@ -207,8 +207,8 @@ class ClaimNotifyPayload extends $pb.GeneratedMessage {
 
 class ClaimNotify extends $pb.GeneratedMessage {
   factory ClaimNotify({
-    $3.CommandHeader? header,
+    $1.CommandHeader? header,
-    $3.EntityID? iD,
+    $1.EntityID? iD,
     ClaimNotifyPayload? payload,
     ClaimNotifyPayload? eventPayload,
     ClaimNotifyPayload? previousPayload,
@@ -228,8 +228,8 @@ class ClaimNotify extends $pb.GeneratedMessage {
   factory ClaimNotify.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimNotify', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.CommandHeader.create)
+    ..aOM<$1.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.CommandHeader.create)
-    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
+    ..aOM<$1.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $1.EntityID.create)
     ..aOM<ClaimNotifyPayload>(3, _omitFieldNames ? '' : 'Payload', protoName: 'Payload', subBuilder: ClaimNotifyPayload.create)
     ..aOM<ClaimNotifyPayload>(4, _omitFieldNames ? '' : 'EventPayload', protoName: 'EventPayload', subBuilder: ClaimNotifyPayload.create)
     ..aOM<ClaimNotifyPayload>(5, _omitFieldNames ? '' : 'PreviousPayload', protoName: 'PreviousPayload', subBuilder: ClaimNotifyPayload.create)
@@ -254,26 +254,26 @@ class ClaimNotify extends $pb.GeneratedMessage {
   static ClaimNotify? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.CommandHeader get header => $_getN(0);
+  $1.CommandHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.CommandHeader value) => $_setField(1, value);
+  set header($1.CommandHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.CommandHeader ensureHeader() => $_ensure(0);
+  $1.CommandHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $3.EntityID get iD => $_getN(1);
+  $1.EntityID get iD => $_getN(1);
   @$pb.TagNumber(2)
-  set iD($3.EntityID value) => $_setField(2, value);
+  set iD($1.EntityID value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasID() => $_has(1);
   @$pb.TagNumber(2)
   void clearID() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.EntityID ensureID() => $_ensure(1);
+  $1.EntityID ensureID() => $_ensure(1);
 
   @$pb.TagNumber(3)
   ClaimNotifyPayload get payload => $_getN(2);
@@ -316,7 +316,7 @@ class ClaimPropagateActorPayload extends $pb.GeneratedMessage {
     $core.String? entityID,
     $core.String? claimTypeID,
     $core.String? reason,
-    $3.ClaimEntityType? entityType,
+    $1.ClaimEntityType? entityType,
   }) {
     final result = create();
     if (entityID != null) result.entityID = entityID;
@@ -335,7 +335,7 @@ class ClaimPropagateActorPayload extends $pb.GeneratedMessage {
     ..aOS(1, _omitFieldNames ? '' : 'EntityID', protoName: 'EntityID')
     ..aOS(2, _omitFieldNames ? '' : 'ClaimTypeID', protoName: 'ClaimTypeID')
     ..aOS(3, _omitFieldNames ? '' : 'Reason', protoName: 'Reason')
-    ..e<$3.ClaimEntityType>(4, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $3.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $3.ClaimEntityType.valueOf, enumValues: $3.ClaimEntityType.values)
+    ..e<$1.ClaimEntityType>(4, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $1.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $1.ClaimEntityType.valueOf, enumValues: $1.ClaimEntityType.values)
     ..hasRequiredFields = false
   ;
 
@@ -386,9 +386,9 @@ class ClaimPropagateActorPayload extends $pb.GeneratedMessage {
   void clearReason() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $3.ClaimEntityType get entityType => $_getN(3);
+  $1.ClaimEntityType get entityType => $_getN(3);
   @$pb.TagNumber(4)
-  set entityType($3.ClaimEntityType value) => $_setField(4, value);
+  set entityType($1.ClaimEntityType value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasEntityType() => $_has(3);
   @$pb.TagNumber(4)
@@ -397,8 +397,8 @@ class ClaimPropagateActorPayload extends $pb.GeneratedMessage {
 
 class ClaimPropagateActor extends $pb.GeneratedMessage {
   factory ClaimPropagateActor({
-    $3.CommandHeader? header,
+    $1.CommandHeader? header,
-    $3.EntityID? iD,
+    $1.EntityID? iD,
     ClaimPropagateActorPayload? payload,
     ClaimPropagateActorPayload? eventPayload,
     ClaimPropagateActorPayload? previousPayload,
@@ -418,8 +418,8 @@ class ClaimPropagateActor extends $pb.GeneratedMessage {
   factory ClaimPropagateActor.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimPropagateActor', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.CommandHeader.create)
+    ..aOM<$1.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.CommandHeader.create)
-    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
+    ..aOM<$1.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $1.EntityID.create)
     ..aOM<ClaimPropagateActorPayload>(3, _omitFieldNames ? '' : 'Payload', protoName: 'Payload', subBuilder: ClaimPropagateActorPayload.create)
     ..aOM<ClaimPropagateActorPayload>(4, _omitFieldNames ? '' : 'EventPayload', protoName: 'EventPayload', subBuilder: ClaimPropagateActorPayload.create)
     ..aOM<ClaimPropagateActorPayload>(5, _omitFieldNames ? '' : 'PreviousPayload', protoName: 'PreviousPayload', subBuilder: ClaimPropagateActorPayload.create)
@@ -444,26 +444,26 @@ class ClaimPropagateActor extends $pb.GeneratedMessage {
   static ClaimPropagateActor? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.CommandHeader get header => $_getN(0);
+  $1.CommandHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.CommandHeader value) => $_setField(1, value);
+  set header($1.CommandHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.CommandHeader ensureHeader() => $_ensure(0);
+  $1.CommandHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $3.EntityID get iD => $_getN(1);
+  $1.EntityID get iD => $_getN(1);
   @$pb.TagNumber(2)
-  set iD($3.EntityID value) => $_setField(2, value);
+  set iD($1.EntityID value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasID() => $_has(1);
   @$pb.TagNumber(2)
   void clearID() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.EntityID ensureID() => $_ensure(1);
+  $1.EntityID ensureID() => $_ensure(1);
 
   @$pb.TagNumber(3)
   ClaimPropagateActorPayload get payload => $_getN(2);
@@ -506,7 +506,7 @@ class ClaimPropagateHandlingunitPayload extends $pb.GeneratedMessage {
     $core.String? entityID,
     $core.String? claimTypeID,
     $core.String? reason,
-    $3.ClaimEntityType? entityType,
+    $1.ClaimEntityType? entityType,
   }) {
     final result = create();
     if (entityID != null) result.entityID = entityID;
@@ -525,7 +525,7 @@ class ClaimPropagateHandlingunitPayload extends $pb.GeneratedMessage {
     ..aOS(1, _omitFieldNames ? '' : 'EntityID', protoName: 'EntityID')
     ..aOS(2, _omitFieldNames ? '' : 'ClaimTypeID', protoName: 'ClaimTypeID')
     ..aOS(3, _omitFieldNames ? '' : 'Reason', protoName: 'Reason')
-    ..e<$3.ClaimEntityType>(4, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $3.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $3.ClaimEntityType.valueOf, enumValues: $3.ClaimEntityType.values)
+    ..e<$1.ClaimEntityType>(4, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $1.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $1.ClaimEntityType.valueOf, enumValues: $1.ClaimEntityType.values)
     ..hasRequiredFields = false
   ;
 
@@ -576,9 +576,9 @@ class ClaimPropagateHandlingunitPayload extends $pb.GeneratedMessage {
   void clearReason() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $3.ClaimEntityType get entityType => $_getN(3);
+  $1.ClaimEntityType get entityType => $_getN(3);
   @$pb.TagNumber(4)
-  set entityType($3.ClaimEntityType value) => $_setField(4, value);
+  set entityType($1.ClaimEntityType value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasEntityType() => $_has(3);
   @$pb.TagNumber(4)
@@ -587,8 +587,8 @@ class ClaimPropagateHandlingunitPayload extends $pb.GeneratedMessage {
 
 class ClaimPropagateHandlingunit extends $pb.GeneratedMessage {
   factory ClaimPropagateHandlingunit({
-    $3.CommandHeader? header,
+    $1.CommandHeader? header,
-    $3.EntityID? iD,
+    $1.EntityID? iD,
     ClaimPropagateHandlingunitPayload? payload,
     ClaimPropagateHandlingunitPayload? eventPayload,
     ClaimPropagateHandlingunitPayload? previousPayload,
@@ -608,8 +608,8 @@ class ClaimPropagateHandlingunit extends $pb.GeneratedMessage {
   factory ClaimPropagateHandlingunit.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimPropagateHandlingunit', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.CommandHeader.create)
+    ..aOM<$1.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.CommandHeader.create)
-    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
+    ..aOM<$1.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $1.EntityID.create)
     ..aOM<ClaimPropagateHandlingunitPayload>(3, _omitFieldNames ? '' : 'Payload', protoName: 'Payload', subBuilder: ClaimPropagateHandlingunitPayload.create)
     ..aOM<ClaimPropagateHandlingunitPayload>(4, _omitFieldNames ? '' : 'EventPayload', protoName: 'EventPayload', subBuilder: ClaimPropagateHandlingunitPayload.create)
     ..aOM<ClaimPropagateHandlingunitPayload>(5, _omitFieldNames ? '' : 'PreviousPayload', protoName: 'PreviousPayload', subBuilder: ClaimPropagateHandlingunitPayload.create)
@@ -634,26 +634,26 @@ class ClaimPropagateHandlingunit extends $pb.GeneratedMessage {
   static ClaimPropagateHandlingunit? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.CommandHeader get header => $_getN(0);
+  $1.CommandHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.CommandHeader value) => $_setField(1, value);
+  set header($1.CommandHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.CommandHeader ensureHeader() => $_ensure(0);
+  $1.CommandHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $3.EntityID get iD => $_getN(1);
+  $1.EntityID get iD => $_getN(1);
   @$pb.TagNumber(2)
-  set iD($3.EntityID value) => $_setField(2, value);
+  set iD($1.EntityID value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasID() => $_has(1);
   @$pb.TagNumber(2)
   void clearID() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.EntityID ensureID() => $_ensure(1);
+  $1.EntityID ensureID() => $_ensure(1);
 
   @$pb.TagNumber(3)
   ClaimPropagateHandlingunitPayload get payload => $_getN(2);
@@ -696,7 +696,7 @@ class ClaimPropagateOrderPayload extends $pb.GeneratedMessage {
     $core.String? entityID,
     $core.String? claimTypeID,
     $core.String? reason,
-    $3.ClaimEntityType? entityType,
+    $1.ClaimEntityType? entityType,
   }) {
     final result = create();
     if (entityID != null) result.entityID = entityID;
@@ -715,7 +715,7 @@ class ClaimPropagateOrderPayload extends $pb.GeneratedMessage {
     ..aOS(1, _omitFieldNames ? '' : 'EntityID', protoName: 'EntityID')
     ..aOS(2, _omitFieldNames ? '' : 'ClaimTypeID', protoName: 'ClaimTypeID')
     ..aOS(3, _omitFieldNames ? '' : 'Reason', protoName: 'Reason')
-    ..e<$3.ClaimEntityType>(4, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $3.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $3.ClaimEntityType.valueOf, enumValues: $3.ClaimEntityType.values)
+    ..e<$1.ClaimEntityType>(4, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $1.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $1.ClaimEntityType.valueOf, enumValues: $1.ClaimEntityType.values)
     ..hasRequiredFields = false
   ;
 
@@ -766,9 +766,9 @@ class ClaimPropagateOrderPayload extends $pb.GeneratedMessage {
   void clearReason() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $3.ClaimEntityType get entityType => $_getN(3);
+  $1.ClaimEntityType get entityType => $_getN(3);
   @$pb.TagNumber(4)
-  set entityType($3.ClaimEntityType value) => $_setField(4, value);
+  set entityType($1.ClaimEntityType value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasEntityType() => $_has(3);
   @$pb.TagNumber(4)
@@ -777,8 +777,8 @@ class ClaimPropagateOrderPayload extends $pb.GeneratedMessage {
 
 class ClaimPropagateOrder extends $pb.GeneratedMessage {
   factory ClaimPropagateOrder({
-    $3.CommandHeader? header,
+    $1.CommandHeader? header,
-    $3.EntityID? iD,
+    $1.EntityID? iD,
     ClaimPropagateOrderPayload? payload,
     ClaimPropagateOrderPayload? eventPayload,
     ClaimPropagateOrderPayload? previousPayload,
@@ -798,8 +798,8 @@ class ClaimPropagateOrder extends $pb.GeneratedMessage {
   factory ClaimPropagateOrder.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimPropagateOrder', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.CommandHeader.create)
+    ..aOM<$1.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.CommandHeader.create)
-    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
+    ..aOM<$1.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $1.EntityID.create)
     ..aOM<ClaimPropagateOrderPayload>(3, _omitFieldNames ? '' : 'Payload', protoName: 'Payload', subBuilder: ClaimPropagateOrderPayload.create)
     ..aOM<ClaimPropagateOrderPayload>(4, _omitFieldNames ? '' : 'EventPayload', protoName: 'EventPayload', subBuilder: ClaimPropagateOrderPayload.create)
     ..aOM<ClaimPropagateOrderPayload>(5, _omitFieldNames ? '' : 'PreviousPayload', protoName: 'PreviousPayload', subBuilder: ClaimPropagateOrderPayload.create)
@@ -824,26 +824,26 @@ class ClaimPropagateOrder extends $pb.GeneratedMessage {
   static ClaimPropagateOrder? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.CommandHeader get header => $_getN(0);
+  $1.CommandHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.CommandHeader value) => $_setField(1, value);
+  set header($1.CommandHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.CommandHeader ensureHeader() => $_ensure(0);
+  $1.CommandHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $3.EntityID get iD => $_getN(1);
+  $1.EntityID get iD => $_getN(1);
   @$pb.TagNumber(2)
-  set iD($3.EntityID value) => $_setField(2, value);
+  set iD($1.EntityID value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasID() => $_has(1);
   @$pb.TagNumber(2)
   void clearID() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.EntityID ensureID() => $_ensure(1);
+  $1.EntityID ensureID() => $_ensure(1);
 
   @$pb.TagNumber(3)
   ClaimPropagateOrderPayload get payload => $_getN(2);
@@ -886,7 +886,7 @@ class ClaimPropagateExecutionflowPayload extends $pb.GeneratedMessage {
     $core.String? entityID,
     $core.String? claimTypeID,
     $core.String? reason,
-    $3.ClaimEntityType? entityType,
+    $1.ClaimEntityType? entityType,
   }) {
     final result = create();
     if (entityID != null) result.entityID = entityID;
@@ -905,7 +905,7 @@ class ClaimPropagateExecutionflowPayload extends $pb.GeneratedMessage {
     ..aOS(1, _omitFieldNames ? '' : 'EntityID', protoName: 'EntityID')
     ..aOS(2, _omitFieldNames ? '' : 'ClaimTypeID', protoName: 'ClaimTypeID')
     ..aOS(3, _omitFieldNames ? '' : 'Reason', protoName: 'Reason')
-    ..e<$3.ClaimEntityType>(4, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $3.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $3.ClaimEntityType.valueOf, enumValues: $3.ClaimEntityType.values)
+    ..e<$1.ClaimEntityType>(4, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $1.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $1.ClaimEntityType.valueOf, enumValues: $1.ClaimEntityType.values)
     ..hasRequiredFields = false
   ;
 
@@ -956,9 +956,9 @@ class ClaimPropagateExecutionflowPayload extends $pb.GeneratedMessage {
   void clearReason() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $3.ClaimEntityType get entityType => $_getN(3);
+  $1.ClaimEntityType get entityType => $_getN(3);
   @$pb.TagNumber(4)
-  set entityType($3.ClaimEntityType value) => $_setField(4, value);
+  set entityType($1.ClaimEntityType value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasEntityType() => $_has(3);
   @$pb.TagNumber(4)
@@ -967,8 +967,8 @@ class ClaimPropagateExecutionflowPayload extends $pb.GeneratedMessage {
 
 class ClaimPropagateExecutionflow extends $pb.GeneratedMessage {
   factory ClaimPropagateExecutionflow({
-    $3.CommandHeader? header,
+    $1.CommandHeader? header,
-    $3.EntityID? iD,
+    $1.EntityID? iD,
     ClaimPropagateExecutionflowPayload? payload,
     ClaimPropagateExecutionflowPayload? eventPayload,
     ClaimPropagateExecutionflowPayload? previousPayload,
@@ -988,8 +988,8 @@ class ClaimPropagateExecutionflow extends $pb.GeneratedMessage {
   factory ClaimPropagateExecutionflow.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimPropagateExecutionflow', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.CommandHeader.create)
+    ..aOM<$1.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.CommandHeader.create)
-    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
+    ..aOM<$1.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $1.EntityID.create)
     ..aOM<ClaimPropagateExecutionflowPayload>(3, _omitFieldNames ? '' : 'Payload', protoName: 'Payload', subBuilder: ClaimPropagateExecutionflowPayload.create)
     ..aOM<ClaimPropagateExecutionflowPayload>(4, _omitFieldNames ? '' : 'EventPayload', protoName: 'EventPayload', subBuilder: ClaimPropagateExecutionflowPayload.create)
     ..aOM<ClaimPropagateExecutionflowPayload>(5, _omitFieldNames ? '' : 'PreviousPayload', protoName: 'PreviousPayload', subBuilder: ClaimPropagateExecutionflowPayload.create)
@@ -1014,26 +1014,26 @@ class ClaimPropagateExecutionflow extends $pb.GeneratedMessage {
   static ClaimPropagateExecutionflow? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.CommandHeader get header => $_getN(0);
+  $1.CommandHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.CommandHeader value) => $_setField(1, value);
+  set header($1.CommandHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.CommandHeader ensureHeader() => $_ensure(0);
+  $1.CommandHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $3.EntityID get iD => $_getN(1);
+  $1.EntityID get iD => $_getN(1);
   @$pb.TagNumber(2)
-  set iD($3.EntityID value) => $_setField(2, value);
+  set iD($1.EntityID value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasID() => $_has(1);
   @$pb.TagNumber(2)
   void clearID() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.EntityID ensureID() => $_ensure(1);
+  $1.EntityID ensureID() => $_ensure(1);
 
   @$pb.TagNumber(3)
   ClaimPropagateExecutionflowPayload get payload => $_getN(2);
@@ -1076,7 +1076,7 @@ class ClaimPropagateMovementPayload extends $pb.GeneratedMessage {
     $core.String? entityID,
     $core.String? claimTypeID,
     $core.String? reason,
-    $3.ClaimEntityType? entityType,
+    $1.ClaimEntityType? entityType,
   }) {
     final result = create();
     if (entityID != null) result.entityID = entityID;
@@ -1095,7 +1095,7 @@ class ClaimPropagateMovementPayload extends $pb.GeneratedMessage {
     ..aOS(1, _omitFieldNames ? '' : 'EntityID', protoName: 'EntityID')
     ..aOS(2, _omitFieldNames ? '' : 'ClaimTypeID', protoName: 'ClaimTypeID')
     ..aOS(3, _omitFieldNames ? '' : 'Reason', protoName: 'Reason')
-    ..e<$3.ClaimEntityType>(4, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $3.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $3.ClaimEntityType.valueOf, enumValues: $3.ClaimEntityType.values)
+    ..e<$1.ClaimEntityType>(4, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $1.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $1.ClaimEntityType.valueOf, enumValues: $1.ClaimEntityType.values)
     ..hasRequiredFields = false
   ;
 
@@ -1146,9 +1146,9 @@ class ClaimPropagateMovementPayload extends $pb.GeneratedMessage {
   void clearReason() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $3.ClaimEntityType get entityType => $_getN(3);
+  $1.ClaimEntityType get entityType => $_getN(3);
   @$pb.TagNumber(4)
-  set entityType($3.ClaimEntityType value) => $_setField(4, value);
+  set entityType($1.ClaimEntityType value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasEntityType() => $_has(3);
   @$pb.TagNumber(4)
@@ -1157,8 +1157,8 @@ class ClaimPropagateMovementPayload extends $pb.GeneratedMessage {
 
 class ClaimPropagateMovement extends $pb.GeneratedMessage {
   factory ClaimPropagateMovement({
-    $3.CommandHeader? header,
+    $1.CommandHeader? header,
-    $3.EntityID? iD,
+    $1.EntityID? iD,
     ClaimPropagateMovementPayload? payload,
     ClaimPropagateMovementPayload? eventPayload,
     ClaimPropagateMovementPayload? previousPayload,
@@ -1178,8 +1178,8 @@ class ClaimPropagateMovement extends $pb.GeneratedMessage {
   factory ClaimPropagateMovement.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimPropagateMovement', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.CommandHeader.create)
+    ..aOM<$1.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.CommandHeader.create)
-    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
+    ..aOM<$1.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $1.EntityID.create)
     ..aOM<ClaimPropagateMovementPayload>(3, _omitFieldNames ? '' : 'Payload', protoName: 'Payload', subBuilder: ClaimPropagateMovementPayload.create)
     ..aOM<ClaimPropagateMovementPayload>(4, _omitFieldNames ? '' : 'EventPayload', protoName: 'EventPayload', subBuilder: ClaimPropagateMovementPayload.create)
     ..aOM<ClaimPropagateMovementPayload>(5, _omitFieldNames ? '' : 'PreviousPayload', protoName: 'PreviousPayload', subBuilder: ClaimPropagateMovementPayload.create)
@@ -1204,26 +1204,26 @@ class ClaimPropagateMovement extends $pb.GeneratedMessage {
   static ClaimPropagateMovement? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.CommandHeader get header => $_getN(0);
+  $1.CommandHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.CommandHeader value) => $_setField(1, value);
+  set header($1.CommandHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.CommandHeader ensureHeader() => $_ensure(0);
+  $1.CommandHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $3.EntityID get iD => $_getN(1);
+  $1.EntityID get iD => $_getN(1);
   @$pb.TagNumber(2)
-  set iD($3.EntityID value) => $_setField(2, value);
+  set iD($1.EntityID value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasID() => $_has(1);
   @$pb.TagNumber(2)
   void clearID() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.EntityID ensureID() => $_ensure(1);
+  $1.EntityID ensureID() => $_ensure(1);
 
   @$pb.TagNumber(3)
   ClaimPropagateMovementPayload get payload => $_getN(2);

lib/claimAction.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from claimAction.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/claimAction.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from claimAction.proto.
-//  source: claimAction.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/claimInput.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from claimInput.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/claimInput.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from claimInput.proto.
-//  source: claimInput.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,7 +16,7 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'claimInput.pb.dart' as $15;
+import 'claimInput.pb.dart' as $0;
 
 export 'claimInput.pb.dart';
 
@@ -32,112 +32,114 @@ class ClaimInputAPIClient extends $grpc.Client {
     '',
   ];
 
-  static final _$created = $grpc.ClientMethod<$15.ClaimCreatedRequest, $15.ClaimCreatedResponse>(
-      '/api.ClaimInputAPI/Created',
-      ($15.ClaimCreatedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.ClaimCreatedResponse.fromBuffer(value));
-  static final _$completed = $grpc.ClientMethod<$15.ClaimCompletedRequest, $15.ClaimCompletedResponse>(
-      '/api.ClaimInputAPI/Completed',
-      ($15.ClaimCompletedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.ClaimCompletedResponse.fromBuffer(value));
-  static final _$criticalityUpdated = $grpc.ClientMethod<$15.ClaimCriticalityUpdatedRequest, $15.ClaimCriticalityUpdatedResponse>(
-      '/api.ClaimInputAPI/CriticalityUpdated',
-      ($15.ClaimCriticalityUpdatedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.ClaimCriticalityUpdatedResponse.fromBuffer(value));
-  static final _$statusUpdated = $grpc.ClientMethod<$15.ClaimStatusUpdatedRequest, $15.ClaimStatusUpdatedResponse>(
-      '/api.ClaimInputAPI/StatusUpdated',
-      ($15.ClaimStatusUpdatedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.ClaimStatusUpdatedResponse.fromBuffer(value));
-  static final _$assigneesAdded = $grpc.ClientMethod<$15.ClaimAssigneesAddedRequest, $15.ClaimAssigneesAddedResponse>(
-      '/api.ClaimInputAPI/AssigneesAdded',
-      ($15.ClaimAssigneesAddedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.ClaimAssigneesAddedResponse.fromBuffer(value));
-  static final _$assigneesRemoved = $grpc.ClientMethod<$15.ClaimAssigneesRemovedRequest, $15.ClaimAssigneesRemovedResponse>(
-      '/api.ClaimInputAPI/AssigneesRemoved',
-      ($15.ClaimAssigneesRemovedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.ClaimAssigneesRemovedResponse.fromBuffer(value));
-  static final _$amountUpdated = $grpc.ClientMethod<$15.ClaimAmountUpdatedRequest, $15.ClaimAmountUpdatedResponse>(
-      '/api.ClaimInputAPI/AmountUpdated',
-      ($15.ClaimAmountUpdatedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.ClaimAmountUpdatedResponse.fromBuffer(value));
-  static final _$attachmentAdded = $grpc.ClientMethod<$15.ClaimAttachmentAddedRequest, $15.ClaimAttachmentAddedResponse>(
-      '/api.ClaimInputAPI/AttachmentAdded',
-      ($15.ClaimAttachmentAddedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.ClaimAttachmentAddedResponse.fromBuffer(value));
-  static final _$attachmentRemoved = $grpc.ClientMethod<$15.ClaimAttachmentRemovedRequest, $15.ClaimAttachmentRemovedResponse>(
-      '/api.ClaimInputAPI/AttachmentRemoved',
-      ($15.ClaimAttachmentRemovedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.ClaimAttachmentRemovedResponse.fromBuffer(value));
-  static final _$metaDataUpdated = $grpc.ClientMethod<$15.ClaimMetaDataUpdatedRequest, $15.ClaimMetaDataUpdatedResponse>(
-      '/api.ClaimInputAPI/MetaDataUpdated',
-      ($15.ClaimMetaDataUpdatedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.ClaimMetaDataUpdatedResponse.fromBuffer(value));
-  static final _$titleUpdated = $grpc.ClientMethod<$15.ClaimTitleUpdatedRequest, $15.ClaimTitleUpdatedResponse>(
-      '/api.ClaimInputAPI/TitleUpdated',
-      ($15.ClaimTitleUpdatedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.ClaimTitleUpdatedResponse.fromBuffer(value));
-  static final _$messageSent = $grpc.ClientMethod<$15.ClaimMessageSentRequest, $15.ClaimMessageSentResponse>(
-      '/api.ClaimInputAPI/MessageSent',
-      ($15.ClaimMessageSentRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.ClaimMessageSentResponse.fromBuffer(value));
-  static final _$deleted = $grpc.ClientMethod<$15.ClaimDeletedRequest, $15.ClaimDeletedResponse>(
-      '/api.ClaimInputAPI/Deleted',
-      ($15.ClaimDeletedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.ClaimDeletedResponse.fromBuffer(value));
-
   ClaimInputAPIClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$15.ClaimCreatedResponse> created($15.ClaimCreatedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimCreatedResponse> created($0.ClaimCreatedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$created, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.ClaimCompletedResponse> completed($15.ClaimCompletedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimCompletedResponse> completed($0.ClaimCompletedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$completed, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.ClaimCriticalityUpdatedResponse> criticalityUpdated($15.ClaimCriticalityUpdatedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimCriticalityUpdatedResponse> criticalityUpdated($0.ClaimCriticalityUpdatedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$criticalityUpdated, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.ClaimStatusUpdatedResponse> statusUpdated($15.ClaimStatusUpdatedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimStatusUpdatedResponse> statusUpdated($0.ClaimStatusUpdatedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$statusUpdated, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.ClaimAssigneesAddedResponse> assigneesAdded($15.ClaimAssigneesAddedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimAssigneesAddedResponse> assigneesAdded($0.ClaimAssigneesAddedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$assigneesAdded, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.ClaimAssigneesRemovedResponse> assigneesRemoved($15.ClaimAssigneesRemovedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimAssigneesRemovedResponse> assigneesRemoved($0.ClaimAssigneesRemovedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$assigneesRemoved, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.ClaimAmountUpdatedResponse> amountUpdated($15.ClaimAmountUpdatedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimAmountUpdatedResponse> amountUpdated($0.ClaimAmountUpdatedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$amountUpdated, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.ClaimAttachmentAddedResponse> attachmentAdded($15.ClaimAttachmentAddedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimAttachmentAddedResponse> attachmentAdded($0.ClaimAttachmentAddedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$attachmentAdded, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.ClaimAttachmentRemovedResponse> attachmentRemoved($15.ClaimAttachmentRemovedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimAttachmentRemovedResponse> attachmentRemoved($0.ClaimAttachmentRemovedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$attachmentRemoved, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.ClaimMetaDataUpdatedResponse> metaDataUpdated($15.ClaimMetaDataUpdatedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimMetaDataUpdatedResponse> metaDataUpdated($0.ClaimMetaDataUpdatedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$metaDataUpdated, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.ClaimTitleUpdatedResponse> titleUpdated($15.ClaimTitleUpdatedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimTitleUpdatedResponse> titleUpdated($0.ClaimTitleUpdatedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$titleUpdated, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.ClaimMessageSentResponse> messageSent($15.ClaimMessageSentRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimMessageSentResponse> messageSent($0.ClaimMessageSentRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$messageSent, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.ClaimDeletedResponse> deleted($15.ClaimDeletedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimDeletedResponse> deleted($0.ClaimDeletedRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$deleted, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$created = $grpc.ClientMethod<$0.ClaimCreatedRequest, $0.ClaimCreatedResponse>(
+      '/api.ClaimInputAPI/Created',
+      ($0.ClaimCreatedRequest value) => value.writeToBuffer(),
+      $0.ClaimCreatedResponse.fromBuffer);
+  static final _$completed = $grpc.ClientMethod<$0.ClaimCompletedRequest, $0.ClaimCompletedResponse>(
+      '/api.ClaimInputAPI/Completed',
+      ($0.ClaimCompletedRequest value) => value.writeToBuffer(),
+      $0.ClaimCompletedResponse.fromBuffer);
+  static final _$criticalityUpdated = $grpc.ClientMethod<$0.ClaimCriticalityUpdatedRequest, $0.ClaimCriticalityUpdatedResponse>(
+      '/api.ClaimInputAPI/CriticalityUpdated',
+      ($0.ClaimCriticalityUpdatedRequest value) => value.writeToBuffer(),
+      $0.ClaimCriticalityUpdatedResponse.fromBuffer);
+  static final _$statusUpdated = $grpc.ClientMethod<$0.ClaimStatusUpdatedRequest, $0.ClaimStatusUpdatedResponse>(
+      '/api.ClaimInputAPI/StatusUpdated',
+      ($0.ClaimStatusUpdatedRequest value) => value.writeToBuffer(),
+      $0.ClaimStatusUpdatedResponse.fromBuffer);
+  static final _$assigneesAdded = $grpc.ClientMethod<$0.ClaimAssigneesAddedRequest, $0.ClaimAssigneesAddedResponse>(
+      '/api.ClaimInputAPI/AssigneesAdded',
+      ($0.ClaimAssigneesAddedRequest value) => value.writeToBuffer(),
+      $0.ClaimAssigneesAddedResponse.fromBuffer);
+  static final _$assigneesRemoved = $grpc.ClientMethod<$0.ClaimAssigneesRemovedRequest, $0.ClaimAssigneesRemovedResponse>(
+      '/api.ClaimInputAPI/AssigneesRemoved',
+      ($0.ClaimAssigneesRemovedRequest value) => value.writeToBuffer(),
+      $0.ClaimAssigneesRemovedResponse.fromBuffer);
+  static final _$amountUpdated = $grpc.ClientMethod<$0.ClaimAmountUpdatedRequest, $0.ClaimAmountUpdatedResponse>(
+      '/api.ClaimInputAPI/AmountUpdated',
+      ($0.ClaimAmountUpdatedRequest value) => value.writeToBuffer(),
+      $0.ClaimAmountUpdatedResponse.fromBuffer);
+  static final _$attachmentAdded = $grpc.ClientMethod<$0.ClaimAttachmentAddedRequest, $0.ClaimAttachmentAddedResponse>(
+      '/api.ClaimInputAPI/AttachmentAdded',
+      ($0.ClaimAttachmentAddedRequest value) => value.writeToBuffer(),
+      $0.ClaimAttachmentAddedResponse.fromBuffer);
+  static final _$attachmentRemoved = $grpc.ClientMethod<$0.ClaimAttachmentRemovedRequest, $0.ClaimAttachmentRemovedResponse>(
+      '/api.ClaimInputAPI/AttachmentRemoved',
+      ($0.ClaimAttachmentRemovedRequest value) => value.writeToBuffer(),
+      $0.ClaimAttachmentRemovedResponse.fromBuffer);
+  static final _$metaDataUpdated = $grpc.ClientMethod<$0.ClaimMetaDataUpdatedRequest, $0.ClaimMetaDataUpdatedResponse>(
+      '/api.ClaimInputAPI/MetaDataUpdated',
+      ($0.ClaimMetaDataUpdatedRequest value) => value.writeToBuffer(),
+      $0.ClaimMetaDataUpdatedResponse.fromBuffer);
+  static final _$titleUpdated = $grpc.ClientMethod<$0.ClaimTitleUpdatedRequest, $0.ClaimTitleUpdatedResponse>(
+      '/api.ClaimInputAPI/TitleUpdated',
+      ($0.ClaimTitleUpdatedRequest value) => value.writeToBuffer(),
+      $0.ClaimTitleUpdatedResponse.fromBuffer);
+  static final _$messageSent = $grpc.ClientMethod<$0.ClaimMessageSentRequest, $0.ClaimMessageSentResponse>(
+      '/api.ClaimInputAPI/MessageSent',
+      ($0.ClaimMessageSentRequest value) => value.writeToBuffer(),
+      $0.ClaimMessageSentResponse.fromBuffer);
+  static final _$deleted = $grpc.ClientMethod<$0.ClaimDeletedRequest, $0.ClaimDeletedResponse>(
+      '/api.ClaimInputAPI/Deleted',
+      ($0.ClaimDeletedRequest value) => value.writeToBuffer(),
+      $0.ClaimDeletedResponse.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.ClaimInputAPI')
@@ -145,162 +147,175 @@ abstract class ClaimInputAPIServiceBase extends $grpc.Service {
   $core.String get $name => 'api.ClaimInputAPI';
 
   ClaimInputAPIServiceBase() {
-    $addMethod($grpc.ServiceMethod<$15.ClaimCreatedRequest, $15.ClaimCreatedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimCreatedRequest, $0.ClaimCreatedResponse>(
         'Created',
         created_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $15.ClaimCreatedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimCreatedRequest.fromBuffer(value),
-        ($15.ClaimCreatedResponse value) => value.writeToBuffer()));
+        ($0.ClaimCreatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$15.ClaimCompletedRequest, $15.ClaimCompletedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimCompletedRequest, $0.ClaimCompletedResponse>(
         'Completed',
         completed_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $15.ClaimCompletedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimCompletedRequest.fromBuffer(value),
-        ($15.ClaimCompletedResponse value) => value.writeToBuffer()));
+        ($0.ClaimCompletedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$15.ClaimCriticalityUpdatedRequest, $15.ClaimCriticalityUpdatedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimCriticalityUpdatedRequest, $0.ClaimCriticalityUpdatedResponse>(
         'CriticalityUpdated',
         criticalityUpdated_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $15.ClaimCriticalityUpdatedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimCriticalityUpdatedRequest.fromBuffer(value),
-        ($15.ClaimCriticalityUpdatedResponse value) => value.writeToBuffer()));
+        ($0.ClaimCriticalityUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$15.ClaimStatusUpdatedRequest, $15.ClaimStatusUpdatedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimStatusUpdatedRequest, $0.ClaimStatusUpdatedResponse>(
         'StatusUpdated',
         statusUpdated_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $15.ClaimStatusUpdatedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimStatusUpdatedRequest.fromBuffer(value),
-        ($15.ClaimStatusUpdatedResponse value) => value.writeToBuffer()));
+        ($0.ClaimStatusUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$15.ClaimAssigneesAddedRequest, $15.ClaimAssigneesAddedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimAssigneesAddedRequest, $0.ClaimAssigneesAddedResponse>(
         'AssigneesAdded',
         assigneesAdded_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $15.ClaimAssigneesAddedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimAssigneesAddedRequest.fromBuffer(value),
-        ($15.ClaimAssigneesAddedResponse value) => value.writeToBuffer()));
+        ($0.ClaimAssigneesAddedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$15.ClaimAssigneesRemovedRequest, $15.ClaimAssigneesRemovedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimAssigneesRemovedRequest, $0.ClaimAssigneesRemovedResponse>(
         'AssigneesRemoved',
         assigneesRemoved_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $15.ClaimAssigneesRemovedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimAssigneesRemovedRequest.fromBuffer(value),
-        ($15.ClaimAssigneesRemovedResponse value) => value.writeToBuffer()));
+        ($0.ClaimAssigneesRemovedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$15.ClaimAmountUpdatedRequest, $15.ClaimAmountUpdatedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimAmountUpdatedRequest, $0.ClaimAmountUpdatedResponse>(
         'AmountUpdated',
         amountUpdated_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $15.ClaimAmountUpdatedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimAmountUpdatedRequest.fromBuffer(value),
-        ($15.ClaimAmountUpdatedResponse value) => value.writeToBuffer()));
+        ($0.ClaimAmountUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$15.ClaimAttachmentAddedRequest, $15.ClaimAttachmentAddedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimAttachmentAddedRequest, $0.ClaimAttachmentAddedResponse>(
         'AttachmentAdded',
         attachmentAdded_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $15.ClaimAttachmentAddedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimAttachmentAddedRequest.fromBuffer(value),
-        ($15.ClaimAttachmentAddedResponse value) => value.writeToBuffer()));
+        ($0.ClaimAttachmentAddedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$15.ClaimAttachmentRemovedRequest, $15.ClaimAttachmentRemovedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimAttachmentRemovedRequest, $0.ClaimAttachmentRemovedResponse>(
         'AttachmentRemoved',
         attachmentRemoved_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $15.ClaimAttachmentRemovedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimAttachmentRemovedRequest.fromBuffer(value),
-        ($15.ClaimAttachmentRemovedResponse value) => value.writeToBuffer()));
+        ($0.ClaimAttachmentRemovedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$15.ClaimMetaDataUpdatedRequest, $15.ClaimMetaDataUpdatedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimMetaDataUpdatedRequest, $0.ClaimMetaDataUpdatedResponse>(
         'MetaDataUpdated',
         metaDataUpdated_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $15.ClaimMetaDataUpdatedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimMetaDataUpdatedRequest.fromBuffer(value),
-        ($15.ClaimMetaDataUpdatedResponse value) => value.writeToBuffer()));
+        ($0.ClaimMetaDataUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$15.ClaimTitleUpdatedRequest, $15.ClaimTitleUpdatedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimTitleUpdatedRequest, $0.ClaimTitleUpdatedResponse>(
         'TitleUpdated',
         titleUpdated_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $15.ClaimTitleUpdatedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimTitleUpdatedRequest.fromBuffer(value),
-        ($15.ClaimTitleUpdatedResponse value) => value.writeToBuffer()));
+        ($0.ClaimTitleUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$15.ClaimMessageSentRequest, $15.ClaimMessageSentResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimMessageSentRequest, $0.ClaimMessageSentResponse>(
         'MessageSent',
         messageSent_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $15.ClaimMessageSentRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimMessageSentRequest.fromBuffer(value),
-        ($15.ClaimMessageSentResponse value) => value.writeToBuffer()));
+        ($0.ClaimMessageSentResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$15.ClaimDeletedRequest, $15.ClaimDeletedResponse>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimDeletedRequest, $0.ClaimDeletedResponse>(
         'Deleted',
         deleted_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $15.ClaimDeletedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimDeletedRequest.fromBuffer(value),
-        ($15.ClaimDeletedResponse value) => value.writeToBuffer()));
+        ($0.ClaimDeletedResponse value) => value.writeToBuffer()));
   }
 
-  $async.Future<$15.ClaimCreatedResponse> created_Pre($grpc.ServiceCall $call, $async.Future<$15.ClaimCreatedRequest> $request) async {
+  $async.Future<$0.ClaimCreatedResponse> created_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimCreatedRequest> $request) async {
     return created($call, await $request);
   }
 
-  $async.Future<$15.ClaimCompletedResponse> completed_Pre($grpc.ServiceCall $call, $async.Future<$15.ClaimCompletedRequest> $request) async {
+  $async.Future<$0.ClaimCreatedResponse> created($grpc.ServiceCall call, $0.ClaimCreatedRequest request);
+
+  $async.Future<$0.ClaimCompletedResponse> completed_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimCompletedRequest> $request) async {
     return completed($call, await $request);
   }
 
-  $async.Future<$15.ClaimCriticalityUpdatedResponse> criticalityUpdated_Pre($grpc.ServiceCall $call, $async.Future<$15.ClaimCriticalityUpdatedRequest> $request) async {
+  $async.Future<$0.ClaimCompletedResponse> completed($grpc.ServiceCall call, $0.ClaimCompletedRequest request);
+
+  $async.Future<$0.ClaimCriticalityUpdatedResponse> criticalityUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimCriticalityUpdatedRequest> $request) async {
     return criticalityUpdated($call, await $request);
   }
 
-  $async.Future<$15.ClaimStatusUpdatedResponse> statusUpdated_Pre($grpc.ServiceCall $call, $async.Future<$15.ClaimStatusUpdatedRequest> $request) async {
+  $async.Future<$0.ClaimCriticalityUpdatedResponse> criticalityUpdated($grpc.ServiceCall call, $0.ClaimCriticalityUpdatedRequest request);
+
+  $async.Future<$0.ClaimStatusUpdatedResponse> statusUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimStatusUpdatedRequest> $request) async {
     return statusUpdated($call, await $request);
   }
 
-  $async.Future<$15.ClaimAssigneesAddedResponse> assigneesAdded_Pre($grpc.ServiceCall $call, $async.Future<$15.ClaimAssigneesAddedRequest> $request) async {
+  $async.Future<$0.ClaimStatusUpdatedResponse> statusUpdated($grpc.ServiceCall call, $0.ClaimStatusUpdatedRequest request);
+
+  $async.Future<$0.ClaimAssigneesAddedResponse> assigneesAdded_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimAssigneesAddedRequest> $request) async {
     return assigneesAdded($call, await $request);
   }
 
-  $async.Future<$15.ClaimAssigneesRemovedResponse> assigneesRemoved_Pre($grpc.ServiceCall $call, $async.Future<$15.ClaimAssigneesRemovedRequest> $request) async {
+  $async.Future<$0.ClaimAssigneesAddedResponse> assigneesAdded($grpc.ServiceCall call, $0.ClaimAssigneesAddedRequest request);
+
+  $async.Future<$0.ClaimAssigneesRemovedResponse> assigneesRemoved_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimAssigneesRemovedRequest> $request) async {
     return assigneesRemoved($call, await $request);
   }
 
-  $async.Future<$15.ClaimAmountUpdatedResponse> amountUpdated_Pre($grpc.ServiceCall $call, $async.Future<$15.ClaimAmountUpdatedRequest> $request) async {
+  $async.Future<$0.ClaimAssigneesRemovedResponse> assigneesRemoved($grpc.ServiceCall call, $0.ClaimAssigneesRemovedRequest request);
+
+  $async.Future<$0.ClaimAmountUpdatedResponse> amountUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimAmountUpdatedRequest> $request) async {
     return amountUpdated($call, await $request);
   }
 
-  $async.Future<$15.ClaimAttachmentAddedResponse> attachmentAdded_Pre($grpc.ServiceCall $call, $async.Future<$15.ClaimAttachmentAddedRequest> $request) async {
+  $async.Future<$0.ClaimAmountUpdatedResponse> amountUpdated($grpc.ServiceCall call, $0.ClaimAmountUpdatedRequest request);
+
+  $async.Future<$0.ClaimAttachmentAddedResponse> attachmentAdded_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimAttachmentAddedRequest> $request) async {
     return attachmentAdded($call, await $request);
   }
 
-  $async.Future<$15.ClaimAttachmentRemovedResponse> attachmentRemoved_Pre($grpc.ServiceCall $call, $async.Future<$15.ClaimAttachmentRemovedRequest> $request) async {
+  $async.Future<$0.ClaimAttachmentAddedResponse> attachmentAdded($grpc.ServiceCall call, $0.ClaimAttachmentAddedRequest request);
+
+  $async.Future<$0.ClaimAttachmentRemovedResponse> attachmentRemoved_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimAttachmentRemovedRequest> $request) async {
     return attachmentRemoved($call, await $request);
   }
 
-  $async.Future<$15.ClaimMetaDataUpdatedResponse> metaDataUpdated_Pre($grpc.ServiceCall $call, $async.Future<$15.ClaimMetaDataUpdatedRequest> $request) async {
+  $async.Future<$0.ClaimAttachmentRemovedResponse> attachmentRemoved($grpc.ServiceCall call, $0.ClaimAttachmentRemovedRequest request);
+
+  $async.Future<$0.ClaimMetaDataUpdatedResponse> metaDataUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimMetaDataUpdatedRequest> $request) async {
     return metaDataUpdated($call, await $request);
   }
 
-  $async.Future<$15.ClaimTitleUpdatedResponse> titleUpdated_Pre($grpc.ServiceCall $call, $async.Future<$15.ClaimTitleUpdatedRequest> $request) async {
+  $async.Future<$0.ClaimMetaDataUpdatedResponse> metaDataUpdated($grpc.ServiceCall call, $0.ClaimMetaDataUpdatedRequest request);
+
+  $async.Future<$0.ClaimTitleUpdatedResponse> titleUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimTitleUpdatedRequest> $request) async {
     return titleUpdated($call, await $request);
   }
 
-  $async.Future<$15.ClaimMessageSentResponse> messageSent_Pre($grpc.ServiceCall $call, $async.Future<$15.ClaimMessageSentRequest> $request) async {
+  $async.Future<$0.ClaimTitleUpdatedResponse> titleUpdated($grpc.ServiceCall call, $0.ClaimTitleUpdatedRequest request);
+
+  $async.Future<$0.ClaimMessageSentResponse> messageSent_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimMessageSentRequest> $request) async {
     return messageSent($call, await $request);
   }
 
-  $async.Future<$15.ClaimDeletedResponse> deleted_Pre($grpc.ServiceCall $call, $async.Future<$15.ClaimDeletedRequest> $request) async {
+  $async.Future<$0.ClaimMessageSentResponse> messageSent($grpc.ServiceCall call, $0.ClaimMessageSentRequest request);
+
+  $async.Future<$0.ClaimDeletedResponse> deleted_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimDeletedRequest> $request) async {
     return deleted($call, await $request);
   }
 
-  $async.Future<$15.ClaimCreatedResponse> created($grpc.ServiceCall call, $15.ClaimCreatedRequest request);
+  $async.Future<$0.ClaimDeletedResponse> deleted($grpc.ServiceCall call, $0.ClaimDeletedRequest request);
-  $async.Future<$15.ClaimCompletedResponse> completed($grpc.ServiceCall call, $15.ClaimCompletedRequest request);
+
-  $async.Future<$15.ClaimCriticalityUpdatedResponse> criticalityUpdated($grpc.ServiceCall call, $15.ClaimCriticalityUpdatedRequest request);
-  $async.Future<$15.ClaimStatusUpdatedResponse> statusUpdated($grpc.ServiceCall call, $15.ClaimStatusUpdatedRequest request);
-  $async.Future<$15.ClaimAssigneesAddedResponse> assigneesAdded($grpc.ServiceCall call, $15.ClaimAssigneesAddedRequest request);
-  $async.Future<$15.ClaimAssigneesRemovedResponse> assigneesRemoved($grpc.ServiceCall call, $15.ClaimAssigneesRemovedRequest request);
-  $async.Future<$15.ClaimAmountUpdatedResponse> amountUpdated($grpc.ServiceCall call, $15.ClaimAmountUpdatedRequest request);
-  $async.Future<$15.ClaimAttachmentAddedResponse> attachmentAdded($grpc.ServiceCall call, $15.ClaimAttachmentAddedRequest request);
-  $async.Future<$15.ClaimAttachmentRemovedResponse> attachmentRemoved($grpc.ServiceCall call, $15.ClaimAttachmentRemovedRequest request);
-  $async.Future<$15.ClaimMetaDataUpdatedResponse> metaDataUpdated($grpc.ServiceCall call, $15.ClaimMetaDataUpdatedRequest request);
-  $async.Future<$15.ClaimTitleUpdatedResponse> titleUpdated($grpc.ServiceCall call, $15.ClaimTitleUpdatedRequest request);
-  $async.Future<$15.ClaimMessageSentResponse> messageSent($grpc.ServiceCall call, $15.ClaimMessageSentRequest request);
-  $async.Future<$15.ClaimDeletedResponse> deleted($grpc.ServiceCall call, $15.ClaimDeletedRequest request);
 }

lib/claimInput.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from claimInput.proto.
-//  source: claimInput.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/claimQuery.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from claimQuery.proto.
-//  source: claimQuery.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,16 +14,16 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'claim.pb.dart' as $78;
+import 'claim.pb.dart' as $3;
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
-import 'user.pb.dart' as $65;
+import 'user.pb.dart' as $4;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
 class ClaimByIdQuery extends $pb.GeneratedMessage {
   factory ClaimByIdQuery({
-    $3.QueryProjectHeader? header,
+    $1.QueryProjectHeader? header,
-    $core.Iterable<$3.EntityID>? iDs,
+    $core.Iterable<$1.EntityID>? iDs,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -37,8 +37,8 @@ class ClaimByIdQuery extends $pb.GeneratedMessage {
   factory ClaimByIdQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimByIdQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
-    ..pc<$3.EntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $3.EntityID.create)
+    ..pc<$1.EntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.EntityID.create)
     ..hasRequiredFields = false
   ;
 
@@ -60,24 +60,24 @@ class ClaimByIdQuery extends $pb.GeneratedMessage {
   static ClaimByIdQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader get header => $_getN(0);
+  $1.QueryProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.QueryProjectHeader value) => $_setField(1, value);
+  set header($1.QueryProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $pb.PbList<$3.EntityID> get iDs => $_getList(1);
+  $pb.PbList<$1.EntityID> get iDs => $_getList(1);
 }
 
 class ClaimByIdResult extends $pb.GeneratedMessage {
   factory ClaimByIdResult({
-    $3.ResultHeader? header,
+    $1.ResultHeader? header,
-    $core.Iterable<$78.Claim>? objects,
+    $core.Iterable<$3.Claim>? objects,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -91,8 +91,8 @@ class ClaimByIdResult extends $pb.GeneratedMessage {
   factory ClaimByIdResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.ResultHeader.create)
+    ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
-    ..pc<$78.Claim>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $78.Claim.create)
+    ..pc<$3.Claim>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Claim.create)
     ..hasRequiredFields = false
   ;
 
@@ -114,26 +114,26 @@ class ClaimByIdResult extends $pb.GeneratedMessage {
   static ClaimByIdResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.ResultHeader get header => $_getN(0);
+  $1.ResultHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.ResultHeader value) => $_setField(1, value);
+  set header($1.ResultHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.ResultHeader ensureHeader() => $_ensure(0);
+  $1.ResultHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $pb.PbList<$78.Claim> get objects => $_getList(1);
+  $pb.PbList<$3.Claim> get objects => $_getList(1);
 }
 
 class ClaimByFilterQuery extends $pb.GeneratedMessage {
   factory ClaimByFilterQuery({
-    $3.QueryProjectHeader? header,
+    $1.QueryProjectHeader? header,
     $core.String? limitFilter,
     $core.String? queryContext,
-    $core.Iterable<$3.BlockFilter>? blockFilters,
+    $core.Iterable<$1.BlockFilter>? blockFilters,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -149,10 +149,10 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
   factory ClaimByFilterQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimByFilterQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
     ..aOS(4, _omitFieldNames ? '' : 'limitFilter', protoName: 'limitFilter')
     ..aOS(5, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
-    ..pc<$3.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $3.BlockFilter.create)
+    ..pc<$1.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
     ..hasRequiredFields = false
   ;
 
@@ -174,15 +174,15 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
   static ClaimByFilterQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader get header => $_getN(0);
+  $1.QueryProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.QueryProjectHeader value) => $_setField(1, value);
+  set header($1.QueryProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
   /// Number of maximum result
   @$pb.TagNumber(4)
@@ -205,13 +205,13 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
 
   /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
   @$pb.TagNumber(6)
-  $pb.PbList<$3.BlockFilter> get blockFilters => $_getList(3);
+  $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 }
 
 class ClaimByFilterResult extends $pb.GeneratedMessage {
   factory ClaimByFilterResult({
-    $3.ResultHeader? header,
+    $1.ResultHeader? header,
-    $core.Iterable<$78.Claim>? objects,
+    $core.Iterable<$3.Claim>? objects,
     $core.String? queryContext,
   }) {
     final result = create();
@@ -227,8 +227,8 @@ class ClaimByFilterResult extends $pb.GeneratedMessage {
   factory ClaimByFilterResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimByFilterResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.ResultHeader.create)
+    ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
-    ..pc<$78.Claim>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $78.Claim.create)
+    ..pc<$3.Claim>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Claim.create)
     ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
     ..hasRequiredFields = false
   ;
@@ -251,18 +251,18 @@ class ClaimByFilterResult extends $pb.GeneratedMessage {
   static ClaimByFilterResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.ResultHeader get header => $_getN(0);
+  $1.ResultHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.ResultHeader value) => $_setField(1, value);
+  set header($1.ResultHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.ResultHeader ensureHeader() => $_ensure(0);
+  $1.ResultHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $pb.PbList<$78.Claim> get objects => $_getList(1);
+  $pb.PbList<$3.Claim> get objects => $_getList(1);
 
   @$pb.TagNumber(3)
   $core.String get queryContext => $_getSZ(2);
@@ -276,9 +276,9 @@ class ClaimByFilterResult extends $pb.GeneratedMessage {
 
 class ClaimByMatchQuery extends $pb.GeneratedMessage {
   factory ClaimByMatchQuery({
-    $3.QueryProjectHeader? header,
+    $1.QueryProjectHeader? header,
-    $core.Iterable<$3.BlockFilter>? blockFilters,
+    $core.Iterable<$1.BlockFilter>? blockFilters,
-    $core.Iterable<$3.MatchField>? matchFields,
+    $core.Iterable<$1.MatchField>? matchFields,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -293,9 +293,9 @@ class ClaimByMatchQuery extends $pb.GeneratedMessage {
   factory ClaimByMatchQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimByMatchQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
-    ..pc<$3.BlockFilter>(5, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $3.BlockFilter.create)
+    ..pc<$1.BlockFilter>(5, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
-    ..pc<$3.MatchField>(6, _omitFieldNames ? '' : 'MatchFields', $pb.PbFieldType.PM, protoName: 'MatchFields', subBuilder: $3.MatchField.create)
+    ..pc<$1.MatchField>(6, _omitFieldNames ? '' : 'MatchFields', $pb.PbFieldType.PM, protoName: 'MatchFields', subBuilder: $1.MatchField.create)
     ..hasRequiredFields = false
   ;
 
@@ -317,28 +317,28 @@ class ClaimByMatchQuery extends $pb.GeneratedMessage {
   static ClaimByMatchQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader get header => $_getN(0);
+  $1.QueryProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.QueryProjectHeader value) => $_setField(1, value);
+  set header($1.QueryProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
   /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
   @$pb.TagNumber(5)
-  $pb.PbList<$3.BlockFilter> get blockFilters => $_getList(1);
+  $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
 
   /// MatchField list structure, for FindMatching query
   @$pb.TagNumber(6)
-  $pb.PbList<$3.MatchField> get matchFields => $_getList(2);
+  $pb.PbList<$1.MatchField> get matchFields => $_getList(2);
 }
 
 class ClaimByMatchResult extends $pb.GeneratedMessage {
   factory ClaimByMatchResult({
-    $core.Iterable<$3.MatchFieldResult>? matchResults,
+    $core.Iterable<$1.MatchFieldResult>? matchResults,
   }) {
     final result = create();
     if (matchResults != null) result.matchResults.addAll(matchResults);
@@ -351,7 +351,7 @@ class ClaimByMatchResult extends $pb.GeneratedMessage {
   factory ClaimByMatchResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimByMatchResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$3.MatchFieldResult>(2, _omitFieldNames ? '' : 'MatchResults', $pb.PbFieldType.PM, protoName: 'MatchResults', subBuilder: $3.MatchFieldResult.create)
+    ..pc<$1.MatchFieldResult>(2, _omitFieldNames ? '' : 'MatchResults', $pb.PbFieldType.PM, protoName: 'MatchResults', subBuilder: $1.MatchFieldResult.create)
     ..hasRequiredFields = false
   ;
 
@@ -373,13 +373,13 @@ class ClaimByMatchResult extends $pb.GeneratedMessage {
   static ClaimByMatchResult? _defaultInstance;
 
   @$pb.TagNumber(2)
-  $pb.PbList<$3.MatchFieldResult> get matchResults => $_getList(0);
+  $pb.PbList<$1.MatchFieldResult> get matchResults => $_getList(0);
 }
 
 class ClaimGetRoomQuery extends $pb.GeneratedMessage {
   factory ClaimGetRoomQuery({
-    $3.QueryProjectHeader? header,
+    $1.QueryProjectHeader? header,
-    $3.EntityID? iD,
+    $1.EntityID? iD,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -393,8 +393,8 @@ class ClaimGetRoomQuery extends $pb.GeneratedMessage {
   factory ClaimGetRoomQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimGetRoomQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
-    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
+    ..aOM<$1.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $1.EntityID.create)
     ..hasRequiredFields = false
   ;
 
@@ -416,26 +416,26 @@ class ClaimGetRoomQuery extends $pb.GeneratedMessage {
   static ClaimGetRoomQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader get header => $_getN(0);
+  $1.QueryProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.QueryProjectHeader value) => $_setField(1, value);
+  set header($1.QueryProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $3.EntityID get iD => $_getN(1);
+  $1.EntityID get iD => $_getN(1);
   @$pb.TagNumber(2)
-  set iD($3.EntityID value) => $_setField(2, value);
+  set iD($1.EntityID value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasID() => $_has(1);
   @$pb.TagNumber(2)
   void clearID() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.EntityID ensureID() => $_ensure(1);
+  $1.EntityID ensureID() => $_ensure(1);
 }
 
 class ClaimGetRoomResult extends $pb.GeneratedMessage {
@@ -486,8 +486,8 @@ class ClaimGetRoomResult extends $pb.GeneratedMessage {
 
 class ClaimGetAvailableContactsQuery extends $pb.GeneratedMessage {
   factory ClaimGetAvailableContactsQuery({
-    $3.RequestProjectHeader? header,
+    $1.RequestProjectHeader? header,
-    $3.EntityID? iD,
+    $1.EntityID? iD,
     $core.Iterable<$core.String>? partnerIDs,
   }) {
     final result = create();
@@ -503,8 +503,8 @@ class ClaimGetAvailableContactsQuery extends $pb.GeneratedMessage {
   factory ClaimGetAvailableContactsQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimGetAvailableContactsQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
-    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
+    ..aOM<$1.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $1.EntityID.create)
     ..pPS(3, _omitFieldNames ? '' : 'PartnerIDs', protoName: 'PartnerIDs')
     ..hasRequiredFields = false
   ;
@@ -527,26 +527,26 @@ class ClaimGetAvailableContactsQuery extends $pb.GeneratedMessage {
   static ClaimGetAvailableContactsQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader get header => $_getN(0);
+  $1.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestProjectHeader value) => $_setField(1, value);
+  set header($1.RequestProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
-  $3.EntityID get iD => $_getN(1);
+  $1.EntityID get iD => $_getN(1);
   @$pb.TagNumber(2)
-  set iD($3.EntityID value) => $_setField(2, value);
+  set iD($1.EntityID value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasID() => $_has(1);
   @$pb.TagNumber(2)
   void clearID() => $_clearField(2);
   @$pb.TagNumber(2)
-  $3.EntityID ensureID() => $_ensure(1);
+  $1.EntityID ensureID() => $_ensure(1);
 
   @$pb.TagNumber(3)
   $pb.PbList<$core.String> get partnerIDs => $_getList(2);
@@ -554,7 +554,7 @@ class ClaimGetAvailableContactsQuery extends $pb.GeneratedMessage {
 
 class ClaimGetAvailableContactsResult extends $pb.GeneratedMessage {
   factory ClaimGetAvailableContactsResult({
-    $core.Iterable<$65.User>? contacts,
+    $core.Iterable<$4.User>? contacts,
   }) {
     final result = create();
     if (contacts != null) result.contacts.addAll(contacts);
@@ -567,7 +567,7 @@ class ClaimGetAvailableContactsResult extends $pb.GeneratedMessage {
   factory ClaimGetAvailableContactsResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimGetAvailableContactsResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$65.User>(1, _omitFieldNames ? '' : 'Contacts', $pb.PbFieldType.PM, protoName: 'Contacts', subBuilder: $65.User.create)
+    ..pc<$4.User>(1, _omitFieldNames ? '' : 'Contacts', $pb.PbFieldType.PM, protoName: 'Contacts', subBuilder: $4.User.create)
     ..hasRequiredFields = false
   ;
 
@@ -589,7 +589,7 @@ class ClaimGetAvailableContactsResult extends $pb.GeneratedMessage {
   static ClaimGetAvailableContactsResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $pb.PbList<$65.User> get contacts => $_getList(0);
+  $pb.PbList<$4.User> get contacts => $_getList(0);
 }
 
 

lib/claimQuery.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from claimQuery.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/claimQuery.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from claimQuery.proto.
-//  source: claimQuery.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,9 +16,9 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'claimQuery.pb.dart' as $16;
+import 'claimQuery.pb.dart' as $0;
-import 'clickhouse.pb.dart' as $9;
+import 'clickhouse.pb.dart' as $2;
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
 
 export 'claimQuery.pb.dart';
 
@@ -32,80 +32,82 @@ class ClaimQueryClient extends $grpc.Client {
     '',
   ];
 
-  static final _$getByIds = $grpc.ClientMethod<$16.ClaimByIdQuery, $16.ClaimByIdResult>(
-      '/api.ClaimQuery/GetByIds',
-      ($16.ClaimByIdQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $16.ClaimByIdResult.fromBuffer(value));
-  static final _$find = $grpc.ClientMethod<$16.ClaimByFilterQuery, $16.ClaimByFilterResult>(
-      '/api.ClaimQuery/Find',
-      ($16.ClaimByFilterQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $16.ClaimByFilterResult.fromBuffer(value));
-  static final _$findMatchingFieldValues = $grpc.ClientMethod<$16.ClaimByMatchQuery, $16.ClaimByMatchResult>(
-      '/api.ClaimQuery/FindMatchingFieldValues',
-      ($16.ClaimByMatchQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $16.ClaimByMatchResult.fromBuffer(value));
-  static final _$findMatchingFieldElements = $grpc.ClientMethod<$3.ElementByMatchQuery, $3.ElementByMatchResult>(
-      '/api.ClaimQuery/FindMatchingFieldElements',
-      ($3.ElementByMatchQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $3.ElementByMatchResult.fromBuffer(value));
-  static final _$extract = $grpc.ClientMethod<$3.ExtractQuery, $3.ExtractResult>(
-      '/api.ClaimQuery/Extract',
-      ($3.ExtractQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $3.ExtractResult.fromBuffer(value));
-  static final _$getKPIData = $grpc.ClientMethod<$9.GetKPIDataQuery, $9.GetKPIDataResult>(
-      '/api.ClaimQuery/GetKPIData',
-      ($9.GetKPIDataQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $9.GetKPIDataResult.fromBuffer(value));
-  static final _$getRoom = $grpc.ClientMethod<$16.ClaimGetRoomQuery, $16.ClaimGetRoomResult>(
-      '/api.ClaimQuery/GetRoom',
-      ($16.ClaimGetRoomQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $16.ClaimGetRoomResult.fromBuffer(value));
-  static final _$countLines = $grpc.ClientMethod<$3.CountLinesQuery, $3.CountLinesResult>(
-      '/api.ClaimQuery/CountLines',
-      ($3.CountLinesQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $3.CountLinesResult.fromBuffer(value));
-  static final _$getAvailableContacts = $grpc.ClientMethod<$16.ClaimGetAvailableContactsQuery, $16.ClaimGetAvailableContactsResult>(
-      '/api.ClaimQuery/GetAvailableContacts',
-      ($16.ClaimGetAvailableContactsQuery value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $16.ClaimGetAvailableContactsResult.fromBuffer(value));
-
   ClaimQueryClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$16.ClaimByIdResult> getByIds($16.ClaimByIdQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimByIdResult> getByIds($0.ClaimByIdQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$getByIds, request, options: options);
   }
 
-  $grpc.ResponseFuture<$16.ClaimByFilterResult> find($16.ClaimByFilterQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimByFilterResult> find($0.ClaimByFilterQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$find, request, options: options);
   }
 
-  $grpc.ResponseFuture<$16.ClaimByMatchResult> findMatchingFieldValues($16.ClaimByMatchQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimByMatchResult> findMatchingFieldValues($0.ClaimByMatchQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$findMatchingFieldValues, request, options: options);
   }
 
-  $grpc.ResponseFuture<$3.ElementByMatchResult> findMatchingFieldElements($3.ElementByMatchQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$1.ElementByMatchResult> findMatchingFieldElements($1.ElementByMatchQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$findMatchingFieldElements, request, options: options);
   }
 
-  $grpc.ResponseFuture<$3.ExtractResult> extract($3.ExtractQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$1.ExtractResult> extract($1.ExtractQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$extract, request, options: options);
   }
 
-  $grpc.ResponseFuture<$9.GetKPIDataResult> getKPIData($9.GetKPIDataQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$2.GetKPIDataResult> getKPIData($2.GetKPIDataQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$getKPIData, request, options: options);
   }
 
-  $grpc.ResponseFuture<$16.ClaimGetRoomResult> getRoom($16.ClaimGetRoomQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimGetRoomResult> getRoom($0.ClaimGetRoomQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$getRoom, request, options: options);
   }
 
-  $grpc.ResponseFuture<$3.CountLinesResult> countLines($3.CountLinesQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$1.CountLinesResult> countLines($1.CountLinesQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$countLines, request, options: options);
   }
 
-  $grpc.ResponseFuture<$16.ClaimGetAvailableContactsResult> getAvailableContacts($16.ClaimGetAvailableContactsQuery request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.ClaimGetAvailableContactsResult> getAvailableContacts($0.ClaimGetAvailableContactsQuery request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$getAvailableContacts, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$getByIds = $grpc.ClientMethod<$0.ClaimByIdQuery, $0.ClaimByIdResult>(
+      '/api.ClaimQuery/GetByIds',
+      ($0.ClaimByIdQuery value) => value.writeToBuffer(),
+      $0.ClaimByIdResult.fromBuffer);
+  static final _$find = $grpc.ClientMethod<$0.ClaimByFilterQuery, $0.ClaimByFilterResult>(
+      '/api.ClaimQuery/Find',
+      ($0.ClaimByFilterQuery value) => value.writeToBuffer(),
+      $0.ClaimByFilterResult.fromBuffer);
+  static final _$findMatchingFieldValues = $grpc.ClientMethod<$0.ClaimByMatchQuery, $0.ClaimByMatchResult>(
+      '/api.ClaimQuery/FindMatchingFieldValues',
+      ($0.ClaimByMatchQuery value) => value.writeToBuffer(),
+      $0.ClaimByMatchResult.fromBuffer);
+  static final _$findMatchingFieldElements = $grpc.ClientMethod<$1.ElementByMatchQuery, $1.ElementByMatchResult>(
+      '/api.ClaimQuery/FindMatchingFieldElements',
+      ($1.ElementByMatchQuery value) => value.writeToBuffer(),
+      $1.ElementByMatchResult.fromBuffer);
+  static final _$extract = $grpc.ClientMethod<$1.ExtractQuery, $1.ExtractResult>(
+      '/api.ClaimQuery/Extract',
+      ($1.ExtractQuery value) => value.writeToBuffer(),
+      $1.ExtractResult.fromBuffer);
+  static final _$getKPIData = $grpc.ClientMethod<$2.GetKPIDataQuery, $2.GetKPIDataResult>(
+      '/api.ClaimQuery/GetKPIData',
+      ($2.GetKPIDataQuery value) => value.writeToBuffer(),
+      $2.GetKPIDataResult.fromBuffer);
+  static final _$getRoom = $grpc.ClientMethod<$0.ClaimGetRoomQuery, $0.ClaimGetRoomResult>(
+      '/api.ClaimQuery/GetRoom',
+      ($0.ClaimGetRoomQuery value) => value.writeToBuffer(),
+      $0.ClaimGetRoomResult.fromBuffer);
+  static final _$countLines = $grpc.ClientMethod<$1.CountLinesQuery, $1.CountLinesResult>(
+      '/api.ClaimQuery/CountLines',
+      ($1.CountLinesQuery value) => value.writeToBuffer(),
+      $1.CountLinesResult.fromBuffer);
+  static final _$getAvailableContacts = $grpc.ClientMethod<$0.ClaimGetAvailableContactsQuery, $0.ClaimGetAvailableContactsResult>(
+      '/api.ClaimQuery/GetAvailableContacts',
+      ($0.ClaimGetAvailableContactsQuery value) => value.writeToBuffer(),
+      $0.ClaimGetAvailableContactsResult.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.ClaimQuery')
@@ -113,114 +115,123 @@ abstract class ClaimQueryServiceBase extends $grpc.Service {
   $core.String get $name => 'api.ClaimQuery';
 
   ClaimQueryServiceBase() {
-    $addMethod($grpc.ServiceMethod<$16.ClaimByIdQuery, $16.ClaimByIdResult>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimByIdQuery, $0.ClaimByIdResult>(
         'GetByIds',
         getByIds_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $16.ClaimByIdQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimByIdQuery.fromBuffer(value),
-        ($16.ClaimByIdResult value) => value.writeToBuffer()));
+        ($0.ClaimByIdResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$16.ClaimByFilterQuery, $16.ClaimByFilterResult>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimByFilterQuery, $0.ClaimByFilterResult>(
         'Find',
         find_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $16.ClaimByFilterQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimByFilterQuery.fromBuffer(value),
-        ($16.ClaimByFilterResult value) => value.writeToBuffer()));
+        ($0.ClaimByFilterResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$16.ClaimByMatchQuery, $16.ClaimByMatchResult>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimByMatchQuery, $0.ClaimByMatchResult>(
         'FindMatchingFieldValues',
         findMatchingFieldValues_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $16.ClaimByMatchQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimByMatchQuery.fromBuffer(value),
-        ($16.ClaimByMatchResult value) => value.writeToBuffer()));
+        ($0.ClaimByMatchResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$3.ElementByMatchQuery, $3.ElementByMatchResult>(
+    $addMethod($grpc.ServiceMethod<$1.ElementByMatchQuery, $1.ElementByMatchResult>(
         'FindMatchingFieldElements',
         findMatchingFieldElements_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $3.ElementByMatchQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $1.ElementByMatchQuery.fromBuffer(value),
-        ($3.ElementByMatchResult value) => value.writeToBuffer()));
+        ($1.ElementByMatchResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$3.ExtractQuery, $3.ExtractResult>(
+    $addMethod($grpc.ServiceMethod<$1.ExtractQuery, $1.ExtractResult>(
         'Extract',
         extract_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $3.ExtractQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $1.ExtractQuery.fromBuffer(value),
-        ($3.ExtractResult value) => value.writeToBuffer()));
+        ($1.ExtractResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$9.GetKPIDataQuery, $9.GetKPIDataResult>(
+    $addMethod($grpc.ServiceMethod<$2.GetKPIDataQuery, $2.GetKPIDataResult>(
         'GetKPIData',
         getKPIData_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $9.GetKPIDataQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $2.GetKPIDataQuery.fromBuffer(value),
-        ($9.GetKPIDataResult value) => value.writeToBuffer()));
+        ($2.GetKPIDataResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$16.ClaimGetRoomQuery, $16.ClaimGetRoomResult>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimGetRoomQuery, $0.ClaimGetRoomResult>(
         'GetRoom',
         getRoom_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $16.ClaimGetRoomQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimGetRoomQuery.fromBuffer(value),
-        ($16.ClaimGetRoomResult value) => value.writeToBuffer()));
+        ($0.ClaimGetRoomResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$3.CountLinesQuery, $3.CountLinesResult>(
+    $addMethod($grpc.ServiceMethod<$1.CountLinesQuery, $1.CountLinesResult>(
         'CountLines',
         countLines_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $3.CountLinesQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $1.CountLinesQuery.fromBuffer(value),
-        ($3.CountLinesResult value) => value.writeToBuffer()));
+        ($1.CountLinesResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$16.ClaimGetAvailableContactsQuery, $16.ClaimGetAvailableContactsResult>(
+    $addMethod($grpc.ServiceMethod<$0.ClaimGetAvailableContactsQuery, $0.ClaimGetAvailableContactsResult>(
         'GetAvailableContacts',
         getAvailableContacts_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $16.ClaimGetAvailableContactsQuery.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.ClaimGetAvailableContactsQuery.fromBuffer(value),
-        ($16.ClaimGetAvailableContactsResult value) => value.writeToBuffer()));
+        ($0.ClaimGetAvailableContactsResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$16.ClaimByIdResult> getByIds_Pre($grpc.ServiceCall $call, $async.Future<$16.ClaimByIdQuery> $request) async {
+  $async.Future<$0.ClaimByIdResult> getByIds_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimByIdQuery> $request) async {
     return getByIds($call, await $request);
   }
 
-  $async.Future<$16.ClaimByFilterResult> find_Pre($grpc.ServiceCall $call, $async.Future<$16.ClaimByFilterQuery> $request) async {
+  $async.Future<$0.ClaimByIdResult> getByIds($grpc.ServiceCall call, $0.ClaimByIdQuery request);
+
+  $async.Future<$0.ClaimByFilterResult> find_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimByFilterQuery> $request) async {
     return find($call, await $request);
   }
 
-  $async.Future<$16.ClaimByMatchResult> findMatchingFieldValues_Pre($grpc.ServiceCall $call, $async.Future<$16.ClaimByMatchQuery> $request) async {
+  $async.Future<$0.ClaimByFilterResult> find($grpc.ServiceCall call, $0.ClaimByFilterQuery request);
+
+  $async.Future<$0.ClaimByMatchResult> findMatchingFieldValues_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimByMatchQuery> $request) async {
     return findMatchingFieldValues($call, await $request);
   }
 
-  $async.Future<$3.ElementByMatchResult> findMatchingFieldElements_Pre($grpc.ServiceCall $call, $async.Future<$3.ElementByMatchQuery> $request) async {
+  $async.Future<$0.ClaimByMatchResult> findMatchingFieldValues($grpc.ServiceCall call, $0.ClaimByMatchQuery request);
+
+  $async.Future<$1.ElementByMatchResult> findMatchingFieldElements_Pre($grpc.ServiceCall $call, $async.Future<$1.ElementByMatchQuery> $request) async {
     return findMatchingFieldElements($call, await $request);
   }
 
-  $async.Future<$3.ExtractResult> extract_Pre($grpc.ServiceCall $call, $async.Future<$3.ExtractQuery> $request) async {
+  $async.Future<$1.ElementByMatchResult> findMatchingFieldElements($grpc.ServiceCall call, $1.ElementByMatchQuery request);
+
+  $async.Future<$1.ExtractResult> extract_Pre($grpc.ServiceCall $call, $async.Future<$1.ExtractQuery> $request) async {
     return extract($call, await $request);
   }
 
-  $async.Future<$9.GetKPIDataResult> getKPIData_Pre($grpc.ServiceCall $call, $async.Future<$9.GetKPIDataQuery> $request) async {
+  $async.Future<$1.ExtractResult> extract($grpc.ServiceCall call, $1.ExtractQuery request);
+
+  $async.Future<$2.GetKPIDataResult> getKPIData_Pre($grpc.ServiceCall $call, $async.Future<$2.GetKPIDataQuery> $request) async {
     return getKPIData($call, await $request);
   }
 
-  $async.Future<$16.ClaimGetRoomResult> getRoom_Pre($grpc.ServiceCall $call, $async.Future<$16.ClaimGetRoomQuery> $request) async {
+  $async.Future<$2.GetKPIDataResult> getKPIData($grpc.ServiceCall call, $2.GetKPIDataQuery request);
+
+  $async.Future<$0.ClaimGetRoomResult> getRoom_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimGetRoomQuery> $request) async {
     return getRoom($call, await $request);
   }
 
-  $async.Future<$3.CountLinesResult> countLines_Pre($grpc.ServiceCall $call, $async.Future<$3.CountLinesQuery> $request) async {
+  $async.Future<$0.ClaimGetRoomResult> getRoom($grpc.ServiceCall call, $0.ClaimGetRoomQuery request);
+
+  $async.Future<$1.CountLinesResult> countLines_Pre($grpc.ServiceCall $call, $async.Future<$1.CountLinesQuery> $request) async {
     return countLines($call, await $request);
   }
 
-  $async.Future<$16.ClaimGetAvailableContactsResult> getAvailableContacts_Pre($grpc.ServiceCall $call, $async.Future<$16.ClaimGetAvailableContactsQuery> $request) async {
+  $async.Future<$1.CountLinesResult> countLines($grpc.ServiceCall call, $1.CountLinesQuery request);
+
+  $async.Future<$0.ClaimGetAvailableContactsResult> getAvailableContacts_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimGetAvailableContactsQuery> $request) async {
     return getAvailableContacts($call, await $request);
   }
 
-  $async.Future<$16.ClaimByIdResult> getByIds($grpc.ServiceCall call, $16.ClaimByIdQuery request);
+  $async.Future<$0.ClaimGetAvailableContactsResult> getAvailableContacts($grpc.ServiceCall call, $0.ClaimGetAvailableContactsQuery request);
-  $async.Future<$16.ClaimByFilterResult> find($grpc.ServiceCall call, $16.ClaimByFilterQuery request);
+
-  $async.Future<$16.ClaimByMatchResult> findMatchingFieldValues($grpc.ServiceCall call, $16.ClaimByMatchQuery request);
-  $async.Future<$3.ElementByMatchResult> findMatchingFieldElements($grpc.ServiceCall call, $3.ElementByMatchQuery request);
-  $async.Future<$3.ExtractResult> extract($grpc.ServiceCall call, $3.ExtractQuery request);
-  $async.Future<$9.GetKPIDataResult> getKPIData($grpc.ServiceCall call, $9.GetKPIDataQuery request);
-  $async.Future<$16.ClaimGetRoomResult> getRoom($grpc.ServiceCall call, $16.ClaimGetRoomQuery request);
-  $async.Future<$3.CountLinesResult> countLines($grpc.ServiceCall call, $3.CountLinesQuery request);
-  $async.Future<$16.ClaimGetAvailableContactsResult> getAvailableContacts($grpc.ServiceCall call, $16.ClaimGetAvailableContactsQuery request);
 }

lib/claimQuery.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from claimQuery.proto.
-//  source: claimQuery.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/clickhouse.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from clickhouse.proto.
-//  source: clickhouse.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -15,7 +15,7 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'clickhouse.pbenum.dart';
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $0;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
@@ -32,8 +32,8 @@ class CHDimension extends $pb.GeneratedMessage {
     $core.String? period,
     $core.String? operator,
     $core.Iterable<$core.String>? values,
-    $3.StringDateObject? startDate,
+    $0.StringDateObject? startDate,
-    $3.StringDateObject? endDate,
+    $0.StringDateObject? endDate,
     $core.Iterable<CHQueryExpression>? expressions,
     $core.bool? isComputed,
     CHDimension? or,
@@ -71,8 +71,8 @@ class CHDimension extends $pb.GeneratedMessage {
     ..aOS(7, _omitFieldNames ? '' : 'Period', protoName: 'Period')
     ..aOS(8, _omitFieldNames ? '' : 'Operator', protoName: 'Operator')
     ..pPS(9, _omitFieldNames ? '' : 'Values', protoName: 'Values')
-    ..aOM<$3.StringDateObject>(10, _omitFieldNames ? '' : 'StartDate', protoName: 'StartDate', subBuilder: $3.StringDateObject.create)
+    ..aOM<$0.StringDateObject>(10, _omitFieldNames ? '' : 'StartDate', protoName: 'StartDate', subBuilder: $0.StringDateObject.create)
-    ..aOM<$3.StringDateObject>(11, _omitFieldNames ? '' : 'EndDate', protoName: 'EndDate', subBuilder: $3.StringDateObject.create)
+    ..aOM<$0.StringDateObject>(11, _omitFieldNames ? '' : 'EndDate', protoName: 'EndDate', subBuilder: $0.StringDateObject.create)
     ..pc<CHQueryExpression>(12, _omitFieldNames ? '' : 'Expressions', $pb.PbFieldType.PM, protoName: 'Expressions', subBuilder: CHQueryExpression.create)
     ..aOB(13, _omitFieldNames ? '' : 'IsComputed', protoName: 'IsComputed')
     ..aOM<CHDimension>(14, _omitFieldNames ? '' : 'Or', protoName: 'Or', subBuilder: CHDimension.create)
@@ -174,26 +174,26 @@ class CHDimension extends $pb.GeneratedMessage {
   $pb.PbList<$core.String> get values => $_getList(8);
 
   @$pb.TagNumber(10)
-  $3.StringDateObject get startDate => $_getN(9);
+  $0.StringDateObject get startDate => $_getN(9);
   @$pb.TagNumber(10)
-  set startDate($3.StringDateObject value) => $_setField(10, value);
+  set startDate($0.StringDateObject value) => $_setField(10, value);
   @$pb.TagNumber(10)
   $core.bool hasStartDate() => $_has(9);
   @$pb.TagNumber(10)
   void clearStartDate() => $_clearField(10);
   @$pb.TagNumber(10)
-  $3.StringDateObject ensureStartDate() => $_ensure(9);
+  $0.StringDateObject ensureStartDate() => $_ensure(9);
 
   @$pb.TagNumber(11)
-  $3.StringDateObject get endDate => $_getN(10);
+  $0.StringDateObject get endDate => $_getN(10);
   @$pb.TagNumber(11)
-  set endDate($3.StringDateObject value) => $_setField(11, value);
+  set endDate($0.StringDateObject value) => $_setField(11, value);
   @$pb.TagNumber(11)
   $core.bool hasEndDate() => $_has(10);
   @$pb.TagNumber(11)
   void clearEndDate() => $_clearField(11);
   @$pb.TagNumber(11)
-  $3.StringDateObject ensureEndDate() => $_ensure(10);
+  $0.StringDateObject ensureEndDate() => $_ensure(10);
 
   @$pb.TagNumber(12)
   $pb.PbList<CHQueryExpression> get expressions => $_getList(11);
@@ -508,7 +508,7 @@ class KpiDataSerie extends $pb.GeneratedMessage {
 
 class GetKPIDataQuery extends $pb.GeneratedMessage {
   factory GetKPIDataQuery({
-    $3.QueryProjectHeader? header,
+    $0.QueryProjectHeader? header,
     CHChartType? chartType,
     CHQueryType? queryType,
     $core.String? queryBlock,
@@ -539,7 +539,7 @@ class GetKPIDataQuery extends $pb.GeneratedMessage {
   factory GetKPIDataQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetKPIDataQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..aOM<$0.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $0.QueryProjectHeader.create)
     ..e<CHChartType>(2, _omitFieldNames ? '' : 'ChartType', $pb.PbFieldType.OE, protoName: 'ChartType', defaultOrMaker: CHChartType.CH_CHART_TYPE_UNKNOWN, valueOf: CHChartType.valueOf, enumValues: CHChartType.values)
     ..e<CHQueryType>(3, _omitFieldNames ? '' : 'QueryType', $pb.PbFieldType.OE, protoName: 'QueryType', defaultOrMaker: CHQueryType.CH_QUERY_TYPE_UNKNOWN, valueOf: CHQueryType.valueOf, enumValues: CHQueryType.values)
     ..aOS(4, _omitFieldNames ? '' : 'QueryBlock', protoName: 'QueryBlock')
@@ -570,15 +570,15 @@ class GetKPIDataQuery extends $pb.GeneratedMessage {
   static GetKPIDataQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader get header => $_getN(0);
+  $0.QueryProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.QueryProjectHeader value) => $_setField(1, value);
+  set header($0.QueryProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $0.QueryProjectHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   CHChartType get chartType => $_getN(1);
@@ -654,7 +654,7 @@ class GetKPIDataQuery extends $pb.GeneratedMessage {
 
 class GetKPIDataSiteQuery extends $pb.GeneratedMessage {
   factory GetKPIDataSiteQuery({
-    $3.QuerySiteHeader? header,
+    $0.QuerySiteHeader? header,
     CHChartType? chartType,
     CHQueryType? queryType,
     $core.String? queryBlock,
@@ -685,7 +685,7 @@ class GetKPIDataSiteQuery extends $pb.GeneratedMessage {
   factory GetKPIDataSiteQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetKPIDataSiteQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.QuerySiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QuerySiteHeader.create)
+    ..aOM<$0.QuerySiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $0.QuerySiteHeader.create)
     ..e<CHChartType>(2, _omitFieldNames ? '' : 'ChartType', $pb.PbFieldType.OE, protoName: 'ChartType', defaultOrMaker: CHChartType.CH_CHART_TYPE_UNKNOWN, valueOf: CHChartType.valueOf, enumValues: CHChartType.values)
     ..e<CHQueryType>(3, _omitFieldNames ? '' : 'QueryType', $pb.PbFieldType.OE, protoName: 'QueryType', defaultOrMaker: CHQueryType.CH_QUERY_TYPE_UNKNOWN, valueOf: CHQueryType.valueOf, enumValues: CHQueryType.values)
     ..aOS(4, _omitFieldNames ? '' : 'QueryBlock', protoName: 'QueryBlock')
@@ -716,15 +716,15 @@ class GetKPIDataSiteQuery extends $pb.GeneratedMessage {
   static GetKPIDataSiteQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.QuerySiteHeader get header => $_getN(0);
+  $0.QuerySiteHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.QuerySiteHeader value) => $_setField(1, value);
+  set header($0.QuerySiteHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.QuerySiteHeader ensureHeader() => $_ensure(0);
+  $0.QuerySiteHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   CHChartType get chartType => $_getN(1);
@@ -1035,7 +1035,7 @@ class GetKPIDataResult extends $pb.GeneratedMessage {
 class EntityBlockFilter extends $pb.GeneratedMessage {
   factory EntityBlockFilter({
     $core.String? entityName,
-    $core.Iterable<$3.BlockFilter>? blockFilters,
+    $core.Iterable<$0.BlockFilter>? blockFilters,
   }) {
     final result = create();
     if (entityName != null) result.entityName = entityName;
@@ -1050,7 +1050,7 @@ class EntityBlockFilter extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'EntityBlockFilter', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'EntityName', protoName: 'EntityName')
-    ..pc<$3.BlockFilter>(2, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $3.BlockFilter.create)
+    ..pc<$0.BlockFilter>(2, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $0.BlockFilter.create)
     ..hasRequiredFields = false
   ;
 
@@ -1081,12 +1081,12 @@ class EntityBlockFilter extends $pb.GeneratedMessage {
   void clearEntityName() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $pb.PbList<$3.BlockFilter> get blockFilters => $_getList(1);
+  $pb.PbList<$0.BlockFilter> get blockFilters => $_getList(1);
 }
 
 class FindKPIDataQuery extends $pb.GeneratedMessage {
   factory FindKPIDataQuery({
-    $3.QueryProjectHeader? header,
+    $0.QueryProjectHeader? header,
     CHQueryType? queryType,
     $core.String? queryBlock,
     $core.Iterable<EntityBlockFilter>? entityBlockFilters,
@@ -1115,7 +1115,7 @@ class FindKPIDataQuery extends $pb.GeneratedMessage {
   factory FindKPIDataQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'FindKPIDataQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..aOM<$0.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $0.QueryProjectHeader.create)
     ..e<CHQueryType>(2, _omitFieldNames ? '' : 'QueryType', $pb.PbFieldType.OE, protoName: 'QueryType', defaultOrMaker: CHQueryType.CH_QUERY_TYPE_UNKNOWN, valueOf: CHQueryType.valueOf, enumValues: CHQueryType.values)
     ..aOS(3, _omitFieldNames ? '' : 'QueryBlock', protoName: 'QueryBlock')
     ..pc<EntityBlockFilter>(4, _omitFieldNames ? '' : 'EntityBlockFilters', $pb.PbFieldType.PM, protoName: 'EntityBlockFilters', subBuilder: EntityBlockFilter.create)
@@ -1145,15 +1145,15 @@ class FindKPIDataQuery extends $pb.GeneratedMessage {
   static FindKPIDataQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader get header => $_getN(0);
+  $0.QueryProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.QueryProjectHeader value) => $_setField(1, value);
+  set header($0.QueryProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $0.QueryProjectHeader ensureHeader() => $_ensure(0);
 
   /// TODO really useful ??
   @$pb.TagNumber(2)
@@ -1257,7 +1257,7 @@ class FindKPIDataResult extends $pb.GeneratedMessage {
 
 class ExtractKPIQuery extends $pb.GeneratedMessage {
   factory ExtractKPIQuery({
-    $3.QueryProjectHeader? header,
+    $0.QueryProjectHeader? header,
     $core.String? userId,
     CHQueryType? queryType,
     $core.String? queryBlock,
@@ -1273,12 +1273,12 @@ class ExtractKPIQuery extends $pb.GeneratedMessage {
     $core.String? listSeparator,
     $core.String? decimalSeparator,
     $core.Iterable<$core.String>? columnNames,
-    $core.Iterable<$core.MapEntry<$core.String, $3.TranslationMap>>? columnTranslationMaps,
+    $core.Iterable<$core.MapEntry<$core.String, $0.TranslationMap>>? columnTranslationMaps,
     $core.Iterable<$core.int>? fieldIdxLVDetailedQuantity,
-    $core.Iterable<$core.MapEntry<$core.int, $3.ExtractColumnFormat>>? columnFormats,
+    $core.Iterable<$core.MapEntry<$core.int, $0.ExtractColumnFormat>>? columnFormats,
     $core.String? dateFormat,
     $core.String? numberFormat,
-    $3.TimeFormat? timeFormat,
+    $0.TimeFormat? timeFormat,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -1312,7 +1312,7 @@ class ExtractKPIQuery extends $pb.GeneratedMessage {
   factory ExtractKPIQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ExtractKPIQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..aOM<$0.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $0.QueryProjectHeader.create)
     ..aOS(2, _omitFieldNames ? '' : 'UserId', protoName: 'UserId')
     ..e<CHQueryType>(3, _omitFieldNames ? '' : 'QueryType', $pb.PbFieldType.OE, protoName: 'QueryType', defaultOrMaker: CHQueryType.CH_QUERY_TYPE_UNKNOWN, valueOf: CHQueryType.valueOf, enumValues: CHQueryType.values)
     ..aOS(4, _omitFieldNames ? '' : 'QueryBlock', protoName: 'QueryBlock')
@@ -1328,12 +1328,12 @@ class ExtractKPIQuery extends $pb.GeneratedMessage {
     ..aOS(14, _omitFieldNames ? '' : 'ListSeparator', protoName: 'ListSeparator')
     ..aOS(15, _omitFieldNames ? '' : 'DecimalSeparator', protoName: 'DecimalSeparator')
     ..pPS(16, _omitFieldNames ? '' : 'ColumnNames', protoName: 'ColumnNames')
-    ..m<$core.String, $3.TranslationMap>(17, _omitFieldNames ? '' : 'ColumnTranslationMaps', protoName: 'ColumnTranslationMaps', entryClassName: 'ExtractKPIQuery.ColumnTranslationMapsEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OM, valueCreator: $3.TranslationMap.create, valueDefaultOrMaker: $3.TranslationMap.getDefault, packageName: const $pb.PackageName('api'))
+    ..m<$core.String, $0.TranslationMap>(17, _omitFieldNames ? '' : 'ColumnTranslationMaps', protoName: 'ColumnTranslationMaps', entryClassName: 'ExtractKPIQuery.ColumnTranslationMapsEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OM, valueCreator: $0.TranslationMap.create, valueDefaultOrMaker: $0.TranslationMap.getDefault, packageName: const $pb.PackageName('api'))
     ..p<$core.int>(18, _omitFieldNames ? '' : 'FieldIdxLVDetailedQuantity', $pb.PbFieldType.K3, protoName: 'FieldIdxLVDetailedQuantity')
-    ..m<$core.int, $3.ExtractColumnFormat>(19, _omitFieldNames ? '' : 'ColumnFormats', protoName: 'ColumnFormats', entryClassName: 'ExtractKPIQuery.ColumnFormatsEntry', keyFieldType: $pb.PbFieldType.O3, valueFieldType: $pb.PbFieldType.OM, valueCreator: $3.ExtractColumnFormat.create, valueDefaultOrMaker: $3.ExtractColumnFormat.getDefault, packageName: const $pb.PackageName('api'))
+    ..m<$core.int, $0.ExtractColumnFormat>(19, _omitFieldNames ? '' : 'ColumnFormats', protoName: 'ColumnFormats', entryClassName: 'ExtractKPIQuery.ColumnFormatsEntry', keyFieldType: $pb.PbFieldType.O3, valueFieldType: $pb.PbFieldType.OM, valueCreator: $0.ExtractColumnFormat.create, valueDefaultOrMaker: $0.ExtractColumnFormat.getDefault, packageName: const $pb.PackageName('api'))
     ..aOS(20, _omitFieldNames ? '' : 'DateFormat', protoName: 'DateFormat')
     ..aOS(21, _omitFieldNames ? '' : 'NumberFormat', protoName: 'NumberFormat')
-    ..e<$3.TimeFormat>(22, _omitFieldNames ? '' : 'TimeFormat', $pb.PbFieldType.OE, protoName: 'TimeFormat', defaultOrMaker: $3.TimeFormat.H12, valueOf: $3.TimeFormat.valueOf, enumValues: $3.TimeFormat.values)
+    ..e<$0.TimeFormat>(22, _omitFieldNames ? '' : 'TimeFormat', $pb.PbFieldType.OE, protoName: 'TimeFormat', defaultOrMaker: $0.TimeFormat.H12, valueOf: $0.TimeFormat.valueOf, enumValues: $0.TimeFormat.values)
     ..hasRequiredFields = false
   ;
 
@@ -1355,15 +1355,15 @@ class ExtractKPIQuery extends $pb.GeneratedMessage {
   static ExtractKPIQuery? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader get header => $_getN(0);
+  $0.QueryProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.QueryProjectHeader value) => $_setField(1, value);
+  set header($0.QueryProjectHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $0.QueryProjectHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   $core.String get userId => $_getSZ(1);
@@ -1473,13 +1473,13 @@ class ExtractKPIQuery extends $pb.GeneratedMessage {
   $pb.PbList<$core.String> get columnNames => $_getList(15);
 
   @$pb.TagNumber(17)
-  $pb.PbMap<$core.String, $3.TranslationMap> get columnTranslationMaps => $_getMap(16);
+  $pb.PbMap<$core.String, $0.TranslationMap> get columnTranslationMaps => $_getMap(16);
 
   @$pb.TagNumber(18)
   $pb.PbList<$core.int> get fieldIdxLVDetailedQuantity => $_getList(17);
 
   @$pb.TagNumber(19)
-  $pb.PbMap<$core.int, $3.ExtractColumnFormat> get columnFormats => $_getMap(18);
+  $pb.PbMap<$core.int, $0.ExtractColumnFormat> get columnFormats => $_getMap(18);
 
   @$pb.TagNumber(20)
   $core.String get dateFormat => $_getSZ(19);
@@ -1500,9 +1500,9 @@ class ExtractKPIQuery extends $pb.GeneratedMessage {
   void clearNumberFormat() => $_clearField(21);
 
   @$pb.TagNumber(22)
-  $3.TimeFormat get timeFormat => $_getN(21);
+  $0.TimeFormat get timeFormat => $_getN(21);
   @$pb.TagNumber(22)
-  set timeFormat($3.TimeFormat value) => $_setField(22, value);
+  set timeFormat($0.TimeFormat value) => $_setField(22, value);
   @$pb.TagNumber(22)
   $core.bool hasTimeFormat() => $_has(21);
   @$pb.TagNumber(22)
@@ -1511,7 +1511,7 @@ class ExtractKPIQuery extends $pb.GeneratedMessage {
 
 class ExtractKPIResult extends $pb.GeneratedMessage {
   factory ExtractKPIResult({
-    $3.WorkflowExecutionResult? workflowExecution,
+    $0.WorkflowExecutionResult? workflowExecution,
   }) {
     final result = create();
     if (workflowExecution != null) result.workflowExecution = workflowExecution;
@@ -1524,7 +1524,7 @@ class ExtractKPIResult extends $pb.GeneratedMessage {
   factory ExtractKPIResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ExtractKPIResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.WorkflowExecutionResult>(1, _omitFieldNames ? '' : 'WorkflowExecution', protoName: 'WorkflowExecution', subBuilder: $3.WorkflowExecutionResult.create)
+    ..aOM<$0.WorkflowExecutionResult>(1, _omitFieldNames ? '' : 'WorkflowExecution', protoName: 'WorkflowExecution', subBuilder: $0.WorkflowExecutionResult.create)
     ..hasRequiredFields = false
   ;
 
@@ -1546,15 +1546,15 @@ class ExtractKPIResult extends $pb.GeneratedMessage {
   static ExtractKPIResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.WorkflowExecutionResult get workflowExecution => $_getN(0);
+  $0.WorkflowExecutionResult get workflowExecution => $_getN(0);
   @$pb.TagNumber(1)
-  set workflowExecution($3.WorkflowExecutionResult value) => $_setField(1, value);
+  set workflowExecution($0.WorkflowExecutionResult value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasWorkflowExecution() => $_has(0);
   @$pb.TagNumber(1)
   void clearWorkflowExecution() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.WorkflowExecutionResult ensureWorkflowExecution() => $_ensure(0);
+  $0.WorkflowExecutionResult ensureWorkflowExecution() => $_ensure(0);
 }
 
 

lib/clickhouse.pbenum.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from clickhouse.proto.
-//  source: clickhouse.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references

lib/clickhouse.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from clickhouse.proto.
-//  source: clickhouse.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/clickhouseMetrics.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from clickhouseMetrics.proto.
-//  source: clickhouseMetrics.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references

lib/clickhouseMetrics.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from clickhouseMetrics.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/clickhouseMetrics.pbjson.dart

@@ -1,14 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from clickhouseMetrics.proto.
-//  source: clickhouseMetrics.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/client.pb.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from client.proto.
-//  source: client.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -14,7 +14,7 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'shared.pb.dart' as $3;
+import 'shared.pb.dart' as $1;
 
 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
@@ -156,7 +156,7 @@ class RegisterPlatformClientRequest extends $pb.GeneratedMessage {
 
 class RegisterClientRequest extends $pb.GeneratedMessage {
   factory RegisterClientRequest({
-    $3.RequestOrganisationHeader? header,
+    $1.RequestOrganisationHeader? header,
     OpenIDClient? client,
   }) {
     final result = create();
@@ -171,7 +171,7 @@ class RegisterClientRequest extends $pb.GeneratedMessage {
   factory RegisterClientRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RegisterClientRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$3.RequestOrganisationHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestOrganisationHeader.create)
+    ..aOM<$1.RequestOrganisationHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestOrganisationHeader.create)
     ..aOM<OpenIDClient>(2, _omitFieldNames ? '' : 'Client', protoName: 'Client', subBuilder: OpenIDClient.create)
     ..hasRequiredFields = false
   ;
@@ -194,15 +194,15 @@ class RegisterClientRequest extends $pb.GeneratedMessage {
   static RegisterClientRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $3.RequestOrganisationHeader get header => $_getN(0);
+  $1.RequestOrganisationHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($3.RequestOrganisationHeader value) => $_setField(1, value);
+  set header($1.RequestOrganisationHeader value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
   void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
-  $3.RequestOrganisationHeader ensureHeader() => $_ensure(0);
+  $1.RequestOrganisationHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   OpenIDClient get client => $_getN(1);

lib/client.pbenum.dart

@@ -0,0 +1,12 @@
+// This is a generated file - do not edit.
+//
+// Generated from client.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+

lib/client.pbgrpc.dart

@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from client.proto.
-//  source: client.proto
+
-//
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
@@ -16,7 +16,7 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'client.pb.dart' as $17;
+import 'client.pb.dart' as $0;
 
 export 'client.pb.dart';
 
@@ -30,24 +30,26 @@ class ClientServiceClient extends $grpc.Client {
     '',
   ];
 
-  static final _$registerPlatformClient = $grpc.ClientMethod<$17.RegisterPlatformClientRequest, $17.RegisterClientResult>(
-      '/api.ClientService/RegisterPlatformClient',
-      ($17.RegisterPlatformClientRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $17.RegisterClientResult.fromBuffer(value));
-  static final _$registerClient = $grpc.ClientMethod<$17.RegisterClientRequest, $17.RegisterClientResult>(
-      '/api.ClientService/RegisterClient',
-      ($17.RegisterClientRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $17.RegisterClientResult.fromBuffer(value));
-
   ClientServiceClient(super.channel, {super.options, super.interceptors});
 
-  $grpc.ResponseFuture<$17.RegisterClientResult> registerPlatformClient($17.RegisterPlatformClientRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.RegisterClientResult> registerPlatformClient($0.RegisterPlatformClientRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$registerPlatformClient, request, options: options);
   }
 
-  $grpc.ResponseFuture<$17.RegisterClientResult> registerClient($17.RegisterClientRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.RegisterClientResult> registerClient($0.RegisterClientRequest request, {$grpc.CallOptions? options,}) {
     return $createUnaryCall(_$registerClient, request, options: options);
   }
+
+    // method descriptors
+
+  static final _$registerPlatformClient = $grpc.ClientMethod<$0.RegisterPlatformClientRequest, $0.RegisterClientResult>(
+      '/api.ClientService/RegisterPlatformClient',
+      ($0.RegisterPlatformClientRequest value) => value.writeToBuffer(),
+      $0.RegisterClientResult.fromBuffer);
+  static final _$registerClient = $grpc.ClientMethod<$0.RegisterClientRequest, $0.RegisterClientResult>(
+      '/api.ClientService/RegisterClient',
+      ($0.RegisterClientRequest value) => value.writeToBuffer(),
+      $0.RegisterClientResult.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.ClientService')
@@ -55,30 +57,32 @@ abstract class ClientServiceBase extends $grpc.Service {
   $core.String get $name => 'api.ClientService';
 
   ClientServiceBase() {
-    $addMethod($grpc.ServiceMethod<$17.RegisterPlatformClientRequest, $17.RegisterClientResult>(
+    $addMethod($grpc.ServiceMethod<$0.RegisterPlatformClientRequest, $0.RegisterClientResult>(
         'RegisterPlatformClient',
         registerPlatformClient_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $17.RegisterPlatformClientRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.RegisterPlatformClientRequest.fromBuffer(value),
-        ($17.RegisterClientResult value) => value.writeToBuffer()));
+        ($0.RegisterClientResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$17.RegisterClientRequest, $17.RegisterClientResult>(
+    $addMethod($grpc.ServiceMethod<$0.RegisterClientRequest, $0.RegisterClientResult>(
         'RegisterClient',
         registerClient_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $17.RegisterClientRequest.fromBuffer(value),
+        ($core.List<$core.int> value) => $0.RegisterClientRequest.fromBuffer(value),
-        ($17.RegisterClientResult value) => value.writeToBuffer()));
+        ($0.RegisterClientResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$17.RegisterClientResult> registerPlatformClient_Pre($grpc.ServiceCall $call, $async.Future<$17.RegisterPlatformClientRequest> $request) async {
+  $async.Future<$0.RegisterClientResult> registerPlatformClient_Pre($grpc.ServiceCall $call, $async.Future<$0.RegisterPlatformClientRequest> $request) async {
     return registerPlatformClient($call, await $request);
   }
 
-  $async.Future<$17.RegisterClientResult> registerClient_Pre($grpc.ServiceCall $call, $async.Future<$17.RegisterClientRequest> $request) async {
+  $async.Future<$0.RegisterClientResult> registerPlatformClient($grpc.ServiceCall call, $0.RegisterPlatformClientRequest request);
+
+  $async.Future<$0.RegisterClientResult> registerClient_Pre($grpc.ServiceCall $call, $async.Future<$0.RegisterClientRequest> $request) async {
     return registerClient($call, await $request);
   }
 
-  $async.Future<$17.RegisterClientResult> registerPlatformClient($grpc.ServiceCall call, $17.RegisterPlatformClientRequest request);
+  $async.Future<$0.RegisterClientResult> registerClient($grpc.ServiceCall call, $0.RegisterClientRequest request);
-  $async.Future<$17.RegisterClientResult> registerClient($grpc.ServiceCall call, $17.RegisterClientRequest request);
+
 }