asset category logic added and some minor bug fixed

cloudintro · cloudintro · commit fd414eb09831 · 2020-03-07T18:40:18.000+05:30
diff --git a/asset_mgr/app/src/app_models.py b/asset_mgr/app/src/app_models.py
@@ -10,15 +10,27 @@ class AssetInfo(Base):
     asset_id = Column(String, primary_key=True, nullable=False)
     asset_name = Column(String, nullable=False)
     asset_owner = Column(String)
-    asset_catagory = Column(String, nullable=False)
-    asset_count = Column(Numeric)
+    asset_category = Column(String, nullable=False)
 
     def __repr__(self):
-        return "AssetInfo(%s, %s, %s, %s, %d)" % (
+        return "AssetInfo(%s, %s, %s, %s)" % (
             self.asset_id,
             self.asset_name,
             self.asset_owner,
-            self.asset_catagory,
+            self.asset_category,
+        )
+
+
+class AssetCategory(Base):
+
+    __tablename__ = "T_ASSET_CATEGORY"
+
+    category_name = Column(String, primary_key=True, nullable=False)
+    asset_count = Column(Numeric)
+
+    def __repr__(self):
+        return "AssetCategory(%s, %d)" % (
+            self.category_name,
             self.asset_count,
         )
 
@@ -27,5 +39,4 @@ class AssetInfoReq(BaseModel):
     asset_id: str
     asset_name: str
     asset_owner: str = None
-    asset_catagory: str
-    asset_count: int = None
+    asset_category: str
diff --git a/asset_mgr/app/src/app_repo.py b/asset_mgr/app/src/app_repo.py
@@ -1,6 +1,6 @@
 from logzero import logger as log
 from app_database import DataBaseObj
-from app_models import AssetInfo, AssetInfoReq
+from app_models import AssetInfo, AssetCategory
 
 db_obj = DataBaseObj()
 
@@ -27,7 +27,7 @@ def query_asset_info(asset_id):
         return result
 
     @staticmethod
-    def add_asset_info(asset_info: AssetInfoReq):
+    def add_asset_info(asset_info):
         session = db_obj.get_db_session()
         try:
             count_result = (
@@ -38,26 +38,28 @@ def add_asset_info(asset_info: AssetInfoReq):
             if count_result > 0:
                 log.error(f" user already exists {asset_info.asset_id}")
             else:
+                AssetInfoDao.update_asset_category(asset_info.asset_category, 1)
                 new_asset = AssetInfo(
                     asset_id=asset_info.asset_id,
                     asset_name=asset_info.asset_name,
                     asset_owner=asset_info.asset_owner,
-                    asset_catagory=asset_info.asset_catagory,
-                    asset_count=asset_info.asset_count,
+                    asset_category=asset_info.asset_category,
                 )
                 log.debug(f"add_asset_info {new_asset}")
                 session.add(new_asset)
                 session.commit()
+                result = new_asset
         except Exception as e:
             session.rollback
             log.exception(f"add_asset_info operation failed {e}")
         finally:
             if session is not None:
                 session.close()
                 log.debug(f"session closed")
+        return result
 
     @staticmethod
-    def update_asset_info(asset_id: int, asset_info: AssetInfoReq):
+    def update_asset_info(asset_id, asset_info):
         session = db_obj.get_db_session()
         try:
             query_result = session.query(AssetInfo).filter(
@@ -66,32 +68,40 @@ def update_asset_info(asset_id: int, asset_info: AssetInfoReq):
             if query_result.count() == 0:
                 log.error(f" user not found", asset_info.asset_id)
             else:
+                old_category = query_result.first().asset_category
                 query_result.update(
                     {
                         AssetInfo.asset_name: asset_info.asset_name,
                         AssetInfo.asset_owner: asset_info.asset_owner,
-                        AssetInfo.asset_catagory: asset_info.asset_catagory,
-                        AssetInfo.asset_count: asset_info.asset_count,
+                        AssetInfo.asset_category: asset_info.asset_category,
                     }
                 )
+                if old_category != asset_info.asset_category:
+                    AssetInfoDao.update_asset_category(asset_info.asset_category, 1)
+                    AssetInfoDao.update_asset_category(old_category, -1)
                 session.commit()
+                result = AssetInfo
         except Exception as e:
             session.rollback
             log.exception(f"update_asset_info operation failed {e}")
         finally:
             if session is not None:
                 session.close()
                 log.debug(f"session closed")
+        return result
 
     @staticmethod
     def delete_asset_info(asset_id):
         session = db_obj.get_db_session()
         try:
-            query_result = session.query(AssetInfo)
+            query_result = session.query(AssetInfo).filter(AssetInfo.asset_id == asset_id)
             if query_result.count() == 0:
                 log.error(f" asset not found {asset_id}")
+                result = 0
             else:
-                query_result.filter(AssetInfo.asset_id == asset_id).delete()
+                old_category = query_result.first().asset_category
+                AssetInfoDao.update_asset_category(old_category, -1)
+                result = query_result.delete()
             session.commit()
         except Exception as e:
             session.rollback
@@ -100,3 +110,33 @@ def delete_asset_info(asset_id):
             if session is not None:
                 session.close()
                 log.debug(f"session closed")
+        return result
+
+    @staticmethod
+    def update_asset_category(category, count):
+        log.debug(f"update_asset_category {category} {count}")
+        session = db_obj.get_db_session()
+        try:
+            query_result = session.query(AssetCategory).filter(AssetCategory.category_name == category)
+            if query_result.count() == 0:
+                new_category = AssetCategory(
+                    category_name=category,
+                    asset_count=1,
+                )
+                log.debug(f"adding asset category {category}")
+                session.add(new_category)
+            else:
+                query_result.update(
+                    {
+                        AssetCategory.asset_count: query_result.first().asset_count+count,
+                    }
+                )
+                log.debug(f"updating asset category {category}")
+            session.commit()
+        except Exception as e:
+            session.rollback
+            log.exception(f"update_asset_category operation failed {e}")
+        finally:
+            if session is not None:
+                session.close()
+                log.debug(f"session closed")
diff --git a/user_mgr/app/src/app_repo.py b/user_mgr/app/src/app_repo.py
@@ -89,11 +89,11 @@ def update_user_info(user_id, user_info):
     def delete_user_info(user_id):
         session = db_obj.get_db_session()
         try:
-            query_result = session.query(UserInfo)
+            query_result = session.query(UserInfo).filter(UserInfo.user_id == user_id)
             if query_result.count() == 0:
                 log.error(f" user not found {user_id}")
             else:
-                result = query_result.filter(UserInfo.user_id == user_id).delete()
+                result = query_result.delete()
             session.commit()
         except Exception as e:
             session.rollback
