Skip to content

Update role models (fix issue #61) #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KrishnaKanth1729 wants to merge 15 commits into
base: staging
Choose a base branch
from
Open

Update role models (fix issue #61) #63

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8729a14
Resolved Issue #61
KrishnaKanth1729 Oct 7, 2021
3627ac7
Changed Field(None, le=0xFFFFFF, ge=0) to None
KrishnaKanth1729 Oct 8, 2021
fb82222
Converted Color Values to string from hex ints :mhm:
KrishnaKanth1729 Oct 14, 2021
24b22d6
Added newline at end of the file :bonk:
KrishnaKanth1729 Oct 15, 2021
07c4897
Added newline at end of the file :bonk:
KrishnaKanth1729 Oct 15, 2021
78e2212
Added Linting and Black formatting
KrishnaKanth1729 Nov 6, 2021
227fb2c
Merge branch 'Tech-With-Tim:staging' into staging
KrishnaKanth1729 Nov 6, 2021
b9410ec
Fix tests
KrishnaKanth1729 Nov 11, 2021
db12fe7
Merge branch 'staging' of https://github.com/KrishnaKanth1729/api int…
KrishnaKanth1729 Nov 11, 2021
b790512
Altered a testcase by mistake fix :bonk:
KrishnaKanth1729 Nov 11, 2021
c50dbc1
Updated Tests and update_role
KrishnaKanth1729 Nov 12, 2021
5f3e58f
Fix Tests
KrishnaKanth1729 Nov 12, 2021
0157c81
Altered SQL Query by mistake :bonk:
KrishnaKanth1729 Nov 12, 2021
f6e107e
tests
KrishnaKanth1729 Nov 16, 2021
54c2953
Reverted print statement and int conversion
KrishnaKanth1729 Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions api/versions/v1/routers/roles/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
from typing import List, Optional
from pydantic import BaseModel, Field
from pydantic.color import Color


class RoleResponse(BaseModel):
id: str
name: str
position: int
permissions: int
color: Optional[int]
color: Optional[Color]


class DetailedRoleResponse(RoleResponse):
Expand All @@ -16,12 +17,12 @@ class DetailedRoleResponse(RoleResponse):

class NewRoleBody(BaseModel):
name: str = Field(..., min_length=4, max_length=32)
color: Optional[int] = Field(None, le=0xFFFFFF, ge=0)
color: Optional[Color] = Field(None, le=0xFFFFFF, ge=0)
permissions: Optional[int] = Field(0, ge=0)


class UpdateRoleBody(BaseModel):
name: str = Field("", min_length=4, max_length=64)
color: Optional[int] = Field(None, le=0xFFFFFF, ge=0)
name: str = Field("", min_length=4, max_length=32)
color: Optional[Color] = Field(None, le=0xFFFFFF, ge=0)
permissions: int = Field(0, ge=0)
position: int = Field(0, ge=0)