Skip to content

Commit 0d1b455

Browse files
committed
feat: change user entity
1 parent 4b64636 commit 0d1b455

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

app/api/user.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
'id': fields.String(required=True, default='userid', description='user id'),
1717
'password': fields.String(required=True, default='password', description='user password'),
1818
'name': fields.String(required=True, default='name', description='user name'),
19-
'gender': fields.String(required=True, default='여자', description='user gender'),
20-
'birth': fields.Date(required=True, default='2023-03-20', description='user birth'),
19+
'gender': fields.String(required=False, default='여자', description='user gender'),
20+
'birth': fields.Date(required=False, default='2023-03-20', description='user birth'),
2121
'phone': fields.String(required=True, default='01012345678', description='user phone'),
2222
})
2323

@@ -65,8 +65,8 @@ def post(self):
6565
uid=content['id'],
6666
password=content['password'],
6767
name=content['name'],
68-
gender=content['gender'],
69-
birth=content['birth'],
68+
gender=content['gender'] if 'gender' in content else None,
69+
birth=content['birth'] if 'birth' in content else None,
7070
phone=content['phone']
7171
)
7272
return UserService.create_user(user_dto)

app/models/user.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ class User(db.Model):
88
uid = db.Column(db.String(100), unique=True, nullable=False)
99
password = db.Column(db.String(200), nullable=False)
1010
name = db.Column(db.String(150), nullable=False)
11-
gender = db.Column(db.String(10), nullable=False)
12-
birth = db.Column(db.DateTime(), nullable=False)
11+
gender = db.Column(db.String(10), nullable=True)
12+
birth = db.Column(db.DateTime(), nullable=True)
1313
phone = db.Column(db.String(20), unique=False, nullable=False)
1414
device_token = db.Column(db.String(200), nullable=True)
1515
created_at = db.Column(db.DateTime(), nullable=True, default=datetime.datetime.now())

app/utils/user.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class UserDTO:
1919
birth: datetime
2020
phone: str
2121

22-
def __init__(self, uid, password, name, gender, birth, phone, id=None):
22+
def __init__(self, uid, password, name, phone, gender=None, birth=None, id=None):
2323
self.uid = uid
2424
self.password = password
2525
self.name = name
@@ -34,10 +34,6 @@ def __init__(self, uid, password, name, gender, birth, phone, id=None):
3434
raise SignUpFail("비밀번호는 필수 입력 항목입니다.")
3535
if not name:
3636
raise SignUpFail("이름은 필수 입력 항목입니다.")
37-
if not gender:
38-
raise SignUpFail("성별은 필수 입력 항목입니다.")
39-
if not birth:
40-
raise SignUpFail("생일은 필수 입력 항목입니다.")
4137
if not phone:
4238
raise SignUpFail("전화번호는 필수 입력 항목입니다.")
4339

0 commit comments

Comments
 (0)