8000 data type removed from intermediate methods and id changed to string by cloudintro · Pull Request #2 · cloudintro/python-microservices · GitHub
[go: up one dir, main page]
Skip to content

data type removed from intermediate methods and id changed to string #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2020
Merged

data type removed from intermediate methods and id changed to string #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion asset_mgr/app/src/app_assetmgr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


@app_v1.get("/v1/assetmgr/{assetid}")
def get_asset_info(assetid: str):
def get_asset_info(assetid: str = "-1"):
log.info(f"get_asset_info {assetid}")
result = assetservice.get_asset_info(assetid)
return {"asset_info": result}
Expand Down
14 changes: 8 additions & 6 deletions asset_mgr/app/src/app_repo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

class AssetInfoDao(object):
@staticmethod
def query_asset_info(asset_id=-1):
def query_asset_info(asset_id):
session = db_obj.get_db_session()
try:
query_result = session.query(AssetInfo)
if asset_id == -1:
if asset_id == "-1":
result = query_result.all()
else:
result = query_result.filter(AssetInfo.asset_id == asset_id).all()
Expand Down Expand Up @@ -60,7 +60,9 @@ def add_asset_info(asset_info: AssetInfoReq):
def update_asset_info(asset_id: int, asset_info: AssetInfoReq):
session = db_obj.get_db_session()
try:
query_result = session.query(AssetInfo).filter(AssetInfo.asset_id == asset_id)
query_result = session.query(AssetInfo).filter(
AssetInfo.asset_id == asset_id
)
if query_result.count() == 0:
log.error(f" user not found", asset_info.asset_id)
else:
Expand All @@ -82,12 +84,12 @@ def update_asset_info(asset_id: int, asset_info: AssetInfoReq):
log.debug(f"session closed")

@staticmethod
def delete_asset_info(asset_id=-1):
def delete_asset_info(asset_id):
session = db_obj.get_db_session()
try:
query_result = session.query(AssetInfo)
if asset_id == -1:
query_result.delete()
if query_result.count() == 0:
log.error(f" asset not found {asset_id}")
else:
query_result.filter(AssetInfo.asset_id == asset_id).delete()
session.commit()
Expand Down
11 changes: 5 additions & 6 deletions asset_mgr/app/src/app_services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,26 @@

class AssetInfoService(object):
@staticmethod
def get_asset_info(asset_id: str):
def get_asset_info(asset_id):
logger.debug(f"get_asset_info")
result = assetdao.query_asset_info(asset_id)
return result

@staticmethod
def add_asset_info(asset_info: AssetInfoReq):
def add_asset_info(asset_info):
logger.debug(f"add_asset_info")
assetdao.add_asset_info(asset_info)
result = assetdao.query_asset_info(asset_info.asset_id)
return result

@staticmethod
def update_asset_info(asset_id: str, asset_info: AssetInfoReq):
def update_asset_info(asset_id, asset_info):
logger.debug(f"update_asset_info")
assetdao.update_asset_info(asset_id, asset_info)
result = assetdao.query_asset_info(asset_id)
result = assetdao.update_asset_info(asset_id, asset_info)
return result

@staticmethod
def del_asset_info(asset_id: str):
def del_asset_info(asset_id):
logger.debug(f"del_asset_info")
result = assetdao.delete_asset_info(asset_id)
return result
10 changes: 5 additions & 5 deletions user_mgr/app/src/app_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ class UserInfo(Base):

__tablename__ = "T_USER_INFO"

user_id = Column(Numeric, primary_key=True, nullable=False)
user_id = Column(String, primary_key=True, nullable=False)
user_name = Column(String)
user_email = Column(String)
user_role = Column(Numeric)
user_assets = Column(String)
user_role = Column(String)
user_assets = Column(String) # comma separated asset ids

