sharedkernel 2.2.0__py3-none-any.whl → 2.2.2__py3-none-any.whl

sharedkernel/database/mongo_generic_audit_repository.py

@@ -4,6 +4,7 @@ from pymongo import MongoClient
 from pydantic.v1 import BaseModel
 
 from sharedkernel.database.audit_model import AuditLog
+from sharedkernel.enum.sort_order import SortOrder
 
 T = TypeVar("T", bound=BaseModel)
 
@@ -35,7 +36,13 @@ class MongoGenericAuditRepository():
         operation: str | None = None,
         collection_name: str | None  = None,
         field_name: str | None  = None,
+        page_number=1,
+        page_size=10,
+        sort_order: SortOrder = SortOrder.Descending,
     ) -> List[AuditLog]:
+        sort_order = -1 if sort_order == SortOrder.Descending else 1
+
+        skip_count = (page_number - 1) * page_size
 
         query = {}
 
@@ -52,6 +59,39 @@ class MongoGenericAuditRepository():
                 {f"modified.{field_name}": {"$exists": True}},
             ]
 
+        results = self.collection.find(query).sort("_id", sort_order).skip(skip_count).limit(page_size)
+        return [self._map_to_model(bot) for bot in results]
+    
+    def find_by_value(
+        self,
+        field_name: str,
+        field_value: str,
+        document_id: str | None = None,
+        operation: str | None = None,
+        collection_name: str | None = None,
+        find_in_originals: bool | None = False,
+        find_in_modifies: bool | None = False,
+    ) -> list[AuditLog]:
+
+        query = {}
+
+        if document_id:
+            query["document_id"] = document_id
+        if operation:
+            query["operation"] = operation
+        if collection_name:
+            query["collection_name"] = collection_name
+
+        if find_in_originals and find_in_modifies:
+            query["$or"] = [
+                {f"original.{field_name}": field_value},
+                {f"modified.{field_name}": field_value},
+            ]
+        elif find_in_originals:
+            query[f"original.{field_name}"] = field_value
+        elif find_in_modifies:
+            query[f"modified.{field_name}"] = field_value
+
         results = self.collection.find(query)
         return [self._map_to_model(bot) for bot in results]
     

sharedkernel/database/mongo_generic_repository.py

@@ -79,7 +79,7 @@ class MongoGenericRepository(Generic[T]):
 
         return [str(id_) for id_ in result.inserted_ids]
 
-    def update_one(self, id: str, data: T) -> int:
+    def update_one(self, id: str, data: T, is_audit = True) -> int:
         delattr(data, "id")
 
         query = {"_id": ObjectId(id)}
@@ -89,24 +89,25 @@ class MongoGenericRepository(Generic[T]):
             return_document=ReturnDocument.BEFORE
         )
 
-        before_model = self.model(**before_dict)
-
         # For Audit log
-        with suppress(Exception):
-            diff_data = generate_clean_diff(before_model, data)
-            old_data, new_data = diff_data["original"], diff_data["modified"]
-
-            if isinstance(data, BaseAuditDocument) and new_data:
-                document = AuditLog(
-                    user_id=current_user_info.get().nameid,
-                    collection_name=self.__collection_name,
-                    document_id=id,
-                    operation=AuditOperation.UPDATE,
-                    original=old_data,
-                    modified=new_data,
-                )
+        if isinstance(data, BaseAuditDocument) and is_audit:
+            with suppress(Exception):
+                before_model = self.model(**before_dict)
                 
-                self.audit_collection.insert_one(document)
+                diff_data = generate_clean_diff(before_model, data)
+                old_data, new_data = diff_data["original"], diff_data["modified"]
+
+                if new_data:
+                    document = AuditLog(
+                        user_id=current_user_info.get().nameid,
+                        collection_name=self.__collection_name,
+                        document_id=id,
+                        operation=AuditOperation.UPDATE,
+                        original=old_data,
+                        modified=new_data,
+                    )
+                    
+                    self.audit_collection.insert_one(document)
 
         return 1
 

sharedkernel/enum/sort_order.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class SortOrder(str, Enum):
+    Descending = "desc"
+    Ascending = "asc"

