8000 Merge pull request #2 from smallintro/python-micro-branch · cloudintro/python-microservices@b83a1e8 · GitHub
[go: up one dir, main page]
Skip to content

Commit b83a1e8

Browse files
cloudintrocloudintro
authored
Merge pull request #2 from smallintro/python-micro-branch
data type removed from intermediate methods and id changed to string
2 parents 4ba2efd + 95387c0 commit b83a1e8

File tree

7 files changed

+48
-44
lines changed

7 files changed

+48
-44
lines changed

‎asset_mgr/app/src/app_assetmgr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
@app_v1.get("/v1/assetmgr/{assetid}")
12-
def get_asset_info(assetid: str):
12+
def get_asset_info(assetid: str = "-1"):
1313
log.info(f"get_asset_info {assetid}")
1414
result = assetservice.get_asset_info(assetid)
1515
return {"asset_info": result}

‎asset_mgr/app/src/app_repo.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
class AssetInfoDao(object):
99
@staticmethod
10-
def query_asset_info(asset_id=-1):
10+
def query_asset_info(asset_id):
1111
session = db_obj.get_db_session()
1212
try:
1313
query_result = session.query(AssetInfo)
14-
if asset_id == -1:
14+
if asset_id == "-1":
1515
result = query_result.all()
1616
else:
1717
result = query_result.filter(AssetInfo.asset_id == asset_id).all()
@@ -60,7 +60,9 @@ def add_asset_info(asset_info: AssetInfoReq):
6060
def update_asset_info(asset_id: int, asset_info: AssetInfoReq):
6161
session = db_obj.get_db_session()
6262
try:
63-
query_result = session.query(AssetInfo).filter(AssetInfo.asset_id == asset_id)
63+
query_result = session.query(AssetInfo).filter(
64+
AssetInfo.asset_id == asset_id
65+
)
6466
if query_result.count() == 0:
6567
log.error(f" user not found", asset_info.asset_id)
6668
else:
@@ -82,12 +84,12 @@ def update_asset_info(asset_id: int, asset_info: AssetInfoReq):
8284
log.debug(f"session closed")
8385

8486
@staticmethod
85-
def delete_asset_info(asset_id=-1):
87+
def delete_asset_info(asset_id):
8688
session = db_obj.get_db_session()
8789
try:
8890
query_result = session.query(AssetInfo)
89-
if asset_id == -1:
90-
query_result.delete()
91+
if query_result.count() == 0:
92+
log.error(f" asset not found {asset_id}")
9193
else:
9294
query_result.filter(AssetInfo.asset_id == asset_id).delete()
9395
session.commit()

‎asset_mgr/app/src/app_services.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,26 @@
88

99
class AssetInfoService(object):
1010
@staticmethod
11-
def get_asset_info(asset_id: str):
11+
def get_asset_info(asset_id):
1212
logger.debug(f"get_asset_info")
1313
result = assetdao.query_asset_info(asset_id)
1414
return result
1515

1616
@staticmethod
17-
def add_asset_info(asset_info: AssetInfoReq):
17+
def add_asset_info(asset_info):
1818
logger.debug(f"add_asset_info")
1919
assetdao.add_asset_info(asset_info)
2020
result = assetdao.query_asset_info(asset_info.asset_id)
2121
return result
2222

2323
@staticmethod
24-
def update_asset_info(asset_id: str, asset_info: AssetInfoReq):
24+
def update_asset_info(asset_id, asset_info):
2525
logger.debug(f"update_asset_info")
26-
assetdao.update_asset_info(asset_id, asset_info)
27-
result = assetdao.query_asset_info(asset_id)
26+
result = assetdao.update_asset_info(asset_id, asset_info)
2827
return result
2928

3029
@staticmethod
31-
def del_asset_info(asset_id: str):
30+
def del_asset_info(asset_id):
3231
logger.debug(f"del_asset_info")
3332
result = assetdao.delete_asset_info(asset_id)
3433
return result

‎user_mgr/app/src/app_models.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ class UserInfo(Base):
77

88
__tablename__ = "T_USER_INFO"
99

10-
user_id = Column(Numeric, primary_key=True, nullable=False)
10+
user_id = Column(String, primary_key=True, nullable=False)
1111
user_name = Column(String)
1212
user_email = Column(String)
13-
user_role = Column(Numeric)
14-
user_assets = Column(String)
13+
user_role = Column(String)
14+
user_assets = Column(String) # comma separated asset ids
1515

