VladislavOstapov/arka-api
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

изменено поле аккаунта, исправлена поддержка расширений для фотографий профиля

Browse Source
This commit is contained in:
VladislavOstapov 2023-04-09 18:21:11 +03:00
parent 9fdb209754
commit d58e4cc256
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/api_methods.py
View File

@ -54,7 +54,7 @@ class ApiAccount:
"city": {"code": user.city, "name": CITIES_CHOICES[user.city]} if user.city is not None else None, "city": {"code": user.city, "name": CITIES_CHOICES[user.city]} if user.city is not None else None,
"register_datetime": int(time.mktime(user.register_datetime.timetuple())), "register_datetime": int(time.mktime(user.register_datetime.timetuple())),
"role": user.role, "role": user.role,
"confirmed": user.confirmed "verified": user.verified
} }
if hasattr(user, 'accountavatar'): if hasattr(user, 'accountavatar'):
@ -222,7 +222,7 @@ class ApiAccount:
if p is None: if p is None:
raise Exception(API_ERROR_NOT_FOUND, 'field "photo" not found') raise Exception(API_ERROR_NOT_FOUND, 'field "photo" not found')
if p.owner.id == user.id and (p.extension == 'jpeg' or p.extension == 'png'): if p.owner.id == user.id and p.extension in Media.PHOTO_EXTENSIONS:
if not hasattr(user, 'accountavatar'): if not hasattr(user, 'accountavatar'):
user.accountavatar = await AccountAvatar.objects.acreate(account=user) user.accountavatar = await AccountAvatar.objects.acreate(account=user)
user.accountavatar.photo = p user.accountavatar.photo = p
@ -235,7 +235,7 @@ class ApiAccount:
if p is None: if p is None:
raise Exception(API_ERROR_NOT_FOUND, 'field "profile_background" not found') raise Exception(API_ERROR_NOT_FOUND, 'field "profile_background" not found')
if p.owner.id == user.id and p.extension == 'jpeg': if p.owner.id == user.id and p.extension in Media.PHOTO_EXTENSIONS:
if not hasattr(user, 'accountavatar'): if not hasattr(user, 'accountavatar'):
user.accountavatar = await AccountAvatar.objects.acreate(account=user) user.accountavatar = await AccountAvatar.objects.acreate(account=user)
user.accountavatar.profile_background = p user.accountavatar.profile_background = p

4
api/models.py
View File

@ -41,7 +41,7 @@ class Account(models.Model):
register_datetime = models.DateTimeField(default=datetime.now, editable=False) register_datetime = models.DateTimeField(default=datetime.now, editable=False)
confirmed = models.BooleanField(default=False, verbose_name="Подтвержденный аккаунт") verified = models.BooleanField(default=False, verbose_name="Подтвержденный аккаунт")
@staticmethod @staticmethod
def create_user(phone: str, **kvargs): def create_user(phone: str, **kvargs):
@ -103,6 +103,8 @@ class Media(models.Model):
size = models.IntegerField(verbose_name='Размер в байтах') size = models.IntegerField(verbose_name='Размер в байтах')
upload_datetime = models.DateTimeField(default=datetime.now, editable=False) upload_datetime = models.DateTimeField(default=datetime.now, editable=False)
PHOTO_EXTENSIONS = ['jpg', 'jpeg', 'png']
@staticmethod @staticmethod
async def get_by_id(user_id: int, media_id: int): async def get_by_id(user_id: int, media_id: int):
m = Media.objects.filter(user_id=user_id, id=media_id).select_related('executoraccount', 'city') m = Media.objects.filter(user_id=user_id, id=media_id).select_related('executoraccount', 'city')