Update proto contracts

diadoc · Jul 19, 2021 · 2f375a8 · 2f375a8
1 parent 3298de5
commit 2f375a8
Show file tree

Hide file tree

Showing 15 changed files with 494 additions and 2,973 deletions.
diff --git a/proto/CertificateInfoV2.proto b/proto/CertificateInfoV2.proto
diff --git a/proto/CertificateList.proto b/proto/CertificateList.proto
diff --git a/proto/Docflow/DocumentInfo.proto b/proto/Docflow/DocumentInfo.proto
@@ -75,10 +75,10 @@ message ContractDocumentInfo
 
 message SupplementaryAgreementDocumentInfo
 {
-	optional string Total = 1;
-	optional string ContractType = 2;
-	optional string ContractNumber = 3;
-	optional string ContractDate = 4;
+	optional string ContractType = 1;
+	required DocumentDateAndNumber ContractDocumentDateAndNumber = 2;
+	required DocumentDateAndNumber DocumentDateAndNumber = 3;
+	optional string Total = 4;
 }
 
 message UniversalTransferDocumentInfo

diff --git a/proto/Docflow/DocumentInfoV3.proto b/proto/Docflow/DocumentInfoV3.proto
@@ -30,6 +30,7 @@ message DocumentInfoV3
 	optional DocumentDraftInfo DraftInfo = 16;
 	optional DocumentTemplateInfo TemplateInfo = 17;
 	optional Documents.Origin Origin = 18;
+	optional string EditingSettingId = 19 [default = ""];
 }
 
 message DocumentParticipants

diff --git a/proto/Dss/DssSign.proto b/proto/Dss/DssSign.proto
@@ -13,6 +13,7 @@ message DssSignFile
 	optional string FileName = 2;
 }
 
+
 enum DssConfirmType {
 	ConfirmTypeUnknown = -1;
 	None = 0;
@@ -27,28 +28,27 @@ enum DssOperator {
 	Kontur = 2;
 }
 
-message DssSignResult
-{
+message DssSignResult {
 	optional DssOperationStatus OperationStatus = 1 [default = Unknown];
 	repeated DssFileSigningResult FileSigningResults = 2;
 	optional DssConfirmType ConfirmType = 3 [default = ConfirmTypeUnknown];
 	optional DssOperator Operator = 4 [default = OperatorUnknown];
 	optional string PhoneLastNumbers = 5;
 }
- 
+
 message DssFileSigningResult
 {
 	optional DssFileSigningStatus FileSigningStatus = 1 [default = UnknownSigningStatus];
 	optional bytes Signature = 2;
 }
- 
+
 enum DssFileSigningStatus
 {
 	UnknownSigningStatus = 0;
 	SigningCompleted = 1;
 	SigningError = 2;
 }
- 
+
 enum DssOperationStatus
 {
 	Unknown = 0;

diff --git a/src/DiadocApi.cpp b/src/DiadocApi.cpp
@@ -1409,12 +1409,12 @@ Diadoc::Api::Proto::UserV2 DiadocApi::UpdateMyUser(Diadoc::Api::Proto::Users::Us
 	return FromProtoBytes<Diadoc::Api::Proto::UserV2>(PerformHttpRequest(L"/UpdateMyUser", ToProtoBytes(userToUpdate), POST));
 }
 
-Diadoc::Api::Proto::CertificateList DiadocApi::GetMyCertificates(const std::wstring& boxId)
+Diadoc::Api::Proto::Certificates::CertificateList DiadocApi::GetMyCertificates(const std::wstring& boxId)
 {
     WppTraceDebugOut("GetMyCertificates...");
     std::wstringstream buf;
     buf << L"/GetMyCertificates?boxId=" << StringHelper::CanonicalizeUrl(boxId);
-    return FromProtoBytes<Diadoc::Api::Proto::CertificateList>(PerformHttpRequest(buf.str(), GET));
+    return FromProtoBytes<Diadoc::Api::Proto::Certificates::CertificateList>(PerformHttpRequest(buf.str(), GET));
 }
 
 Diadoc::Api::Proto::Departments::Department DiadocApi::GetDepartmentByFullId(const std::wstring& boxId, const std::wstring& departmentId)

diff --git a/src/DiadocApi.h b/src/DiadocApi.h
@@ -54,7 +54,7 @@
 #include "protos\AcquireCounteragent.pb.h"
 #include "protos\CustomPrintFormDetection.pb.h"
 #include "protos\Registration\RegistrationRequest.pb.h"
-#include "protos\CertificateList.pb.h"
+#include "protos\Certificates\CertificateList.pb.h"
 #include "DocumentFilter.h"
 #include "HttpSession.h"
 #include "TaskResult.h"
@@ -271,7 +271,7 @@ class DiadocApi
 	Diadoc::Api::Proto::User GetMyUser();
 	Diadoc::Api::Proto::UserV2 GetMyUserV2();
 	Diadoc::Api::Proto::UserV2 UpdateMyUser(Diadoc::Api::Proto::Users::UserToUpdate& userToUpdate);
-	Diadoc::Api::Proto::CertificateList GetMyCertificates(const std::wstring& boxId);
+	Diadoc::Api::Proto::Certificates::CertificateList GetMyCertificates(const std::wstring& boxId);
 
 	Diadoc::Api::Proto::Departments::Department GetDepartmentByFullId(const std::wstring& boxId, const std::wstring& departmentId);
 	Diadoc::Api::Proto::Departments::DepartmentList GetDepartments(const std::wstring& boxId, int* page = NULL, int* count = NULL);