From f77d1c1062b069d1f79d50cdc88a13e93f76df31 Mon Sep 17 00:00:00 2001
From: Ton <47422572+tonlls@users.noreply.github.com>
Date: Thu, 1 Aug 2024 02:07:01 +0200
Subject: [PATCH 1/2] add things to review

---
 Party/model.py  | 1 +
 Party/router.py | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Party/model.py b/Party/model.py
index 8393370..ab64609 100644
--- a/Party/model.py
+++ b/Party/model.py
@@ -11,4 +11,5 @@ class Party(Base):
     code: int = Column(String, unique=True)
     creator_id: int = Column(Integer, ForeignKey('ChainUser.id', ondelete='CASCADE'), nullable=True, default=None)
     winner_id: int = Column(Integer, ForeignKey('ChainUser.id', ondelete='CASCADE'), nullable=True, default=None)
+    rule: str = Column(String)
     # users = relationship('ChainUser', foreign_keys=[home_id])
\ No newline at end of file
diff --git a/Party/router.py b/Party/router.py
index 9d73a6b..e7571bd 100644
--- a/Party/router.py
+++ b/Party/router.py
@@ -50,8 +50,8 @@ def generate_code(num_dig=4):
             return code
         
 @router.post("/create")
-def create(user:ChainUserSchema):
-    party = Party(code= generate_code())
+def create(user:ChainUserSchema, rule: str):
+    party = Party(code= generate_code(), rule=rule)
     db.session.add(party)
     db.session.commit()
     db.session.refresh(party)
@@ -169,6 +169,7 @@ def refresh(user_id:int):
                 'num_killed': u.num_killed,
                 'total_users': len(get_party_users(p.id)),
                 'remaining_users': len([u for u in get_party_users(p.id) if not u.dead]),
+                'rule': p.rule,
                 'target': {
                         'name': t.name,
                         'image': t.image
@@ -177,6 +178,7 @@ def refresh(user_id:int):
     return {
         'name': u.name,
         'code': p.code,
+        'rule': p.rule,
         'is_creator': p.creator_id == user_id,
         'users': [{ 'id': u.id, 'name': u.name, 'image': u.image} for u in get_party_users(p.id)]
     }

From 89a5aa65b69bab6d9db3560c130f5a353a757d72 Mon Sep 17 00:00:00 2001
From: Ton <47422572+tonlls@users.noreply.github.com>
Date: Thu, 1 Aug 2024 16:49:42 +0200
Subject: [PATCH 2/2] fix and move to start

---
 Party/model.py  | 2 +-
 Party/router.py | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Party/model.py b/Party/model.py
index ab64609..febffb3 100644
--- a/Party/model.py
+++ b/Party/model.py
@@ -11,5 +11,5 @@ class Party(Base):
     code: int = Column(String, unique=True)
     creator_id: int = Column(Integer, ForeignKey('ChainUser.id', ondelete='CASCADE'), nullable=True, default=None)
     winner_id: int = Column(Integer, ForeignKey('ChainUser.id', ondelete='CASCADE'), nullable=True, default=None)
-    rule: str = Column(String)
+    rule: str = Column(String, default='')
     # users = relationship('ChainUser', foreign_keys=[home_id])
\ No newline at end of file
diff --git a/Party/router.py b/Party/router.py
index e7571bd..53b5642 100644
--- a/Party/router.py
+++ b/Party/router.py
@@ -50,8 +50,8 @@ def generate_code(num_dig=4):
             return code
         
 @router.post("/create")
-def create(user:ChainUserSchema, rule: str):
-    party = Party(code= generate_code(), rule=rule)
+def create(user:ChainUserSchema):
+    party = Party(code= generate_code())
     db.session.add(party)
     db.session.commit()
     db.session.refresh(party)
@@ -65,7 +65,7 @@ def create(user:ChainUserSchema, rule: str):
             'user':u.id}
 
 @router.put("/start/{user_id}")
-def start(user_id:int):
+def start(user_id:int, rule: str):
     u = get_user(user_id)
     p = get_party_by_id(u.party_id)
     if not p.creator_id == user_id:
@@ -81,6 +81,7 @@ def start(user_id:int):
     for i in range(len(ul)):
         ul[i].next_user_id = ul[(i+1)%len(ul)].id
     p.started = True
+    p.rule = rule
     db.session.commit()
     db.session.refresh(p)
     for u in ul: