Renamed groups to roles in the frontend

Working:
 Account
 Cost Centre
 Employee
 Product Group
 Product
 Role
 User
 Client

brewman/models/master.py

@@ -106,14 +106,14 @@ class Product(Base):
         return True, ""
 
     @classmethod
-    def query(cls, term, is_purchased=None, active=None, db=None):
+    def query(cls, q, is_purchased=None, active=None, db=None):
         query_ = db.query(Product)
         if active is not None:
             query_ = query_.filter(Product.is_active == active)
         if is_purchased is not None:
             query_ = query_.filter(Product.is_purchased == is_purchased)
-        if term is not None:
-            for item in term.split():
+        if q is not None:
+            for item in q.split():
                 if item.strip() != "":
                     query_ = query_.filter(Product.name.ilike("%" + item + "%"))
         return query_

brewman/routers/account.py

@@ -27,7 +27,7 @@ def get_db() -> Session:
         db.close()
 
 
-@router.post("/", response_model=schemas.Account)
+@router.post("", response_model=schemas.Account)
 def save(
     data: schemas.AccountIn,
     db: Session = Depends(get_db),
@@ -115,7 +115,7 @@ def delete(
         )
 
 
-@router.get("/")
+@router.get("")
 def show_blank(
     db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["accounts"])
 ):

brewman/routers/account_types.py

@@ -7,7 +7,7 @@ from brewman.models.master import AccountType
 router = APIRouter()
 
 
