updated changes for oee_handlers

scripts/core/handlers/oee_handlers.py

@@ -32,7 +32,11 @@ class OeeServices:
                                meta=request_data.meta,
                                oee_tag_mapping=request_data.oee_tag_mapping
                                )
+            if bool(request_data.hierarchy):
+                insert_json.update(hierarchy=request_data.hierarchy)
             result = self.tag_data_conn.add_tag(insert_json)
+            result.meta.update(self.common_utils.get_user_meta(user_id,check_flag=True))
+            if result:
                 return result
         except Exception as e:
             raise logger.exception(f"Error occurred while inserting data{e}")
@@ -40,8 +44,8 @@ class OeeServices:
     def get_oee_tag(self, request_data: GetOeeServices, db: Session):
         try:
 
-            result = self.tag_data_conn.find_data_project_id(request_data.project_id)
-            print(result)
+            result = self.tag_data_conn.find_data_by_project_id(project_id=request_data.project_id)
+            return result
 
         except Exception as e:
             raise logger.exception(f"Exception occurred while fetching data as {e}")
@@ -57,8 +61,12 @@ class OeeServices:
 
     def update_oee_tags(self, request_data: GetOeeServices, db: Session):
         try:
-            query = {"project_id": ['update_oee_tags.project_id']}
-            result = self.tag_data_conn.update_one(query=query)
+            update_json = dict(hierarchy=request_data.hierarchy,
+                               project_id=request_data.project_id,
+                               meta=request_data.meta,
+                               oee_tag_mapping=request_data.oee_tag_mapping)
+            result = self.tag_data_conn.update_tag_data(project_id=update_json["project_id"],
+                                                        data=update_json, upsert=True)
             if result:
                 return result
         except Exception as e:

scripts/db/mongo/ilens_assistant/collection/tag_instance_data.py

@@ -27,12 +27,12 @@ class TagInstanceData(MongoCollectionBaseClass):
     def key_project_id(self):
         return TagInstanceDataKeys.KEY_PROJECT_ID
 
-    def find_data_by_project_id(self, project_id):
+    def find_data_by_project_id(self, project_id: str):
         query = {"project_id": project_id}
-        records = self.find(query)
+        records = self.find_one(query)
         if not records:
-            return list()
-        return records
+            return TagInstanceDataSchema()
+        return TagInstanceDataSchema(**records)
 
     def find_data_project_id(self, project_id):
         query = {"project": project_id}
@@ -58,7 +58,7 @@ class TagInstanceData(MongoCollectionBaseClass):
         return self.update_one(data=data, query=query, upsert=upsert)
 
     def get_tag_data(self, query):
-        record = self.find_one(query)
+        record = self.find_one(query, filter_dict=None)
         if not record:
             return None
         return record
@@ -73,3 +73,7 @@ class TagInstanceData(MongoCollectionBaseClass):
     def add_new_tag(self, data):
         self.insert_one(data.dict())
         return TagInstanceDataSchema(**data.dict()).hierarchy
+
+    def update_tag_data(self, project_id, data, upsert=False):
+        query = {"project_id": project_id}
+        return self.update_one(data=data, query=query, upsert=upsert)
\ No newline at end of file

scripts/services/oee_services.py

@@ -23,7 +23,7 @@ async def save_oee_tag(request_data: GetOeeServices, user_id=Depends(auth), db=D
         oee_services = OeeServices(project_id=meta.project_id)
         result = oee_services.oee_tag(request_data, user_id, db)
         if result:
-            return DefaultResponse(status="success",message='Oee Tag Saved Successfully', data=result)
+            return DefaultResponse(status="success", message='Oee Tag Saved Successfully', data=result)
     except Exception as e:
         tb = traceback.format_exc()
         logger.exception(e)
@@ -38,7 +38,7 @@ async def get_oee_tag(request_data: GetOeeServices, db=Depends(get_db),
         oee_services = OeeServices(project_id=meta.project_id)
         result = oee_services.get_oee_tag(request_data, db)
         if result:
-            return DefaultResponse(message='Record Fetched Successfully', data=result)
+            return DefaultResponse(status="success", message='Record Fetched Successfully', data=result)
         return DefaultFailureResponse(status='failed', message='Record Not Found', data={})
     except Exception as e:
         tb = traceback.format_exc()
@@ -54,7 +54,8 @@ async def delete_oee_tag(request_data: GetOeeServices, db=Depends(get_db),
         oee_services = OeeServices(project_id=meta.project_id)
         result = oee_services.delete_oee_tags(request_data, db)
         if result:
-            return DefaultResponse(message='Record Deleted Successfully', data=result)
+            return DefaultResponse(status="success", message='Record Deleted Successfully', data=result)
+        return DefaultFailureResponse(status='failed', message='Record was not able to delete', data={})
     except Exception as e:
         tb = traceback.format_exc()
         logger.exception(e)
@@ -69,7 +70,8 @@ async def update_oee_tag(request_data: GetOeeServices, db=Depends(get_db),
         oee_services = OeeServices(project_id=meta.project_id)
         result = oee_services.update_oee_tags(request_data, db)
         if result:
-            return DefaultResponse(message='DowntimeLog Updated Successfully', data=result)
+            return DefaultResponse(status="success", message=' Updated Successfully', data=result)
+        return DefaultFailureResponse(status='failed', message='Not updated', data={})
     except Exception as e:
         tb = traceback.format_exc()
         logger.exception(e)