1616
def __repr__(self):
17-
return "UserInfo(%d, %s,%s,%s,%s)" % (
17+
return "UserInfo(%s, %s,%s,%s,%s)" % (
1818
self.user_id,
1919
self.user_name,
2020
self.user_email,
@@ -24,7 +24,7 @@ def __repr__(self):
2424

2525

2626
class UserInfoReq(BaseModel):
27-
user_id: int
27+
user_id: str
2828
user_name: str
2929
user_email: str
3030
user_role: int = None

‎user_mgr/app/src/app_repo.py

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
from logzero import logger as log
22
from app_database import DataBaseObj
3-
from app_models import UserInfo, UserInfoReq
3+
from app_models import UserInfo
44

55
db_obj = DataBaseObj()
66

77

88
class UserInfoDao(object):
99
@staticmethod
10-
def query_user_info(user_id=-1):
10+
def query_user_info(user_id):
1111
session = db_obj.get_db_session()
1212
try:
1313
query_result = session.query(UserInfo)
14-
if user_id == -1:
14+
if user_id == "-1":
1515
result = query_result.all()
1616
else:
1717
result = query_result.filter(UserInfo.user_id == user_id).all()
@@ -27,15 +27,15 @@ def query_user_info(user_id=-1):
2727
return result
2828

2929
@staticmethod
30-
def add_user_info(user_info: UserInfoReq):
30+
def add_user_info(user_info):
3131
session = db_obj.get_db_session()
3232
try:
33-
query_result = (
33+
query_count = (
3434
session.query(UserInfo)
3535
.filter(UserInfo.user_id == user_info.user_id)
36-
.all()
36+
.count()
3737
)
38-
if len(query_result) > 0:
38+
if query_count > 0:
3939
log.error(f" user already exists {user_info.user_id}")
4040
else:
4141
new_user = UserInfo(
@@ -48,21 +48,23 @@ def add_user_info(user_info: UserInfoReq):
4848
log.debug(f"add_user_info {new_user}")
4949
session.add(new_user)
5050
session.commit()
51+
result = new_user
5152
except Exception as e:
5253
session.rollback
5354
log.exception(f"add_user_info operation failed {e}")
5455
finally:
5556
if session is not None:
5657
session.close()
5758
log.debug(f"session closed")
59+
return result
5860

5961
@staticmethod
60-
def update_user_info(user_id: int, user_info: UserInfoReq):
62+
def update_user_info(user_id, user_info):
6163
session = db_obj.get_db_session()
6264
try:
6365
query_result = session.query(UserInfo).filter(UserInfo.user_id == user_id)
64-
if len(query_result.all()) == 0:
65-
log.error(f" user not found", user_info.user_id)
66+
if query_result.count() == 0:
67+
log.error(f" user not found {user_id}")
6668
else:
6769
query_result.update(
6870
{
@@ -73,21 +75,23 @@ def update_user_info(user_id: int, user_info: UserInfoReq):
7375
}
7476
)
7577
session.commit()
78+
result = user_info
7679
except Exception as e:
7780
session.rollback
7881
log.exception(f"update_user_info operation failed {e}")
7982
finally:
8083
if session is not None:
8184
session.close()
8285
log.debug(f"session closed")
86+
return result
8387

8488
@staticmethod
85-
def delete_user_info(user_id=-1):
89+
def delete_user_info(user_id):
8690
session = db_obj.get_db_session()
8791
try:
8892
query_result = session.query(UserInfo)
89-
if user_id == -1:
90-
result = query_result.delete()
93+
if query_result.count() == 0:
94+
log.error(f" user not found {user_id}")
9195
else:
9296
result = query_result.filter(UserInfo.user_id == user_id).delete()
9397
session.commit()
@@ -98,3 +102,4 @@ def delete_user_info(user_id=-1):
98102
if session is not None:
99103
session.close()
100104
log.debug(f"session closed")
105+
return result

‎user_mgr/app/src/app_services.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
11
from logzero import logger
22
from app_repo import UserInfoDao
3-
from app_models import UserInfo, UserInfoReq
43

54

65
userdao = UserInfoDao()
76

87

98
class UserInfoService(object):
109
@staticmethod
11-
def get_user_info(user_id: int):
10+
def get_user_info(user_id):
1211
logger.debug(f"get_user_info")
1312
result = userdao.query_user_info(user_id)
1413
return result
1514

1615
@staticmethod
17-
def add_user_info(user_info: UserInfoReq):
16+
def add_user_info(user_info):
1817
logger.debug(f"add_user_info")
1918
userdao.add_user_info(user_info)
2019
result = userdao.query_user_info(user_info.user_id)
2120
return result
2221

2322
@staticmethod
24-
def update_user_info(user_id: int, user_info: UserInfoReq):
23+
def update_user_info(user_id, user_info):
2524
logger.debug(f"update_user_info")
26-
userdao.update_user_info(user_id, user_info)
27-
result = userdao.query_user_info(user_id)
25+
result = userdao.update_user_info(user_id, user_info)
2826
return result
2927

3028
@staticmethod
31-
def del_user_info(user_id: int):
29+
def del_user_info(user_id):
3230
logger.debug(f"del_user_info")
3331
result = userdao.delete_user_info(user_id)
3432
return result

‎user_mgr/app/src/app_usermgr.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@
99

1010

1111
@app_v1.get("/v1/usermgr/{userid}")
12-
def get_user_info(userid: int):
12+
def get_user_info(userid: str = "-1"):
1313
log.info(f"get_user_info {userid}")
1414
result = userservice.get_user_info(userid)
15-
return {"user_info": result}
15+
return {"message": result}
1616

1717

1818
@app_v1.post("/v1/usermgr")
1919
def add_user_info(user_info: UserInfoReq):
2020
log.info(f"add_user_info {UserInfoReq}")
2121
result = userservice.add_user_info(user_info)
22-
return {"user_info": result}
22+
return {"message": result}
2323

2424

2525
@app_v1.put("/v1/usermgr/{userid}")
26-
def update_user_info(userid: int, user_info: UserInfoReq):
26+
def update_user_info(userid: str, user_info: UserInfoReq):
2727
log.info(f"update_user_info {UserInfoReq}")
2828
result = userservice.update_user_info(userid, user_info)
29-
return {"user_info": result}
29+
return {"message": result}
3030

3131

3232
@app_v1.delete("/v1/usermgr/{userid}")
33-
def del_user_info(userid: int):
33+
def del_user_info(userid: str):
3434
log.info(f"del_user_info {userid}")
3535
result = userservice.del_user_info(userid)
3636
return {"message": result}

0 commit comments

Comments
 (0)
0