Skip to content

Commit

Permalink
change some function name to snake case
Browse files Browse the repository at this point in the history
  • Loading branch information
wuttinanhi committed Oct 31, 2022
1 parent 8f77979 commit ff85e20
Show file tree
Hide file tree
Showing 13 changed files with 627 additions and 66 deletions.
4 changes: 2 additions & 2 deletions auth/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

from auth.blueprint import blueprint as auth_blueprint
from auth.decorator import login_required
from auth.function import GetUser
from auth.function import get_user

__all__ = [auth_blueprint, login_required, GetUser]
__all__ = [auth_blueprint, login_required, get_user]
14 changes: 7 additions & 7 deletions auth/blueprint.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
from jwt_wrapper.service import JwtService
from marshmallow import Schema, fields, validate
from user.service import UserService
from util.validate_request import ValidateRequest
from util.validate_request import validate_request
from werkzeug.exceptions import Unauthorized

from auth.decorator import admin_only, login_required
from auth.function import GetUser
from auth.function import get_user

blueprint = Blueprint("auth", __name__, url_prefix="/auth")

Expand Down Expand Up @@ -42,7 +42,7 @@ class AdminChangePasswordDto(ChangePasswordDto):

@blueprint.route("/login", methods=["POST"])
def login():
data = ValidateRequest(LoginDto, request)
data = validate_request(LoginDto, request)
check = UserService.login(data.email, data.password)

if check:
Expand All @@ -59,7 +59,7 @@ def login():

@blueprint.route("/register", methods=["POST"])
def register():
data = ValidateRequest(RegisterDto, request)
data = validate_request(RegisterDto, request)
UserService.register(
data.email,
data.password,
Expand All @@ -75,8 +75,8 @@ def register():
@blueprint.route("/changepassword", methods=["PATCH"])
@login_required
def change_password():
user = GetUser()
data = ValidateRequest(ChangePasswordDto, request)
user = get_user()
data = validate_request(ChangePasswordDto, request)

check_password = UserService.compare_password(user, data.password)
if check_password is False:
Expand All @@ -90,7 +90,7 @@ def change_password():
@blueprint.route("/admin/changepassword", methods=["PATCH"])
@admin_only
def admin_change_password():
data = ValidateRequest(AdminChangePasswordDto, request)
data = validate_request(AdminChangePasswordDto, request)
user = UserService.find_by_id(data.user_id)
UserService.change_password(user, data.new_password)
return {"message": "Successfully change password."}, 200
2 changes: 1 addition & 1 deletion auth/function.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
from user.model import User


def GetUser() -> User:
def get_user() -> User:
return request.user
20 changes: 10 additions & 10 deletions car/blueprint.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
from http.client import CREATED, FORBIDDEN, NOT_FOUND, OK

from auth.decorator import admin_only, login_required
from auth.function import GetUser
from auth.function import get_user
from flask import Blueprint, request
from marshmallow import Schema, fields, validate
from pagination.pagination import create_pagination_options_from_request
from user.service import UserService
from util.validate_request import ValidateRequest
from util.validate_request import validate_request
from werkzeug.exceptions import Forbidden

from car.service import CarService
Expand Down Expand Up @@ -43,17 +43,17 @@ class CarSearchDto(Schema):
@blueprint.route("/add", methods=["POST"])
@login_required
def add_car():
user = GetUser()
data = ValidateRequest(CarAddDto, request)
user = get_user()
data = validate_request(CarAddDto, request)
CarService.add(user, data.car_license_plate, data.car_type)
return {"message": "Car add."}, CREATED


@blueprint.route("/remove", methods=["DELETE"])
@login_required
def remove_car():
user = GetUser()
data = ValidateRequest(CarDeleteDto, request)
user = get_user()
data = validate_request(CarDeleteDto, request)
car = CarService.find_by_id(data.car_id)
if car:
car_owner_check = CarService.is_user_own_car(user, car)
Expand All @@ -68,7 +68,7 @@ def remove_car():
@login_required
def my_car():
response = []
user = GetUser()
user = get_user()
all_user_cars = CarService.find_all_car_by_user(user)
for car in all_user_cars:
response.append(car.json())
Expand All @@ -78,8 +78,8 @@ def my_car():
@blueprint.route("/update", methods=["PATCH"])
@login_required
def update_car():
user = GetUser()
data = ValidateRequest(CarUpdateDto, request)
user = get_user()
data = validate_request(CarUpdateDto, request)
car = CarService.find_by_id(data.car_id)

if car.car_owner_id != user.id:
Expand All @@ -95,7 +95,7 @@ def update_car():
@blueprint.route("/search", methods=["GET"])
@login_required
def search_car_by_license_plate():
data = ValidateRequest(CarSearchDto, request)
data = validate_request(CarSearchDto, request)
car = CarService.find_by_license_plate(data.car_license_plate)
response = car.json()
response["car_owner"] = UserService.find_by_id(car.car_owner_id).json_shareable()
Expand Down
4 changes: 2 additions & 2 deletions chat/blueprint.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


from auth.decorator import login_required
from auth.function import GetUser
from auth.function import get_user
from flask import Blueprint, request
from pagination.pagination import create_pagination_options_from_request

Expand All @@ -17,7 +17,7 @@
@login_required
def list_chat():
response = []
user = GetUser()
user = get_user()
pagination_options = create_pagination_options_from_request(request)
result = ChatService.list_chat_head(user, pagination_options)
for chat_head in result:
Expand Down
Loading

0 comments on commit ff85e20

Please sign in to comment.