Merge pull request #499 from zharkovstas/master

Add GetMyEmployee method and CanDeleteRestoreDocuments flag
diadoc · Jul 9, 2019 · fefe7d1 · fefe7d1
2 parents 0713f79 + f97639c
commit fefe7d1
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 7 deletions.
diff --git a/proto/OrganizationUserPermissions.proto b/proto/OrganizationUserPermissions.proto
@@ -20,6 +20,7 @@ message OrganizationUserPermissions {
 	optional string JobTitle = 10;
 	required bool CanCreateDocuments = 11;
 	required AuthorizationPermission AuthorizationPermission = 12;
+	required bool CanDeleteRestoreDocuments = 13;
 }
 
 message AuthorizationPermission {

diff --git a/src/ComDiadocApi.cs b/src/ComDiadocApi.cs
@@ -601,6 +601,11 @@ public void DeleteEmployee(string authToken, string boxId, string userId)
 			diadoc.DeleteEmployee(authToken, boxId, userId);
 		}
 
+		public Employee GetMyEmployee(string authToken, string boxId)
+		{
+			return diadoc.GetMyEmployee(authToken, boxId);
+		}
+
 		public EmployeeSubscriptions GetSubscriptions(string authToken, string boxId, string userId)
 		{
 			return diadoc.GetSubscriptions(authToken, boxId, userId);

diff --git a/src/DiadocApi.Async.cs b/src/DiadocApi.Async.cs
@@ -1077,6 +1077,13 @@ public Task DeleteEmployeeAsync(string authToken, string boxId, string userId)
 			return diadocHttpApi.DeleteEmployeeAsync(authToken, boxId, userId);
 		}
 
+		public Task<Employee> GetMyEmployeeAsync(string authToken, string boxId)
+		{
+			if (authToken == null) throw new ArgumentNullException("authToken");
+			if (boxId == null) throw new ArgumentNullException("boxId");
+			return diadocHttpApi.GetMyEmployeeAsync(authToken, boxId);
+		}
+
 		public Task<EmployeeSubscriptions> GetSubscriptionsAsync(string authToken, string boxId, string userId)
 		{
 			if (authToken == null) throw new ArgumentNullException("authToken");

diff --git a/src/DiadocApi.cs b/src/DiadocApi.cs
@@ -1141,6 +1141,13 @@ public void DeleteEmployee(string authToken, string boxId, string userId)
 			diadocHttpApi.DeleteEmployee(authToken, boxId, userId);
 		}
 
+		public Employee GetMyEmployee(string authToken, string boxId)
+		{
+			if (authToken == null) throw new ArgumentNullException("authToken");
+			if (boxId == null) throw new ArgumentNullException("boxId");
+			return diadocHttpApi.GetMyEmployee(authToken, boxId);
+		}
+
 		public EmployeeSubscriptions GetSubscriptions(string authToken, string boxId, string userId)
 		{
 			if (authToken == null) throw new ArgumentNullException("authToken");

diff --git a/src/DiadocHttpApi.Employees.Async.cs b/src/DiadocHttpApi.Employees.Async.cs
@@ -62,5 +62,12 @@ public Task<EmployeeSubscriptions> UpdateSubscriptionsAsync(string authToken, st
 			queryString.AddParameter("userId", userId);
 			return PerformHttpRequestAsync<SubscriptionsToUpdate, EmployeeSubscriptions>(authToken, queryString.BuildPathAndQuery(), subscriptionsToUpdate);
 		}
+
+		public Task<Employee> GetMyEmployeeAsync(string authToken, string boxId)
+		{
+			var queryString = new PathAndQueryBuilder("/GetMyEmployee");
+			queryString.AddParameter("boxId", boxId);
+			return PerformHttpRequestAsync<Employee>(authToken, "GET", queryString.BuildPathAndQuery());
+		}
 	}
 }
diff --git a/src/DiadocHttpApi.Employees.cs b/src/DiadocHttpApi.Employees.cs
@@ -61,5 +61,12 @@ public EmployeeSubscriptions UpdateSubscriptions(string authToken, string boxId,
 			queryString.AddParameter("userId", userId);
 			return PerformHttpRequest<SubscriptionsToUpdate, EmployeeSubscriptions>(authToken, queryString.BuildPathAndQuery(), subscriptionsToUpdate);
 		}
+
+		public Employee GetMyEmployee(string authToken, string boxId)
+		{
+			var queryString = new PathAndQueryBuilder("/GetMyEmployee");
+			queryString.AddParameter("boxId", boxId);
+			return PerformHttpRequest<Employee>(authToken, "GET", queryString.BuildPathAndQuery());
+		}
 	}
 }
