diff --git a/app.py b/app.py index 67b68c3..7b1419c 100644 --- a/app.py +++ b/app.py @@ -1,16 +1,19 @@ from flask import Flask from modules.userModuls import * -from flask_restful import Resource,Api +from modules.accountModules import * +from flask_restful import Api app = Flask(__name__) api = Api(app) api.add_resource(home,'/') -api.add_resource(CreateUser,'/user/register') -api.add_resource(loginUser,'/user/login') +api.add_resource(Register,'/user/register') +api.add_resource(login,'/user/login') api.add_resource(GetDetailUser,'/user/detail/') +api.add_resource(Profile,'/user/profile') api.add_resource(HardDeleteUser, '/user/hard-delete') api.add_resource(SoftDeleteUser, '/user/soft-delete') api.add_resource(RestoreUser, '/user/restore') api.add_resource(UpdateUser, '/user/update') +api.add_resource(CreateAccount, '/account/create') app.run(debug=True) \ No newline at end of file diff --git a/models.py b/models.py index 8defaea..19279aa 100644 --- a/models.py +++ b/models.py @@ -1,5 +1,4 @@ -from datetime import datetime, timezone -import time +from utils import get_current_time class User: username = None @@ -13,15 +12,13 @@ class User: self.created_at = get_current_time() -def get_current_time(): - return datetime.now(timezone.utc) class Account: acc_type = None acc_num = None balance = None username = None def __init__(self): - self.balance=100 + self.balance=0 class Transaction: acc_num= None @@ -29,4 +26,4 @@ class Transaction: transaction_type= None amount= None def __init__(self): - self.time= time.time() + self.time= get_current_time() diff --git a/modules/accountModules.py b/modules/accountModules.py new file mode 100644 index 0000000..854658f --- /dev/null +++ b/modules/accountModules.py @@ -0,0 +1,38 @@ +from flask import request +from bson import ObjectId +from models import Account +from utils import get_current_time +from config import account_collection, users_collection +from flask_restful import Resource +from simplejwt import jwt + +class CreateAccount(Resource): + + def post(self): + token = request.headers.get("Authorization") + if token == None: + return { + "message": "token required" + }, 401 + payload = jwt.decode("DBA", token, "HS256")[1] + username = payload['username'] + user = users_collection.find_one({ + "username": username + }) + if user == None: + return {"message": "user not found"}, 404 + + body = request.json + acc_num = body["acc_num"] + acc_type = body["acc_type"] + newAccount = Account() + newAccount.acc_num = acc_num + newAccount.acc_type = acc_type + newAccount.username = username + account_collection.insert_one(newAccount.__dict__) + return({"message":"created successfully", "data":{ + "acc_num": acc_num, + "acc_type": acc_type, + "balance": 0, + }}) + \ No newline at end of file diff --git a/modules/userModuls.py b/modules/userModuls.py index 191d5ec..2f48db2 100644 --- a/modules/userModuls.py +++ b/modules/userModuls.py @@ -1,8 +1,11 @@ from flask import request from bson import ObjectId -from models import User,get_current_time +from models import User +from utils import get_current_time from config import users_collection from flask_restful import Resource +import time +from simplejwt import jwt from werkzeug.security import generate_password_hash, check_password_hash class home (Resource): def get(self): @@ -25,11 +28,13 @@ class UserList (Resource): }) return users -class CreateUser (Resource): +class Register(Resource): def post(self): body=request.json if body["username"] == "" or body["codemeli"] == "" or body["password"] == "": return {"message": "Fields cannot be empty"}, 400 + if users_collection.count_documents({"$or":[{"username": body["username"] },{"codemeli":body["codemeli"]}]}) > 0: + return {"message": "The field must be unique"}, 409 newUser = User() newUser.updated_at = None newUser.deleted_at = None @@ -40,14 +45,16 @@ class CreateUser (Resource): users_collection.insert_one(newUser.__dict__) return {'message':'You are registered successfully'},201 -class loginUser (Resource): +class login(Resource): def post(self): body=request.json find_user= users_collection.find_one({"username":body["username"]}) if find_user is None: return {'message':"couldn't find"},404 if check_password_hash(find_user["password"],body["password"]): - return {'message':'You are login successfully'} + payload = { "username": find_user["username"], "createAt": time.time()} + token = jwt.encode("DBA", payload, "HS256") + return {'message':'You are login successfully' , "token": token} return {'message':"invalid user"},404 @@ -62,7 +69,25 @@ class GetDetailUser(Resource): "username": user["username"], "codemeli": user["codemeli"] } - + +class Profile(Resource): + def get(self): + token = request.headers.get("Authorization") + if token == None: + return { + "message": "token required" + }, 401 + payload = jwt.decode("DBA", token, "HS256")[1] + username = payload['username'] + user = users_collection.find_one({ + "username": username + }) + if user == None: + return {"message": "user not found"}, 404 + return { + "username": user["username"], + "codemeli": user["codemeli"] + } class HardDeleteUser(Resource): def delete(self): diff --git a/utils.py b/utils.py new file mode 100644 index 0000000..955b794 --- /dev/null +++ b/utils.py @@ -0,0 +1,3 @@ +from datetime import datetime, timezone +def get_current_time(): + return datetime.now(timezone.utc) \ No newline at end of file