{sharedkernel-2.2.0.dist-info → sharedkernel-2.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sharedkernel
-Version: 2.2.0
+Version: 2.2.2
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -17,7 +17,8 @@ Requires-Dist: boto3==1.35.90
 Requires-Dist: python-docx
 Requires-Dist: mammoth
 Requires-Dist: markdown
-Requires-Dist: beautifulsoup4deepdiff
+Requires-Dist: beautifulsoup4
+Requires-Dist: deepdiff
 Dynamic: author
 Dynamic: description
 Dynamic: description-content-type
@@ -28,6 +29,11 @@ Dynamic: summary
 this is a shared kernel package
 
 # Change Log
+### Version 2.2.2
+- update on audit logging queries
+- added is_audit to update_one parameters
+### Version 2.2.1
+- fixbug requirements
 ### Version 2.2.0
 - implement Audit logging
 ### Version 2.1.2

{sharedkernel-2.2.0.dist-info → sharedkernel-2.2.2.dist-info}/RECORD

@@ -8,10 +8,11 @@ sharedkernel/s3_uploader.py,sha256=9Tzi5siceHPKab244tOAmnY_hNOeTn9yvsQevNdz7Gk,3
 sharedkernel/string_extentions.py,sha256=ld02W06gd0Ql80GQU6nlqPAeUSfOe2Yr8cCzf3lJgQY,98
 sharedkernel/database/__init__.py,sha256=G_wHQf2WCrfyuPXHOOQFkcd0BkJQLmD8iginIyZWfjk,182
 sharedkernel/database/audit_model.py,sha256=SMAYrvMb7XvPi4076TDgkOLaxh_3Jg_tfE12qKOy8RA,364
-sharedkernel/database/mongo_generic_audit_repository.py,sha256=tJGp1hHhyzcYOV9af36QzLXeT_appNNlSs0lxqlofzk,2327
-sharedkernel/database/mongo_generic_repository.py,sha256=BkmJcJ3ncUpO0vahNvaD3al_AB0kZK2FOYPp1BPaHp0,4781
+sharedkernel/database/mongo_generic_audit_repository.py,sha256=F8z_4l7c2wHOeF995AN7TwK-Il7x0opk3_jkaRU4nac,3726
+sharedkernel/database/mongo_generic_repository.py,sha256=9zwJxHsyNLc-ZPJ2uS_6u3-8UdTZ0IEtQwQzQaTaPok,4899
 sharedkernel/enum/__init__.py,sha256=9M3H7paIFx-0GRhpod_Jg30nxIYPjskGL9WF9rN9U5I,33
 sharedkernel/enum/error_code.py,sha256=qF_YJrHHDc6ibAClSxBMJ9ktzG2OtvGxb67LX0O-NG0,475
+sharedkernel/enum/sort_order.py,sha256=T_1AknuVg2OSJMlIDkEiCUNHPW0yDnFvbzoNpTgG3-I,97
 sharedkernel/exception/__init__.py,sha256=Yjkd1VsLFuzfWcMj-v8YYTA-vjtUlF4ESglBFeN1zvs,315
 sharedkernel/exception/exception.py,sha256=TOxnymWJfhsrMmuLsG-amqJlDxmzznEfRnqDBe1vizk,1016
 sharedkernel/exception/exception_handlers.py,sha256=VHEYaf1quaf63w_JCsNWFbMs2TxqmQqqlL4yGt1OjXI,3302
@@ -25,7 +26,7 @@ sharedkernel/objects/json_string_model.py,sha256=j63tnoqiok0EmBP6T-ChYuQYKPw7mLq
 sharedkernel/objects/jwt_model.py,sha256=XQHQhTbg7PT8XiUh5fd9MwRH4ldPsesI_hfbjaSqdKg,134
 sharedkernel/objects/result.py,sha256=I_9hX5TPEO1oStzuFLjFh1rtimXorz7ml-OaW_2BMvc,680
 sharedkernel/objects/user_info.py,sha256=RsOExvd--7CvBibOA-7ZLLmoW3_rh9Hb3tTkH5K3DN8,283
-sharedkernel-2.2.0.dist-info/METADATA,sha256=p2RQooHpqAW8BkZpBBDjddMiRkVUMrSbNRuQocQ74aI,2867
-sharedkernel-2.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sharedkernel-2.2.0.dist-info/top_level.txt,sha256=TVTOnV1MItSSlpSjqkiijuHkoVsGHS4CArpsM-lylkE,13
-sharedkernel-2.2.0.dist-info/RECORD,,
+sharedkernel-2.2.2.dist-info/METADATA,sha256=AZqoTVpJei7k0Boj3-XDJF_RhckW43JfrgxM-D4Q24A,3017
+sharedkernel-2.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sharedkernel-2.2.2.dist-info/top_level.txt,sha256=TVTOnV1MItSSlpSjqkiijuHkoVsGHS4CArpsM-lylkE,13
+sharedkernel-2.2.2.dist-info/RECORD,,