Changes made to Oee_handlers.py

scripts/core/handlers/oee_handlers.py

 from scripts.logging import logger
 from scripts.utils.mongo_util import MongoCollectionBaseClass
+from scripts.schemas.oee_config_schema import oee_tag_mapping_list, get_oee_tag, update_oee_tags, project_id
 
 from scripts.constants.db_connections import mongo_client
 
 
-class Oee_services:
+class Oee_Services:
     def __init__(self):
         try:
             self.connect = MongoCollectionBaseClass(mongo_client=mongo_client, database="ilens_configuration",
@@ -12,13 +13,13 @@ class Oee_services:
         except Exception as e:
             logger.exception("Error while connecting to mongodb")
 
-    async def oee_tag_mapping(self, oee_tag_mapping_list):
+    def oee_tag_mapping(self, oee_tag_mapping_list: oee_tag_mapping_list):
         try:
             return_json = {"message": "failure", "status": "failure", "message": "data not inserted in to mongodb"}
-            insert_json = {"hierarchy": oee_tag_mapping_list.get("hierarchy", ""),
-                           "project_id": oee_tag_mapping_list.get("project_id", ""),
-                           "meta": oee_tag_mapping_list.get("project_id", ""),
-                           "oee_tag_mapping": oee_tag_mapping_list.get("oee_tag_mapping", {})
+            insert_json = {"hierarchy": oee_tag_mapping_list.hierarchy,
+                           "project_id": oee_tag_mapping_list.project_id,
+                           "meta": oee_tag_mapping_list.project_id,
+                           "oee_tag_mapping": oee_tag_mapping_list.oee_tag_mapping
                            }
             result = self.connect.insert_one(data=insert_json)
             if result:
@@ -29,17 +30,17 @@ class Oee_services:
                 logger.info("Unable to insert data in to Mongodb")
 
         except Exception as e:
-            logger.exception("Error occured while inserting data")
+            logger.exception("Error occurred while inserting data")
 
         return return_json
 
-    async def get_oee_tag_mapping(self, get_oee_tag, ):
+    def get_oee_tag_mapping(self, get_oee_tag: get_oee_tag):
         try:
             return_json = {"message": "failure", "status": "failure", "data": "data not found"}
-            query = {'project_id': get_oee_tag.get("project_id", "")}
-            skips = get_oee_tag.get("page_size") * (get_oee_tag("page_num") - 1)
+            query = {'project_id': get_oee_tag.project_id}
+            skips = get_oee_tag.page_size * (get_oee_tag.page_num - 1)
             no_of_documents = self.connect.count_documents(query=query)
-            result = self.connect.find(query=query).skip(skips).limit(get_oee_tag.get("page_num"))
+            result = self.connect.find(query=query).skip(skips).limit(get_oee_tag.page_num)
             if result:
                 return_json["message"] = "success"
                 return_json["status"] = "success"
@@ -53,23 +54,23 @@ class Oee_services:
             logger.exception(f"Exception occured while fetching data as {e}")
         return result
 
-    async def delete_oee_tags(self, project_id):
+    def delete_oee_tags(self, project_id: project_id):
         try:
             return_json = {"message": "failure", "status": "failure", "data": "data not found"}
-            query = {"project_id": project_id}
+            query = {"project_id": project_id.project_id}
             result = self.connect.delete_one(query=query)
             if result:
                 return_json["message"] = "success"
                 return_json["status"] = "success"
                 return_json["data"] = result
         except Exception as e:
-            logger.exception(f"Exception occured while fetching data as {e}")
+            logger.exception(f"Exception occurred while fetching data as {e}")
         return result
 
-    async def update_oee_tags(self, update_oee_tags):
+    def update_oee_tags(self, update_oee_tags: update_oee_tags):
         try:
             return_json = {"message": "failure", "status": "failure", "data": "data not found"}
-            query = {"project_id": update_oee_tags['projec_id']}
+            query = {"project_id": ['update_oee_tags.projec_id']}
             result = self.connect.update_one(query=query, data=return_json)
             if result:
                 return_json["message"] = "success"

scripts/schemas/oee_config_schema.py

+from pydantic import BaseModel
+
+
+class oee_tag_mapping_list(BaseModel):
+    hierarchy: str
+    project_id: str
+    meta: str
+    oee_tag_mapping: str
+
+
+class get_oee_tag(BaseModel):
+    project_id: str
+    page_size: str
+    page_num: str
+
+
+class project_id(BaseModel):
+    project_id: str
+
+
+class update_oee_tags(BaseModel):
+    project_id: str

scripts/services/oee_services.py

@@ -11,45 +11,48 @@ oee_services = APIRouter(prefix=Endpoints.oee_services, tags=["OEE Calculator"])
 async def oee_tag_mapping(oee_tag_mapping_list: GetOeeServices):
     try:
         tag_mapping = oee_tag_mapping_list.dict()
-        result = oee_handlers.Oee_services.oee_tag_mapping(tag_mapping)
+        result = oee_handlers.Oee_Services.oee_tag_mapping(oee_tag_mapping_list)
+        return result
 
     except Exception as e:
-        logger.exception("Exception occured while inserting data")
+        logger.exception("Exception occurred while inserting data")
+
 
-    return result
 
 
 @oee_services.post(Endpoints.oee_services)
 async def get_oee_tag_mapping(get_oee_tags: GetOeeServices):
     try:
         get_oee_tags = get_oee_tags.dict()
-        return_json = oee_handlers.Oee_services.get_oee_tag_mapping(get_oee_tags)
+        return_json = oee_handlers.Oee_Services.get_oee_tag_mapping(get_oee_tags)
+        return return_json
 
     except Exception as e:
         logger.exception(f"Error while getting information as {e}")
 
-    return return_json
 
 
 @oee_services.post(Endpoints.oee_services)
 async def delete_oee_tagging(delete_oee_tags: GetOeeServices):
     try:
         delete_oee_tags = delete_oee_tags.dict()
-        return_json = oee_handlers.Oee_services.delete_oee_tags(projec_id=delete_oee_tags["project_id"])
+        return_json = oee_handlers.Oee_Services.delete_oee_tags(project_id=delete_oee_tags["project_id"])
+        return return_json
 
     except Exception as e:
         logger.exception(f"Error while getting information as {e}")
 
-    return return_json
+
 
 
 @oee_services.post(Endpoints.oee_services)
-async def updaye_oee_tagging(update_oee_tags: GetOeeServices):
+async def update_oee_tagging(update_oee_tags: GetOeeServices):
     try:
         update_oee_tags = update_oee_tags.dict()
-        return_json = oee_handlers.Oee_services.update_oee_services(update_oee_tags)
+        return_json = oee_handlers.Oee_Services.update_oee_tags(update_oee_tags)
+        return return_json
 
     except Exception as e:
         logger.exception(f"Error while getting information as {e}")
 
-    return return_json
+