diff --git a/instance/dotori.db b/instance/dotori.db index f07a16f..3e79535 100644 Binary files a/instance/dotori.db and b/instance/dotori.db differ diff --git a/models/__pycache__/dotori.cpython-313.pyc b/models/__pycache__/dotori.cpython-313.pyc index 97ebce8..69560d2 100644 Binary files a/models/__pycache__/dotori.cpython-313.pyc and b/models/__pycache__/dotori.cpython-313.pyc differ diff --git a/models/dotori.py b/models/dotori.py index 9d0564f..17db2ab 100644 --- a/models/dotori.py +++ b/models/dotori.py @@ -6,15 +6,13 @@ class UserDotori(db.Model): __tablename__ = 'user_dotori' id = db.Column(db.Integer, primary_key=True) - user_id = db.Column(db.String(100), unique=True, nullable=False) dotori_count = db.Column(db.Integer, default=0) created_at = db.Column(db.DateTime, default=datetime.now) updated_at = db.Column(db.DateTime, default=datetime.now, onupdate=datetime.now) def to_dict(self): return { - 'id': self.id, - 'user_id': self.user_id, + 'user_id': self.id, 'dotori_count': self.dotori_count, 'created_at': self.created_at.isoformat(), 'updated_at': self.updated_at.isoformat() @@ -22,7 +20,7 @@ class UserDotori(db.Model): def to_response(self): return { - 'userId': self.user_id, + 'userId': self.id, 'dotory': self.dotori_count } @@ -38,4 +36,4 @@ class UserDotori(db.Model): return self.dotori_count return False def __repr__(self): - return f"" \ No newline at end of file + return f"" \ No newline at end of file diff --git a/routes/__pycache__/dotori.cpython-313.pyc b/routes/__pycache__/dotori.cpython-313.pyc index 620dd9d..0bef195 100644 Binary files a/routes/__pycache__/dotori.cpython-313.pyc and b/routes/__pycache__/dotori.cpython-313.pyc differ diff --git a/routes/dotori.py b/routes/dotori.py index 0a71287..c7686c0 100644 --- a/routes/dotori.py +++ b/routes/dotori.py @@ -19,7 +19,7 @@ class UserDotori(Resource): @dotori_ns.route('') class InitializeDotori(Resource): - @dotori_ns.expect(dotori_ns.model('Initialize', {'userId': fields.String(required=True)})) + @dotori_ns.expect(dotori_ns.model('Initialize', {'userId': fields.Integer(required=True)})) def post(self): data = dotori_ns.payload user_id = data.get('userId') diff --git a/services/__pycache__/dotori_service.cpython-313.pyc b/services/__pycache__/dotori_service.cpython-313.pyc index 6c01416..247b723 100644 Binary files a/services/__pycache__/dotori_service.cpython-313.pyc and b/services/__pycache__/dotori_service.cpython-313.pyc differ diff --git a/services/dotori_service.py b/services/dotori_service.py index 6660c88..71b2471 100644 --- a/services/dotori_service.py +++ b/services/dotori_service.py @@ -3,25 +3,25 @@ from flask import current_app from db import db class DotoriService: @staticmethod - def get_user_dotori(user_id: str): - user_dotori = UserDotori.query.filter_by(user_id=user_id).first() + def get_user_dotori(user_id: int): + user_dotori = UserDotori.query.filter_by(id=user_id).first() if user_dotori: return user_dotori.dotori_count return None @staticmethod - def initialize_user_dotori(user_id: str): - user_dotori = UserDotori.query.filter_by(user_id=user_id).first() + def initialize_user_dotori(user_id: int): + user_dotori = UserDotori.query.filter_by(id=user_id).first() if not user_dotori: - user_dotori = UserDotori(user_id=user_id, dotori_count=1000000) + user_dotori = UserDotori(id=user_id, dotori_count=1000000) print(f"초기화 완료, {user_id}님의 도토리: {user_dotori.dotori_count}") db.session.add(user_dotori) db.session.commit() return user_dotori.dotori_count @staticmethod - def buy_product(user_id: str, product_price: int): - user_dotori = UserDotori.query.filter_by(user_id=user_id).first() + def buy_product(user_id: int, product_price: int): + user_dotori = UserDotori.query.filter_by(id=user_id).first() if not user_dotori: return False @@ -33,10 +33,10 @@ class DotoriService: return True @staticmethod - def add_dotori(user_id: str, amount: int): - user_dotori = UserDotori.query.filter_by(user_id=user_id).first() + def add_dotori(user_id: int, amount: int): + user_dotori = UserDotori.query.filter_by(id=user_id).first() if not user_dotori: - user_dotori = UserDotori(user_id=user_id) + user_dotori = UserDotori(id=user_id) db.session.add(user_dotori) print(f"도토리 추가, {user_id}님의 도토리: {user_dotori.dotori_count} -> {user_dotori.dotori_count + amount}") user_dotori.increment(amount) @@ -44,6 +44,6 @@ class DotoriService: return user_dotori.dotori_count @staticmethod - def get_all_users_dotori(): + def get_all_users_dotori() -> list: users = UserDotori.query.all() - return [user.to_dict() for user in users] + return [user.to_response() for user in users]