diff --git a/src/IDiadocApi.cs b/src/IDiadocApi.cs
@@ -201,6 +201,7 @@ public interface IDiadocApi
 		Employee CreateEmployee(string authToken, string boxId, EmployeeToCreate employeeToCreate);
 		Employee UpdateEmployee(string authToken, string boxId, string userId, EmployeeToUpdate employeeToUpdate);
 		void DeleteEmployee(string authToken, string boxId, string userId);
+		Employee GetMyEmployee(string authToken, string boxId);
 		EmployeeSubscriptions GetSubscriptions(string authToken, string boxId, string userId);
 		EmployeeSubscriptions UpdateSubscriptions(string authToken, string boxId, string userId, SubscriptionsToUpdate subscriptionsToUpdate);
 
@@ -372,6 +373,7 @@ public interface IDiadocApi
 		Task<Employee> CreateEmployeeAsync(string authToken, string boxId, EmployeeToCreate employeeToCreate);
 		Task<Employee> UpdateEmployeeAsync(string authToken, string boxId, string userId, EmployeeToUpdate employeeToUpdate);
 		Task DeleteEmployeeAsync(string authToken, string boxId, string userId);
+		Task<Employee> GetMyEmployeeAsync(string authToken, string boxId);
 		Task<EmployeeSubscriptions> GetSubscriptionsAsync(string authToken, string boxId, string userId);
 		Task<EmployeeSubscriptions> UpdateSubscriptionsAsync(string authToken, string boxId, string userId, SubscriptionsToUpdate subscriptionsToUpdate);
 		Task<Departments.Department> GetDepartmentByFullIdAsync(string authToken, string boxId, string departmentId);

diff --git a/src/Proto/OrganizationUserPermissions.cs b/src/Proto/OrganizationUserPermissions.cs
@@ -13,23 +13,24 @@ public interface IOrganizationUserPermissions
 		bool CanAddResolutions { get; }
 		bool CanRequestResolutions { get; }
 		AuthorizationPermission AuthorizationPermission { get; }
+		bool CanDeleteRestoreDocuments { get; }
 	}
 
 	[ComVisible(true)]
 	[Guid("783B622C-88B1-4B88-A855-370EB9848DB0")]
 	[ClassInterface(ClassInterfaceType.None)]
-	[ComDefaultInterface(typeof (IOrganizationUserPermissions))]
-	public partial class OrganizationUserPermissions: SafeComObject, IOrganizationUserPermissions
+	[ComDefaultInterface(typeof(IOrganizationUserPermissions))]
+	public partial class OrganizationUserPermissions : SafeComObject, IOrganizationUserPermissions
 	{
 		public override string ToString()
 		{
-			return string.Format("UserDepartmentId: {0}, IsAdministrator: {1}, DocumentAccessLevel: {2}, CanSignDocuments: {3}, CanAddResolutions: {4}, CanRequestResolutions: {5}",
-				UserDepartmentId, IsAdministrator, DocumentAccessLevel, CanSignDocuments, CanAddResolutions, CanRequestResolutions);
+			return string.Format("UserDepartmentId: {0}, IsAdministrator: {1}, DocumentAccessLevel: {2}, CanSignDocuments: {3}, CanAddResolutions: {4}, CanRequestResolutions: {5}, CanDeleteRestoreDocuments: {6}",
+				UserDepartmentId, IsAdministrator, DocumentAccessLevel, CanSignDocuments, CanAddResolutions, CanRequestResolutions, CanDeleteRestoreDocuments);
 		}
 
 		public Com.DocumentAccessLevel DocumentAccessLevelValue
 		{
-			get { return (Com.DocumentAccessLevel)((int)DocumentAccessLevel); }
+			get { return (Com.DocumentAccessLevel) ((int) DocumentAccessLevel); }
 		}
 	}
 
@@ -44,8 +45,8 @@ public interface IAuthorizationPermission
 	[ComVisible(true)]
 	[Guid("A66D77DE-2B5C-45FE-BD57-A755D8F803CA")]
 	[ClassInterface(ClassInterfaceType.None)]
-	[ComDefaultInterface(typeof (IAuthorizationPermission))]
+	[ComDefaultInterface(typeof(IAuthorizationPermission))]
 	public partial class AuthorizationPermission : SafeComObject, IAuthorizationPermission
 	{
 	}
-}
+}
diff --git a/src/Proto/OrganizationUserPermissions.proto.cs b/src/Proto/OrganizationUserPermissions.proto.cs
@@ -96,6 +96,13 @@ public Diadoc.Api.Proto.AuthorizationPermission AuthorizationPermission
       get { return _AuthorizationPermission; }
       set { _AuthorizationPermission = value; }
     }
+    private bool _CanDeleteRestoreDocuments;
+    [global::ProtoBuf.ProtoMember(13, IsRequired = true, Name=@"CanDeleteRestoreDocuments", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public bool CanDeleteRestoreDocuments
+    {
+      get { return _CanDeleteRestoreDocuments; }
+      set { _CanDeleteRestoreDocuments = value; }
+    }
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }