From 72bb396a5d0dfb4f96c675ef451b7cde02b3e2eb Mon Sep 17 00:00:00 2001 From: David-R69 Date: Tue, 3 Nov 2026 13:14:57 +0330 Subject: [PATCH] add account and transaction modules, fix user module issues Accounts - Create account, list accounts, get balance - Increase, decrease and transfer using atomic $inc updates (no negative balances, no race conditions) - Ownership check: users can only access their own accounts Transactions - Record every increase/decrease (transfers log both sides with related_acc_num) - List transactions per account (owner only) User fixes - Remove unused simplejwt import (caused ImportError) - Check for duplicate username on register - Block soft-deleted users from logging in; return user id on login - Register UserList route (/user/list), exclude deleted users, escape regex input - Return 400 for invalid ObjectId instead of 500 - Return 200 instead of 204 with a body on hard delete Misc - Add shared helpers (amount parsing, field validation, ownership checks) - Guard app.run with if __name__ == "__main__" --- app.py | 39 ++++-- config.py | 3 +- helpers.py | 41 +++++++ models.py | 37 ++++-- modules/accountModules.py | 38 ------ modules/accountModuls.py | 175 +++++++++++++++++++++++++++ modules/transactionModuls.py | 40 ++++++ modules/userModuls.py | 227 +++++++++++++++++------------------ utils.py | 3 - 9 files changed, 423 insertions(+), 180 deletions(-) create mode 100644 helpers.py delete mode 100644 modules/accountModules.py create mode 100644 modules/accountModuls.py create mode 100644 modules/transactionModuls.py delete mode 100644 utils.py diff --git a/app.py b/app.py index 7b1419c..bc5ee0c 100644 --- a/app.py +++ b/app.py @@ -1,19 +1,40 @@ from flask import Flask -from modules.userModuls import * -from modules.accountModules import * from flask_restful import Api + +from modules.userModuls import ( + home, UserList, CreateUser, loginUser, GetDetailUser, + HardDeleteUser, SoftDeleteUser, RestoreUser, UpdateUser, +) +from modules.accountModuls import ( + CreateAccount, AccountList, IncreaseBalance, DecreaseBalance, + TransferMoney, GetBalance, +) +from modules.transactionModuls import TransactionList + app = Flask(__name__) api = Api(app) -api.add_resource(home,'/') -api.add_resource(Register,'/user/register') -api.add_resource(login,'/user/login') -api.add_resource(GetDetailUser,'/user/detail/') -api.add_resource(Profile,'/user/profile') +# ---- user ---- +api.add_resource(home, '/') +api.add_resource(UserList, '/user/list') +api.add_resource(CreateUser, '/user/register') +api.add_resource(loginUser, '/user/login') +api.add_resource(GetDetailUser, '/user/detail/') 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 +# ---- account ---- +api.add_resource(CreateAccount, '/account/create') +api.add_resource(AccountList, '/account/list') +api.add_resource(IncreaseBalance, '/account/increase') +api.add_resource(DecreaseBalance, '/account/decrease') +api.add_resource(TransferMoney, '/account/transfer') +api.add_resource(GetBalance, '/account/balance') + +# ---- transaction ---- +api.add_resource(TransactionList, '/transaction/list') + +if __name__ == "__main__": + app.run(debug=True) diff --git a/config.py b/config.py index 587d216..19fb1d4 100644 --- a/config.py +++ b/config.py @@ -1,6 +1,7 @@ import pymongo + client = pymongo.MongoClient("mongodb://localhost:27017") db = client["bank"] users_collection = db["users"] account_collection = db["accounts"] -transaction_collection = db["transactions"] \ No newline at end of file +transaction_collection = db["transactions"] diff --git a/helpers.py b/helpers.py new file mode 100644 index 0000000..9e4030c --- /dev/null +++ b/helpers.py @@ -0,0 +1,41 @@ +from datetime import timezone +from config import users_collection, account_collection + + +def get_body(request): + + body = request.get_json(silent=True) + return body if isinstance(body, dict) else {} + + +def missing_fields(data, fields): + """لیست فیلدهایی که نیستن یا خالی‌ان.""" + return [f for f in fields if data.get(f) in (None, "")] + + +def parse_amount(value): + """مقدار باید عدد صحیح و مثبت باشه، وگرنه None.""" + if isinstance(value, (bool, float)): + return None + try: + amount = int(value) + except (TypeError, ValueError): + return None + return amount if amount > 0 else None + + +def get_active_user(username): + """کاربر موجود و حذف‌نشده.""" + return users_collection.find_one({"username": username, "is_deleted": False}) + + +def get_own_account(username, acc_num): + """حساب فقط اگه مال همین کاربر باشه برمی‌گرده.""" + return account_collection.find_one({"acc_num": acc_num, "username": username}) + + +def to_iso(dt): + """Mongo تاریخ رو بدون timezone برمی‌گردونه؛ اینجا UTC بودنش رو صریح می‌کنیم.""" + if dt.tzinfo is None: + dt = dt.replace(tzinfo=timezone.utc) + return dt.isoformat() diff --git a/models.py b/models.py index 19279aa..ed8fbb0 100644 --- a/models.py +++ b/models.py @@ -1,4 +1,12 @@ -from utils import get_current_time +from datetime import datetime, timezone + + +def get_current_time(): + return datetime.now(timezone.utc) + + +VALID_ACC_TYPES = ["saving", "current", "deposit"] + class User: username = None @@ -6,8 +14,9 @@ class User: codemeli = None is_deleted = None created_at = None - updated_at =None - deleted_at= None + updated_at = None + deleted_at = None + def __init__(self): self.created_at = get_current_time() @@ -15,15 +24,21 @@ class User: class Account: acc_type = None acc_num = None - balance = None + balance = None username = None + created_at = None + def __init__(self): - self.balance=0 - + self.balance = 0 + self.created_at = get_current_time() + + class Transaction: - acc_num= None - time= None - transaction_type= None - amount= None + acc_num = None + time = None + transaction_type = None # "increase" یا "decrease" + amount = None + related_acc_num = None + def __init__(self): - self.time= get_current_time() + self.time = get_current_time() diff --git a/modules/accountModules.py b/modules/accountModules.py deleted file mode 100644 index 854658f..0000000 --- a/modules/accountModules.py +++ /dev/null @@ -1,38 +0,0 @@ -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/accountModuls.py b/modules/accountModuls.py new file mode 100644 index 0000000..c21dc0b --- /dev/null +++ b/modules/accountModuls.py @@ -0,0 +1,175 @@ +from flask import request +from flask_restful import Resource +from pymongo import ReturnDocument +from models import Account, VALID_ACC_TYPES +from config import account_collection +from modules.helpers import ( + get_body, missing_fields, parse_amount, get_active_user, get_own_account, +) +from modules.transactionModuls import create_transaction + + +class CreateAccount(Resource): + # POST /account/create {"username","acc_num","acc_type"} + def post(self): + body = get_body(request) + missing = missing_fields(body, ["username", "acc_num", "acc_type"]) + if missing: + return {"message": f"Missing fields: {', '.join(missing)}"}, 400 + username = body["username"] + acc_num = str(body["acc_num"]) + acc_type = body["acc_type"] + + if get_active_user(username) is None: + return {"message": "user not found"}, 404 + if acc_type not in VALID_ACC_TYPES: + return {"message": f"acc_type must be one of {VALID_ACC_TYPES}"}, 400 + if account_collection.find_one({"acc_num": acc_num}) is not None: + return {"message": "This account number already exists"}, 409 + + newAccount = Account() + newAccount.username = username + newAccount.acc_num = acc_num + newAccount.acc_type = acc_type + account_collection.insert_one(newAccount.__dict__) + return {"message": "account created successfully"}, 201 + + +class AccountList(Resource): + # GET /account/list?username=ali + def get(self): + username = request.args.get("username") + if not username: + return {"message": "Missing fields: username"}, 400 + if get_active_user(username) is None: + return {"message": "user not found"}, 404 + + accounts = [] + for account in account_collection.find({"username": username}): + accounts.append({ + "acc_type": account["acc_type"], + "acc_num": account["acc_num"], + "balance": account["balance"], + }) + return accounts + + +class IncreaseBalance(Resource): + # POST /account/increase {"username","acc_num","amount"} + def post(self): + body = get_body(request) + missing = missing_fields(body, ["username", "acc_num", "amount"]) + if missing: + return {"message": f"Missing fields: {', '.join(missing)}"}, 400 + username = body["username"] + acc_num = str(body["acc_num"]) + + amount = parse_amount(body["amount"]) + if amount is None: + return {"message": "Amount must be a positive integer"}, 400 + + # $inc اتمیک‌ـه: خوندن + نوشتن توی یک عملیات انجام می‌شه + updated = account_collection.find_one_and_update( + {"acc_num": acc_num, "username": username}, + {"$inc": {"balance": amount}}, + return_document=ReturnDocument.AFTER, + ) + if updated is None: + return {"message": "you are not allowed"}, 403 + + create_transaction(acc_num, "increase", amount) + return {"message": f"{amount} dollars increased to {acc_num}", + "balance": updated["balance"]} + + +class DecreaseBalance(Resource): + # POST /account/decrease {"username","acc_num","amount"} + def post(self): + body = get_body(request) + missing = missing_fields(body, ["username", "acc_num", "amount"]) + if missing: + return {"message": f"Missing fields: {', '.join(missing)}"}, 400 + username = body["username"] + acc_num = str(body["acc_num"]) + + amount = parse_amount(body["amount"]) + if amount is None: + return {"message": "Amount must be a positive integer"}, 400 + + if get_own_account(username, acc_num) is None: + return {"message": "you are not allowed"}, 403 + + # شرط balance >= amount توی خود query هست، پس منفی شدن غیرممکنه + updated = account_collection.find_one_and_update( + {"acc_num": acc_num, "username": username, "balance": {"$gte": amount}}, + {"$inc": {"balance": -amount}}, + return_document=ReturnDocument.AFTER, + ) + if updated is None: + return {"message": "You dont have enough money in your account"}, 400 + + create_transaction(acc_num, "decrease", amount) + return {"message": f"{amount} dollars decreased from {acc_num}", + "balance": updated["balance"]} + + +class TransferMoney(Resource): + # POST /account/transfer {"username","source_acc_num","destination_acc_num","amount"} + def post(self): + body = get_body(request) + missing = missing_fields( + body, ["username", "source_acc_num", "destination_acc_num", "amount"]) + if missing: + return {"message": f"Missing fields: {', '.join(missing)}"}, 400 + username = body["username"] + source = str(body["source_acc_num"]) + destination = str(body["destination_acc_num"]) + + amount = parse_amount(body["amount"]) + if amount is None: + return {"message": "Amount must be a positive integer"}, 400 + + if get_own_account(username, source) is None: + return {"message": "you are not allowed"}, 403 + if source == destination: + return {"message": "Source and destination can't be the same"}, 400 + if account_collection.find_one({"acc_num": destination}) is None: + return {"message": "destination account not found"}, 404 + + # 1) از مبدا کم کن (فقط اگه موجودی کافی باشه) + updated_source = account_collection.find_one_and_update( + {"acc_num": source, "username": username, "balance": {"$gte": amount}}, + {"$inc": {"balance": -amount}}, + return_document=ReturnDocument.AFTER, + ) + if updated_source is None: + return {"message": "You dont have enough money in your account"}, 400 + + # 2) به مقصد اضافه کن + result = account_collection.update_one( + {"acc_num": destination}, {"$inc": {"balance": amount}}) + if result.matched_count == 0: + # اگه مقصد وسط کار از بین رفت، پول مبدا رو برگردون + account_collection.update_one( + {"acc_num": source}, {"$inc": {"balance": amount}}) + return {"message": "transfer failed"}, 500 + + # 3) دو تا تراکنش ثبت کن + create_transaction(source, "decrease", amount, related_acc_num=destination) + create_transaction(destination, "increase", amount, related_acc_num=source) + return {"message": f"{amount} dollars transferred from {source} to {destination}", + "balance": updated_source["balance"]} + + +class GetBalance(Resource): + # GET /account/balance?username=ali&acc_num=1001 + def get(self): + query = request.args + missing = missing_fields(query, ["username", "acc_num"]) + if missing: + return {"message": f"Missing fields: {', '.join(missing)}"}, 400 + + account = get_own_account(query["username"], query["acc_num"]) + if account is None: + return {"message": "you are not allowed"}, 403 + return {"acc_num": account["acc_num"], "balance": account["balance"]} diff --git a/modules/transactionModuls.py b/modules/transactionModuls.py new file mode 100644 index 0000000..94662f8 --- /dev/null +++ b/modules/transactionModuls.py @@ -0,0 +1,40 @@ +from flask import request +from flask_restful import Resource +from models import Transaction +from config import transaction_collection +from modules.helpers import missing_fields, get_own_account, to_iso + + +def create_transaction(acc_num, transaction_type, amount, related_acc_num=None): + """یه تراکنش ثبت می‌کنه (توسط accountModuls صدا زده می‌شه).""" + newTransaction = Transaction() + newTransaction.acc_num = acc_num + newTransaction.transaction_type = transaction_type + newTransaction.amount = amount + newTransaction.related_acc_num = related_acc_num + transaction_collection.insert_one(newTransaction.__dict__) + + +class TransactionList(Resource): + # GET /transaction/list?username=ali&acc_num=1001 + def get(self): + query = request.args + missing = missing_fields(query, ["username", "acc_num"]) + if missing: + return {"message": f"Missing fields: {', '.join(missing)}"}, 400 + username = query["username"] + acc_num = query["acc_num"] + + if get_own_account(username, acc_num) is None: + return {"message": "you are not allowed"}, 403 + + transactions = [] + for t in transaction_collection.find({"acc_num": acc_num}).sort("time", -1): + transactions.append({ + "acc_num": t["acc_num"], + "transaction_type": t["transaction_type"], + "amount": t["amount"], + "related_acc_num": t.get("related_acc_num"), + "time": to_iso(t["time"]), + }) + return transactions diff --git a/modules/userModuls.py b/modules/userModuls.py index 2f48db2..5de5ec7 100644 --- a/modules/userModuls.py +++ b/modules/userModuls.py @@ -1,138 +1,129 @@ +import re from flask import request from bson import ObjectId -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): - return "hello world" +from models import User, get_current_time +from config import users_collection +from modules.helpers import get_body, missing_fields -class UserList (Resource): - def get(self): - query=request.args - filter ={} - search = query.get('search',None) - if search: - filter["username"]={'$regex':search} - users = [] - users_in_db = users_collection.find(filter) - for user in users_in_db: - users.append({ - "codemeli": user["codemeli"], - "username": user["username"] - }) - return users +class home(Resource): + def get(self): + return "hello world" -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 - newUser.username = body["username"] - newUser.codemeli = body["codemeli"] - newUser.password = generate_password_hash(body["password"]) - newUser.is_deleted = False - users_collection.insert_one(newUser.__dict__) - return {'message':'You are registered successfully'},201 -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"]): - 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 +class UserList(Resource): + def get(self): + search = request.args.get("search", None) + filter = {"is_deleted": False} + if search: + filter["username"] = {"$regex": re.escape(search)} + users = [] + for user in users_collection.find(filter): + users.append({ + "codemeli": user["codemeli"], + "username": user["username"], + }) + return users + + +class CreateUser(Resource): + def post(self): + body = get_body(request) + if missing_fields(body, ["username", "codemeli", "password"]): + return {"message": "Fields cannot be empty"}, 400 + if users_collection.find_one({"username": body["username"]}) is not None: + return {"message": "This username already exists"}, 409 + + newUser = User() + newUser.updated_at = None + newUser.deleted_at = None + newUser.username = body["username"] + newUser.codemeli = body["codemeli"] + newUser.password = generate_password_hash(body["password"]) + newUser.is_deleted = False + users_collection.insert_one(newUser.__dict__) + return {"message": "You are registered successfully"}, 201 + + +class loginUser(Resource): + def post(self): + body = get_body(request) + if missing_fields(body, ["username", "password"]): + return {"message": "Fields cannot be empty"}, 400 + find_user = users_collection.find_one( + {"username": body["username"], "is_deleted": False}) + 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", + "id": str(find_user["_id"])} + return {"message": "invalid user"}, 404 + - class GetDetailUser(Resource): - def get(self,id): - user = users_collection.find_one({ - "_id": ObjectId(id) - }) - if user == None: - return {"message": "user not found"}, 404 - return { - "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"] - } + def get(self, id): + if not ObjectId.is_valid(id): + return {"message": "invalid id"}, 400 + user = users_collection.find_one({"_id": ObjectId(id)}) + if user is None: + return {"message": "user not found"}, 404 + return {"username": user["username"], "codemeli": user["codemeli"]} + class HardDeleteUser(Resource): - def delete(self): - body = request.json - id = body["id"] - result = users_collection.delete_one({ - "_id": ObjectId(id) - }) - if result.deleted_count == 0: - return { "message": "user not found"}, 404 - return { "message": "user deleted successfully"}, 204 + def delete(self): + body = get_body(request) + id = body.get("id") + if not id or not ObjectId.is_valid(id): + return {"message": "invalid id"}, 400 + result = users_collection.delete_one({"_id": ObjectId(id)}) + if result.deleted_count == 0: + return {"message": "user not found"}, 404 + return {"message": "user deleted successfully"} + class SoftDeleteUser(Resource): - - def delete(self): - body = request.json - id=body["id"] - result = users_collection.update_one({"_id":ObjectId(id),"is_deleted":False},{"$set":{"is_deleted":True,"deleted_at": get_current_time() -}}) - if result.matched_count==0: - return{"message":"delete failed"},404 - return {"message":"user is deleted successfully"} + def delete(self): + body = get_body(request) + id = body.get("id") + if not id or not ObjectId.is_valid(id): + return {"message": "invalid id"}, 400 + result = users_collection.update_one( + {"_id": ObjectId(id), "is_deleted": False}, + {"$set": {"is_deleted": True, "deleted_at": get_current_time()}}) + if result.matched_count == 0: + return {"message": "delete failed"}, 404 + return {"message": "user is deleted successfully"} class RestoreUser(Resource): - - def post(self): - body = request.json - id=body["id"] - result = users_collection.update_one({"_id":ObjectId(id),"is_deleted":True},{"$set":{"is_deleted":False,"deleted_at":None}}) - if result.matched_count==0: - return{"message":"restore failed"},404 - return {"message":"user is restored successfully"} + def post(self): + body = get_body(request) + id = body.get("id") + if not id or not ObjectId.is_valid(id): + return {"message": "invalid id"}, 400 + result = users_collection.update_one( + {"_id": ObjectId(id), "is_deleted": True}, + {"$set": {"is_deleted": False, "deleted_at": None}}) + if result.matched_count == 0: + return {"message": "restore failed"}, 404 + return {"message": "user is restored successfully"} class UpdateUser(Resource): - - def post(self): - body = request.json - id = body["id"] - codemeli = body["codemeli"] - username = body["username"] - result = users_collection.update_one({ - "_id": ObjectId(id) - }, {"$set":{"codemeli": codemeli, "username": username, "updated_at":get_current_time()}}) - if result.matched_count == 0: - return { "message": "user not found"}, 404 - return { "message": "user updated successfully"} + def post(self): + body = get_body(request) + if missing_fields(body, ["id", "codemeli", "username"]): + return {"message": "Fields cannot be empty"}, 400 + if not ObjectId.is_valid(body["id"]): + return {"message": "invalid id"}, 400 + result = users_collection.update_one( + {"_id": ObjectId(body["id"])}, + {"$set": {"codemeli": body["codemeli"], + "username": body["username"], + "updated_at": get_current_time()}}) + if result.matched_count == 0: + return {"message": "user not found"}, 404 + return {"message": "user updated successfully"} diff --git a/utils.py b/utils.py deleted file mode 100644 index 955b794..0000000 --- a/utils.py +++ /dev/null @@ -1,3 +0,0 @@ -from datetime import datetime, timezone -def get_current_time(): - return datetime.now(timezone.utc) \ No newline at end of file