Merge pull request #300 from zharkovstas/master

Added Labels
diadoc · Mar 30, 2018 · be34497 · be34497
2 parents b354391 + 9a5d1d4
commit be34497
Show file tree

Hide file tree

Showing 5 changed files with 254 additions and 1 deletion.
diff --git a/proto/Events/DiadocMessage-GetApi.proto b/proto/Events/DiadocMessage-GetApi.proto
@@ -101,6 +101,7 @@ message Entity {
 	optional ResolutionRouteAssignmentInfo ResolutionRouteAssignmentInfo = 22; // only for AttachmentType.ResolutionRouteAssignmentAttachment
 	optional ResolutionRouteRemovalInfo ResolutionRouteRemovalInfo = 23;	// only for AttachmentType.ResolutionRouteRemovalAttachment
 	optional CancellationInfo CancellationInfo = 24;						// only for AttachmentType.Cancellation
+	repeated string Labels = 25;
 }
 
 message EntityPatch {

diff --git a/proto/Events/DiadocMessage-PostApi.proto b/proto/Events/DiadocMessage-PostApi.proto
@@ -313,6 +313,7 @@ message SignatureVerification {
 	required string InitialDocumentId = 1;
 	required bool IsValid = 2;
 	optional string ErrorMessage = 3;
+	repeated string Labels = 4;
 }
 
 message ResolutionRequestAttachment {
@@ -321,18 +322,21 @@ message ResolutionRequestAttachment {
 	optional string TargetUserId = 3;
 	optional string TargetDepartmentId = 4;
 	optional string Comment = 5;
+	repeated string Labels = 6;
 }
 
 message ResolutionRouteAssignment
 {
 	required string InitialDocumentId = 1;
 	required string RouteId = 2;
 	optional string Comment = 3;
+	repeated string Labels = 4;
 }
 
 message ResolutionRequestCancellationAttachment {
 	required string InitialResolutionRequestId = 1;
 	optional string Comment = 2;
+	repeated string Labels = 3;
 }
 
 message ResolutionRequestDenialCancellationAttachment {
@@ -342,24 +346,28 @@ message ResolutionRequestDenialCancellationAttachment {
 message ResolutionRequestDenialAttachment {
 	required string InitialResolutionRequestId = 1;
 	optional string Comment = 2;
+	repeated string Labels = 3;
 }
 
 message ResolutionAttachment {
 	required string InitialDocumentId = 1;
 	required ResolutionType ResolutionType = 2;
 	optional string Comment = 3;
+	repeated string Labels = 4;
 }
 
 message ReceiptAttachment {
 	required string ParentEntityId = 1;
 	required SignedContent SignedContent = 2;
 	// do not use field #3
+	repeated string Labels = 4;
 }
 
 message CorrectionRequestAttachment {
 	required string ParentEntityId = 1;
 	required SignedContent SignedContent = 2;
 	// do not use field #3
+	repeated string Labels = 4;
 }
 
 message DocumentSignature {
@@ -369,6 +377,7 @@ message DocumentSignature {
 	optional bool IsApprovementSignature = 5 [default = false];
 	optional string SignatureNameOnShelf = 6;
 	optional string PatchedContentId = 7;
+	repeated string Labels = 8;
 }
 
 message DocumentSenderSignature {
@@ -381,6 +390,7 @@ message DocumentSenderSignature {
 message RequestedSignatureRejection {
 	required string ParentEntityId = 1;
 	required SignedContent SignedContent = 2;
+	repeated string Labels = 3;
 }
 
 message SignedContent {
@@ -450,11 +460,13 @@ message MessageToSend {
 message RevocationRequestAttachment {
 	required string ParentEntityId = 1;
 	required SignedContent SignedContent = 2;
+	repeated string Labels = 3;
 }
 
 message XmlSignatureRejectionAttachment {
 	required string ParentEntityId = 1;
 	required SignedContent SignedContent = 2;
+	repeated string Labels = 3;
 }
 
 message RoamingNotificationToPost {
@@ -486,6 +498,7 @@ message ResolutionRouteRemoval {
 	required string ParentEntityId = 1; // EntityId документа, который нужно снять с маршрута согласования
 	required string RouteId = 2; // Идентификатор маршрута, с которого нужно снять документ
 	optional string Comment = 3 [default = ""]; // Текстовый комментарий, ограничение - 256 символов
+	repeated string Labels = 4;
 }
 
 message TemplateToPost {

diff --git a/src/Proto/Events/DiadocMessage-GetApi.proto.cs b/src/Proto/Events/DiadocMessage-GetApi.proto.cs
@@ -657,6 +657,13 @@ public Diadoc.Api.Proto.Events.CancellationInfo CancellationInfo
       get { return _CancellationInfo; }
       set { _CancellationInfo = value; }
     }
+    private readonly global::System.Collections.Generic.List<string> _Labels = new global::System.Collections.Generic.List<string>();
+    [global::ProtoBuf.ProtoMember(25, Name=@"Labels", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public global::System.Collections.Generic.List<string> Labels
+    {
+      get { return _Labels; }
+    }
+
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }

diff --git a/src/Proto/Events/DiadocMessage-PostApi.proto.cs b/src/Proto/Events/DiadocMessage-PostApi.proto.cs
@@ -1983,6 +1983,13 @@ public string ErrorMessage
       get { return _ErrorMessage; }
       set { _ErrorMessage = value; }
     }
+    private readonly global::System.Collections.Generic.List<string> _Labels = new global::System.Collections.Generic.List<string>();
+    [global::ProtoBuf.ProtoMember(4, Name=@"Labels", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public global::System.Collections.Generic.List<string> Labels
+    {
+      get { return _Labels; }
+    }
+
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -2034,6 +2041,13 @@ public string Comment
       get { return _Comment; }
       set { _Comment = value; }
     }
+    private readonly global::System.Collections.Generic.List<string> _Labels = new global::System.Collections.Generic.List<string>();
+    [global::ProtoBuf.ProtoMember(6, Name=@"Labels", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public global::System.Collections.Generic.List<string> Labels
+    {
+      get { return _Labels; }
+    }
+
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -2067,6 +2081,13 @@ public string Comment
       get { return _Comment; }
       set { _Comment = value; }
     }
+    private readonly global::System.Collections.Generic.List<string> _Labels = new global::System.Collections.Generic.List<string>();
+    [global::ProtoBuf.ProtoMember(4, Name=@"Labels", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public global::System.Collections.Generic.List<string> Labels
+    {
+      get { return _Labels; }
+    }
+
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -2093,6 +2114,13 @@ public string Comment
       get { return _Comment; }
       set { _Comment = value; }
     }
+    private readonly global::System.Collections.Generic.List<string> _Labels = new global::System.Collections.Generic.List<string>();
+    [global::ProtoBuf.ProtoMember(3, Name=@"Labels", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public global::System.Collections.Generic.List<string> Labels
+    {
+      get { return _Labels; }
+    }
+
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -2136,6 +2164,13 @@ public string Comment
       get { return _Comment; }
       set { _Comment = value; }
     }
+    private readonly global::System.Collections.Generic.List<string> _Labels = new global::System.Collections.Generic.List<string>();
+    [global::ProtoBuf.ProtoMember(3, Name=@"Labels", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public global::System.Collections.Generic.List<string> Labels
+    {
+      get { return _Labels; }
+    }
+
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -2169,6 +2204,13 @@ public string Comment
       get { return _Comment; }
       set { _Comment = value; }
     }
+    private readonly global::System.Collections.Generic.List<string> _Labels = new global::System.Collections.Generic.List<string>();
+    [global::ProtoBuf.ProtoMember(4, Name=@"Labels", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public global::System.Collections.Generic.List<string> Labels
+    {
+      get { return _Labels; }
+    }
+
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -2193,6 +2235,13 @@ public Diadoc.Api.Proto.Events.SignedContent SignedContent
       get { return _SignedContent; }
       set { _SignedContent = value; }
     }
+    private readonly global::System.Collections.Generic.List<string> _Labels = new global::System.Collections.Generic.List<string>();
+    [global::ProtoBuf.ProtoMember(4, Name=@"Labels", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public global::System.Collections.Generic.List<string> Labels
+    {
+      get { return _Labels; }
+    }
+
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -2217,6 +2266,13 @@ public Diadoc.Api.Proto.Events.SignedContent SignedContent
       get { return _SignedContent; }
       set { _SignedContent = value; }
     }
+    private readonly global::System.Collections.Generic.List<string> _Labels = new global::System.Collections.Generic.List<string>();
+    [global::ProtoBuf.ProtoMember(4, Name=@"Labels", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public global::System.Collections.Generic.List<string> Labels
+    {
+      get { return _Labels; }
+    }
+
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -2279,6 +2335,13 @@ public string PatchedContentId
       get { return _PatchedContentId; }
       set { _PatchedContentId = value; }
     }
+    private readonly global::System.Collections.Generic.List<string> _Labels = new global::System.Collections.Generic.List<string>();
+    [global::ProtoBuf.ProtoMember(8, Name=@"Labels", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public global::System.Collections.Generic.List<string> Labels
+    {
+      get { return _Labels; }
+    }
+
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -2347,6 +2410,13 @@ public Diadoc.Api.Proto.Events.SignedContent SignedContent
       get { return _SignedContent; }
       set { _SignedContent = value; }
     }
+    private readonly global::System.Collections.Generic.List<string> _Labels = new global::System.Collections.Generic.List<string>();
+    [global::ProtoBuf.ProtoMember(3, Name=@"Labels", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public global::System.Collections.Generic.List<string> Labels
+    {
+      get { return _Labels; }
+    }
+
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -2750,6 +2820,13 @@ public Diadoc.Api.Proto.Events.SignedContent SignedContent
       get { return _SignedContent; }
       set { _SignedContent = value; }
     }
+    private readonly global::System.Collections.Generic.List<string> _Labels = new global::System.Collections.Generic.List<string>();
+    [global::ProtoBuf.ProtoMember(3, Name=@"Labels", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public global::System.Collections.Generic.List<string> Labels
+    {
+      get { return _Labels; }
+    }
+
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -2774,6 +2851,13 @@ public Diadoc.Api.Proto.Events.SignedContent SignedContent
       get { return _SignedContent; }
       set { _SignedContent = value; }
     }
+    private readonly global::System.Collections.Generic.List<string> _Labels = new global::System.Collections.Generic.List<string>();
+    [global::ProtoBuf.ProtoMember(3, Name=@"Labels", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public global::System.Collections.Generic.List<string> Labels
+    {
+      get { return _Labels; }
+    }
+
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -2918,6 +3002,13 @@ public string Comment
       get { return _Comment; }
       set { _Comment = value; }
     }
+    private readonly global::System.Collections.Generic.List<string> _Labels = new global::System.Collections.Generic.List<string>();
+    [global::ProtoBuf.ProtoMember(4, Name=@"Labels", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public global::System.Collections.Generic.List<string> Labels
+    {
+      get { return _Labels; }
+    }
+
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }