IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quota: string representation of quota

Browse Source
This commit is contained in:
Nikolay Rechkin 2022-08-29 20:20:58 +03:00
parent ff8cfa3737
commit 933a4129fa
6 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/ASC.ActiveDirectory/Base/Data/LdapObjectExtension.cs
View File

@ -145,7 +145,7 @@ public class LdapObjectExtension
var emails = GetContacts(ldapUser, Mapping.AdditionalMail, settings);
var skype = GetContacts(ldapUser, Mapping.Skype, settings);
var quota = settings.LdapMapping.ContainsKey(Mapping.UserQuotaLimit) ? GetAttribute(ldapUser, settings.LdapMapping[Mapping.UserQuotaLimit]) : "1000";
var quota = settings.LdapMapping.ContainsKey(Mapping.UserQuotaLimit) ? GetAttribute(ldapUser, settings.LdapMapping[Mapping.UserQuotaLimit]) : "10Mb";
if (string.IsNullOrEmpty(userName))
{
@ -170,7 +170,7 @@ public class LdapObjectExtension
Location = !string.IsNullOrEmpty(location) ? location : string.Empty,
WorkFromDate = _tenantUtil.DateTimeNow(),
ContactsList = contacts,
QuotaLimit = Int32.Parse(quota)
QuotaLimit = quota
};
if (!string.IsNullOrEmpty(firstName))

36
common/ASC.Core.Common/ByteConverter.cs
View File

@ -41,4 +41,40 @@ public static class ByteConverter
return bytes < MB ? bytes * MB : bytes;
}
public static long ConvertSizeToBytes(string size)
{
long bytes = 0;
var regex = new Regex(@"\d+|\w+");
var matches = regex.Matches(size);
if (matches.Count > 0)
{
var num = int.Parse(matches[0].Value);
var unit = matches[1].Value.ToLower();
switch (unit)
{
case "bytes":
bytes = num;
break;
case "kb":
bytes = num * 1024;
break;
case "mb":
bytes = Convert.ToInt64(num * Math.Pow(1024, 2));
break;
case "gb":
bytes = Convert.ToInt64(num * Math.Pow(1024, 3));
break;
case "tb":
bytes = Convert.ToInt64(num * Math.Pow(1024, 4));
break;
case "pb":
bytes = Convert.ToInt64(num * Math.Pow(1024, 5));
break;
}
return bytes;
}
return -1;
}
}

2
common/ASC.Core.Common/Core/UserInfo.cs
View File

@ -74,7 +74,7 @@ public sealed class UserInfo : IDirectRecipient, ICloneable, IMapFrom<User>
public string SsoNameId { get; set; } // SSO SAML user identificator
public string SsoSessionId { get; set; } // SSO SAML user session identificator
public DateTime CreateDate { get; set; }
public long QuotaLimit { get; set; }
public string QuotaLimit { get; set; }
public override string ToString()
{

2
common/ASC.Core.Common/EF/Model/User/User.cs
View File

@ -53,7 +53,7 @@ public class User : BaseEntity, IMapFrom<UserInfo>
public bool Removed { get; set; }
public DateTime CreateDate { get; set; }
public DateTime LastModified { get; set; }
public long QuotaLimit { get; set; }
public string QuotaLimit { get; set; }
public override object[] GetKeys()
{

5
products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
View File

@ -413,10 +413,11 @@ internal class FileDao : AbstractDao, IFileDao<int>
}
var user = _userManager.GetUsers(file.Id == default ? _authContext.CurrentAccount.ID : file.CreateBy);
var quotaLimit = ByteConverter.ConvertSizeToBytes(user.QuotaLimit);
if (user.QuotaLimit - await _globalSpace.GetUserUsedSpaceAsync(file.Id == default ? _authContext.CurrentAccount.ID : file.CreateBy) < file.ContentLength)
if (quotaLimit - await _globalSpace.GetUserUsedSpaceAsync(file.Id == default ? _authContext.CurrentAccount.ID : file.CreateBy) < file.ContentLength)
{
throw FileSizeComment.GetPersonalFreeSpaceException(user.QuotaLimit);
throw FileSizeComment.GetPersonalFreeSpaceException(quotaLimit);
}
var isNew = false;

2
products/ASC.People/Server/ApiModels/RequestDto/UpdateMembersQuotaRequestDto.cs
View File

@ -29,5 +29,5 @@ namespace ASC.People.ApiModels.RequestDto;
public class UpdateMembersQuotaRequestDto
{
public IEnumerable<Guid> UserIds { get; set; }
public long Quota { get; set; }
public string Quota { get; set; }
}