-@router.get("/")
+@router.get("")
 def account_type_list(user: UserToken = Depends(get_user)):
     return [
         {"id": item.id, "name": item.name}

brewman/routers/auth/client.py

@@ -24,7 +24,7 @@ def get_db():
         db.close()
 
 
-@router.put("/{id_}", response_model=schemas.Client)
+@router.put("/{id_}")
 def update(
     id_: uuid.UUID,
     data: schemas.ClientIn,

brewman/routers/auth/role.py

@@ -24,7 +24,7 @@ def get_db():
         db.close()
 
 
-@router.post("/", response_model=schemas.Role)
+@router.post("", response_model=schemas.Role)
 def save(
     data: schemas.RoleIn,
     db: Session = Depends(get_db),
@@ -113,7 +113,7 @@ def delete(
         )
 
 
-@router.get("/")
+@router.get("")
 def show_blank(
     db: Session = Depends(get_db),
     user: UserToken = Security(get_user, scopes=["users"]),
@@ -163,10 +163,10 @@ def role_info(item: Optional[Role], db):
             "name": item.name,
             "permissions": [
                 {
-                    "id": item.id,
-                    "name": item.name,
-                    "enabled": True if item in item.permissions else False,
+                    "id": p.id,
+                    "name": p.name,
+                    "enabled": True if p in item.permissions else False,
                 }
-                for item in db.query(Role).order_by(Role.name).all()
+                for p in db.query(Permission).order_by(Permission.name).all()
             ],
         }

brewman/routers/auth/user.py

@@ -24,7 +24,7 @@ def get_db():
         db.close()
 
 
-@router.post("/", response_model=schemas.User)
+@router.post("", response_model=schemas.User)
 def save(
     data: schemas.UserIn,
     db: Session = Depends(get_db),
@@ -65,7 +65,7 @@ def update_me(
 ):
     try:
         item: User = db.query(User).filter(User.id == user.id_).first()
-        if "advanced-delete" in user.permissions:
+        if "users" in user.permissions:
             item.name = data.name
             item.locked_out = data.locked_out
             add_roles(item, data.roles, db)
@@ -151,7 +151,7 @@ def delete(
         )
 
 
-@router.get("/")
+@router.get("")
 def show_blank(
     db: Session = Depends(get_db),
     user: UserToken = Security(get_user, scopes=["users"]),
@@ -185,7 +185,7 @@ async def show_active(
     ]
 
 
-@router.get("/{id_}", response_model=schemas.Role)
+@router.get("/{id_}", response_model=schemas.User)
 def show_id(
     id_: uuid.UUID,
     db: Session = Depends(get_db),

brewman/routers/cost_centre.py

@@ -23,7 +23,7 @@ def get_db():
         db.close()
 
 
-@router.post("/", response_model=schemas.CostCentre)
+@router.post("", response_model=schemas.CostCentre)
 def save(
     data: schemas.CostCentreIn,
     db: Session = Depends(get_db),
@@ -33,7 +33,7 @@ def save(
         item = CostCentre(name=data.name)
         db.add(item)
         db.commit()
-        return cost_centre_info(item, db)
+        return cost_centre_info(item)
     except SQLAlchemyError as e:
         db.rollback()
         raise HTTPException(
@@ -64,7 +64,7 @@ def update(
             )
         item.name = data.name
         db.commit()
-        return cost_centre_info(item, db)
+        return cost_centre_info(item)
     except SQLAlchemyError as e:
         db.rollback()
         raise HTTPException(
@@ -111,12 +111,12 @@ def delete(
         )
 
 
-@router.get("/")
+@router.get("")
 def show_blank(
     db: Session = Depends(get_db),
     user: UserToken = Security(get_user, scopes=["cost-centres"]),
 ):
-    return cost_centre_info(None, db)
+    return cost_centre_info(None)
 
 
 @router.get("/list", response_model=List[schemas.CostCentre])
@@ -134,10 +134,10 @@ def show_id(
     user: UserToken = Security(get_user, scopes=["cost-centres"]),
 ):
     item = db.query(CostCentre).filter(CostCentre.id == id_).first()
-    return cost_centre_info(item, db)
+    return cost_centre_info(item)
 
 
-def cost_centre_info(item: Optional[CostCentre], db: Session):
+def cost_centre_info(item: Optional[CostCentre]):
     if item is None:
         return {
             "name": "",

brewman/routers/employee.py

@@ -27,7 +27,7 @@ def get_db():
         db.close()
 
 
-@router.post("/", response_model=schemas.Employee)
+@router.post("", response_model=schemas.Employee)
 def save(
     data: schemas.EmployeeIn,
     db: Session = Depends(get_db),
@@ -118,7 +118,7 @@ def delete(
         )
 
 
-@router.get("/")
+@router.get("")
 def show_blank(
     db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["employees"])
 ):

brewman/routers/product.py

@@ -161,7 +161,7 @@ def show_list(db: Session = Depends(get_db), user: UserToken = Depends(get_user)
 
 @router.get("/query")
 async def show_term(
-    t: str = None,
+    q: str = None,
     a: bool = None,
     c: int = None,
     p: bool = None,
@@ -172,7 +172,7 @@ async def show_term(
     count = c
     extended = e
     list_ = []
-    for index, item in enumerate(Product.query(t, p, a, db)):
+    for index, item in enumerate(Product.query(q, p, a, db)):
         list_.append(
             {
                 "id": item.id,

brewman/routers/product_group.py

@@ -23,7 +23,7 @@ def get_db():
         db.close()
 
 
-@router.post("/", response_model=schemas.ProductGroup)
+@router.post("", response_model=schemas.ProductGroup)
 def save(
     data: schemas.ProductGroupIn,
     db: Session = Depends(get_db),
@@ -111,7 +111,7 @@ def delete(
         )
 
 
-@router.get("/")
+@router.get("")
 def show_blank(
     db: Session = Depends(get_db),
     user: UserToken = Security(get_user, scopes=["product-groups"]),

brewman/schemas/auth.py

@@ -1,5 +1,5 @@
 import uuid
-from typing import List
+from typing import List, Optional
 from datetime import datetime
 from pydantic import BaseModel
 
@@ -12,7 +12,7 @@ def to_camel(string: str) -> str:
 class ClientIn(BaseModel):
     name: str
     enabled: bool
-    otp: int
+    otp: Optional[int]
 
 
 class Client(ClientIn):