def __repr__(self):
return "UserInfo(%d, %s,%s,%s,%s)" % (
return "UserInfo(%s, %s,%s,%s,%s)" % (
self.user_id,
self.user_name,
self.user_email,
Expand All @@ -24,7 +24,7 @@ def __repr__(self):


class UserInfoReq(BaseModel):
user_id: int
user_id: str
user_name: str
user_email: str
user_role: int = None
Expand Down
31 changes: 18 additions & 13 deletions user_mgr/app/src/app_repo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
from logzero import logger as log
from app_database import DataBaseObj
from app_models import UserInfo, UserInfoReq
from app_models import UserInfo

db_obj = DataBaseObj()


class UserInfoDao(object):
@staticmethod
def query_user_info(user_id=-1):
def query_user_info(user_id):
session = db_obj.get_db_session()
try:
query_result = session.query(UserInfo)
if user_id == -1:
if user_id == "-1":
result = query_result.all()
else:
result = query_result.filter(UserInfo.user_id == user_id).all()
Expand All @@ -27,15 +27,15 @@ def query_user_info(user_id=-1):
return result

@staticmethod
def add_user_info(user_info: UserInfoReq):
def add_user_info(user_info):
session = db_obj.get_db_session()
try:
query_result = (
query_count = (
session.query(UserInfo)
.filter(UserInfo.user_id == user_info.user_id)
.all()
.count()
)
if len(query_result) > 0:
if query_count > 0:
log.error(f" user already exists {user_info.user_id}")
else:
new_user = UserInfo(
Expand All @@ -48,21 +48,23 @@ def add_user_info(user_info: UserInfoReq):
log.debug(f"add_user_info {new_user}")
session.add(new_user)
session.commit()
result = new_user
except Exception as e:
session.rollback
log.exception(f"add_user_info operation failed {e}")
finally:
if session is not None:
session.close()
log.debug(f"session closed")
return result

@staticmethod
def update_user_info(user_id: int, user_info: UserInfoReq):
def update_user_info(user_id, user_info):
session = db_obj.get_db_session()
try:
query_result = session.query(UserInfo).filter(UserInfo.user_id == user_id)
if len(query_result.all()) == 0:
log.error(f" user not found", user_info.user_id)
if query_result.count() == 0:
log.error(f" user not found {user_id}")
else:
query_result.update(
{
Expand All @@ -73,21 +75,23 @@ def update_user_info(user_id: int, user_info: UserInfoReq):
}
)
session.commit()
result = user_info
except Exception as e:
session.rollback
log.exception(f"update_user_info operation failed {e}")
finally:
if session is not None:
session.close()
log.debug(f"session closed")
return result

@staticmethod
def delete_user_info(user_id=-1):
def delete_user_info(user_id):
session = db_obj.get_db_session()
try:
query_result = session.query(UserInfo)
if user_id == -1:
result = query_result.delete()
if query_result.count() == 0:
log.error(f" user not found {user_id}")
else:
result = query_result.filter(UserInfo.user_id == user_id).delete()
session.commit()
Expand All @@ -98,3 +102,4 @@ def delete_user_info(user_id=-1):
if session is not None:
session.close()
log.debug(f"session closed")
return result
12 changes: 5 additions & 7 deletions user_mgr/app/src/app_services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,32 @@
from logzero import logger
from app_repo import UserInfoDao
from app_models import UserInfo, UserInfoReq


userdao = UserInfoDao()


class UserInfoService(object):
@staticmethod
def get_user_info(user_id: int):
def get_user_info(user_id):
logger.debug(f"get_user_info")
result = userdao.query_user_info(user_id)
return result

@staticmethod
def add_user_info(user_info: UserInfoReq):
def add_user_info(user_info):
logger.debug(f"add_user_info")
userdao.add_user_info(user_info)
result = userdao.query_user_info(user_info.user_id)
return result

@staticmethod
def update_user_info(user_id: int, user_info: UserInfoReq):
def update_user_info(user_id, user_info):
logger.debug(f"update_user_info")
userdao.update_user_info(user_id, user_info)
result = userdao.query_user_info(user_id)
result = userdao.update_user_info(user_id, user_info)
return result

@staticmethod
def del_user_info(user_id: int):
def del_user_info(user_id):
logger.debug(f"del_user_info")
result = userdao.delete_user_info(user_id)
return result
12 changes: 6 additions & 6 deletions user_mgr/app/src/app_usermgr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,28 @@


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


@app_v1.post("/v1/usermgr")
def add_user_info(user_info: UserInfoReq):
log.info(f"add_user_info {UserInfoReq}")
result = userservice.add_user_info(user_info)
return {"user_info": result}
return {"message": result}


@app_v1.put("/v1/usermgr/{userid}")
def update_user_info(userid: int, user_info: UserInfoReq):
def update_user_info(userid: str, user_info: UserInfoReq):
log.info(f"update_user_info {UserInfoReq}")
result = userservice.update_user_info(userid, user_info)
return {"user_info": result}
return {"message": result}


@app_v1.delete("/v1/usermgr/{userid}")
def del_user_info(userid: int):
def del_user_info(userid: str):
log.info(f"del_user_info {userid}")
result = userservice.del_user_info(userid)
return {"message": result}
0